Ysurac /
FlightAirMap
@@ -3,9 +3,9 @@ discard block |
||
| 3 | 3 | </span> |
| 4 | 4 | <div class="sub-menu sub-menu-container"> |
| 5 | 5 | <ul class="nav nav-pills"> |
| 6 | - <li><a href="<?php print $globalURL; ?>/date/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 6 | + <li><a href="<?php print $globalURL; ?>/date/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
| 7 | 7 | <li class="dropdown"> |
| 8 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "date-statistics-aircraft" || strtolower($current_page) == "date-statistics-registration" || strtolower($current_page) == "date-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 8 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "date-statistics-aircraft" || strtolower($current_page) == "date-statistics-registration" || strtolower($current_page) == "date-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 9 | 9 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 10 | 10 | </a> |
| 11 | 11 | <ul class="dropdown-menu" role="menu"> |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | </ul> |
| 16 | 16 | </li> |
| 17 | 17 | <li class="dropdown"> |
| 18 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "date-statistics-airline" || strtolower($current_page) == "date-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 18 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "date-statistics-airline" || strtolower($current_page) == "date-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 19 | 19 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 20 | 20 | </a> |
| 21 | 21 | <ul class="dropdown-menu" role="menu"> |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | </ul> |
| 25 | 25 | </li> |
| 26 | 26 | <li class="dropdown"> |
| 27 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "date-statistics-departure-airport" || strtolower($current_page) == "date-statistics-departure-airport-country" || strtolower($current_page) == "date-statistics-arrival-airport" || strtolower($current_page) == "date-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 27 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "date-statistics-departure-airport" || strtolower($current_page) == "date-statistics-departure-airport-country" || strtolower($current_page) == "date-statistics-arrival-airport" || strtolower($current_page) == "date-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 28 | 28 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 29 | 29 | </a> |
| 30 | 30 | <ul class="dropdown-menu" role="menu"> |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | <li><a href="<?php print $globalURL; ?>/date/statistics/arrival-airport-country/<?php print $date; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
| 35 | 35 | </ul> |
| 36 | 36 | </li> |
| 37 | - <li><a href="<?php print $globalURL; ?>/date/statistics/route/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 38 | - <li><a href="<?php print $globalURL; ?>/date/statistics/time/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 37 | + <li><a href="<?php print $globalURL; ?>/date/statistics/route/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
| 38 | + <li><a href="<?php print $globalURL; ?>/date/statistics/time/<?php print $date; ?>" <?php if (strtolower($current_page) == "date-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
| 39 | 39 | </ul> |
| 40 | 40 | </div> |
| 41 | 41 | \ No newline at end of file |
@@ -18,6 +18,10 @@ discard block |
||
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | + /** |
|
| 22 | + * @param string $type |
|
| 23 | + * @param string $stats_date |
|
| 24 | + */ |
|
| 21 | 25 | public function addLastStatsUpdate($type,$stats_date) { |
| 22 | 26 | $query = "DELETE FROM config WHERE name = :type; |
| 23 | 27 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
@@ -961,6 +965,10 @@ discard block |
||
| 961 | 965 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 962 | 966 | return $all; |
| 963 | 967 | } |
| 968 | + |
|
| 969 | + /** |
|
| 970 | + * @param string $type |
|
| 971 | + */ |
|
| 964 | 972 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 965 | 973 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | 974 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -972,6 +980,11 @@ discard block |
||
| 972 | 980 | echo "error : ".$e->getMessage(); |
| 973 | 981 | } |
| 974 | 982 | } |
| 983 | + |
|
| 984 | + /** |
|
| 985 | + * @param string $type |
|
| 986 | + * @param string $year |
|
| 987 | + */ |
|
| 975 | 988 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 976 | 989 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 977 | 990 | global $globalArchiveMonths, $globalDBdriver; |
@@ -1116,6 +1129,10 @@ discard block |
||
| 1116 | 1129 | else return 0; |
| 1117 | 1130 | } |
| 1118 | 1131 | |
| 1132 | + /** |
|
| 1133 | + * @param string $type |
|
| 1134 | + * @param string $stats_date |
|
| 1135 | + */ |
|
| 1119 | 1136 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1120 | 1137 | global $globalDBdriver; |
| 1121 | 1138 | if ($filter_name == '') $filter_name = $this->filter_name; |
@@ -1169,6 +1186,9 @@ discard block |
||
| 1169 | 1186 | } |
| 1170 | 1187 | */ |
| 1171 | 1188 | |
| 1189 | + /** |
|
| 1190 | + * @param string $stats_type |
|
| 1191 | + */ |
|
| 1172 | 1192 | public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
| 1173 | 1193 | global $globalDBdriver; |
| 1174 | 1194 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
@@ -1212,6 +1232,9 @@ discard block |
||
| 1212 | 1232 | return $all; |
| 1213 | 1233 | } |
| 1214 | 1234 | |
| 1235 | + /** |
|
| 1236 | + * @param string $stats_type |
|
| 1237 | + */ |
|
| 1215 | 1238 | public function addStatSource($data,$source_name,$stats_type,$date) { |
| 1216 | 1239 | global $globalDBdriver; |
| 1217 | 1240 | if ($globalDBdriver == 'mysql') { |
@@ -1227,6 +1250,10 @@ discard block |
||
| 1227 | 1250 | return "error : ".$e->getMessage(); |
| 1228 | 1251 | } |
| 1229 | 1252 | } |
| 1253 | + |
|
| 1254 | + /** |
|
| 1255 | + * @param string $type |
|
| 1256 | + */ |
|
| 1230 | 1257 | public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
| 1231 | 1258 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1232 | 1259 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
@@ -1493,6 +1520,10 @@ discard block |
||
| 1493 | 1520 | return "error : ".$e->getMessage(); |
| 1494 | 1521 | } |
| 1495 | 1522 | } |
| 1523 | + |
|
| 1524 | + /** |
|
| 1525 | + * @param string $type |
|
| 1526 | + */ |
|
| 1496 | 1527 | public function deleteStatFlight($type) { |
| 1497 | 1528 | $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
| 1498 | 1529 | $query_values = array(':type' => $type); |
@@ -1503,6 +1534,10 @@ discard block |
||
| 1503 | 1534 | return "error : ".$e->getMessage(); |
| 1504 | 1535 | } |
| 1505 | 1536 | } |
| 1537 | + |
|
| 1538 | + /** |
|
| 1539 | + * @param string $type |
|
| 1540 | + */ |
|
| 1506 | 1541 | public function deleteStatAirport($type) { |
| 1507 | 1542 | $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
| 1508 | 1543 | $query_values = array(':type' => $type); |
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
| 17 | 17 | $Connection = new Connection($dbc); |
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | public function addLastStatsUpdate($type,$stats_date) { |
| 22 | - $query = "DELETE FROM config WHERE name = :type; |
|
| 22 | + $query = "DELETE FROM config WHERE name = :type; |
|
| 23 | 23 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 24 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | - try { |
|
| 26 | - $sth = $this->db->prepare($query); |
|
| 27 | - $sth->execute($query_values); |
|
| 28 | - } catch(PDOException $e) { |
|
| 29 | - return "error : ".$e->getMessage(); |
|
| 30 | - } |
|
| 31 | - } |
|
| 24 | + $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 25 | + try { |
|
| 26 | + $sth = $this->db->prepare($query); |
|
| 27 | + $sth->execute($query_values); |
|
| 28 | + } catch(PDOException $e) { |
|
| 29 | + return "error : ".$e->getMessage(); |
|
| 30 | + } |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | 33 | public function getLastStatsUpdate($type = 'last_update_stats') { |
| 34 | - $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | - try { |
|
| 36 | - $sth = $this->db->prepare($query); |
|
| 37 | - $sth->execute(array(':type' => $type)); |
|
| 38 | - } catch(PDOException $e) { |
|
| 39 | - echo "error : ".$e->getMessage(); |
|
| 40 | - } |
|
| 41 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | - return $all; |
|
| 43 | - } |
|
| 44 | - public function deleteStats($filter_name = '') { |
|
| 45 | - /* |
|
| 34 | + $query = "SELECT value FROM config WHERE name = :type"; |
|
| 35 | + try { |
|
| 36 | + $sth = $this->db->prepare($query); |
|
| 37 | + $sth->execute(array(':type' => $type)); |
|
| 38 | + } catch(PDOException $e) { |
|
| 39 | + echo "error : ".$e->getMessage(); |
|
| 40 | + } |
|
| 41 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 42 | + return $all; |
|
| 43 | + } |
|
| 44 | + public function deleteStats($filter_name = '') { |
|
| 45 | + /* |
|
| 46 | 46 | $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
| 47 | 47 | try { |
| 48 | 48 | $sth = $this->db->prepare($query); |
@@ -51,109 +51,109 @@ discard block |
||
| 51 | 51 | return "error : ".$e->getMessage(); |
| 52 | 52 | } |
| 53 | 53 | */ |
| 54 | - $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | - try { |
|
| 56 | - $sth = $this->db->prepare($query); |
|
| 57 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | - } catch(PDOException $e) { |
|
| 59 | - return "error : ".$e->getMessage(); |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - public function deleteOldStats($filter_name = '') { |
|
| 63 | - if ($filter_name == '') { |
|
| 64 | - $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | - } else { |
|
| 66 | - $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | - } |
|
| 68 | - try { |
|
| 69 | - $sth = $this->db->prepare($query); |
|
| 70 | - $sth->execute(); |
|
| 71 | - } catch(PDOException $e) { |
|
| 72 | - return "error : ".$e->getMessage(); |
|
| 73 | - } |
|
| 54 | + $query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 55 | + try { |
|
| 56 | + $sth = $this->db->prepare($query); |
|
| 57 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 58 | + } catch(PDOException $e) { |
|
| 59 | + return "error : ".$e->getMessage(); |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + public function deleteOldStats($filter_name = '') { |
|
| 63 | + if ($filter_name == '') { |
|
| 64 | + $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 65 | + } else { |
|
| 66 | + $query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'"; |
|
| 67 | + } |
|
| 68 | + try { |
|
| 69 | + $sth = $this->db->prepare($query); |
|
| 70 | + $sth->execute(); |
|
| 71 | + } catch(PDOException $e) { |
|
| 72 | + return "error : ".$e->getMessage(); |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | - try { |
|
| 77 | - $sth = $this->db->prepare($query); |
|
| 78 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error : ".$e->getMessage(); |
|
| 81 | - } |
|
| 82 | - } |
|
| 75 | + $query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;"; |
|
| 76 | + try { |
|
| 77 | + $sth = $this->db->prepare($query); |
|
| 78 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error : ".$e->getMessage(); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | 83 | public function getAllAirlineNames($filter_name = '') { |
| 84 | 84 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 85 | - $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | - try { |
|
| 87 | - $sth = $this->db->prepare($query); |
|
| 88 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | - } catch(PDOException $e) { |
|
| 90 | - echo "error : ".$e->getMessage(); |
|
| 91 | - } |
|
| 92 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | - return $all; |
|
| 94 | - } |
|
| 85 | + $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 86 | + try { |
|
| 87 | + $sth = $this->db->prepare($query); |
|
| 88 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 89 | + } catch(PDOException $e) { |
|
| 90 | + echo "error : ".$e->getMessage(); |
|
| 91 | + } |
|
| 92 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 93 | + return $all; |
|
| 94 | + } |
|
| 95 | 95 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 96 | 96 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 97 | - $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | - try { |
|
| 99 | - $sth = $this->db->prepare($query); |
|
| 100 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | - } catch(PDOException $e) { |
|
| 102 | - echo "error : ".$e->getMessage(); |
|
| 103 | - } |
|
| 104 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | - return $all; |
|
| 106 | - } |
|
| 97 | + $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 98 | + try { |
|
| 99 | + $sth = $this->db->prepare($query); |
|
| 100 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | + } catch(PDOException $e) { |
|
| 102 | + echo "error : ".$e->getMessage(); |
|
| 103 | + } |
|
| 104 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 105 | + return $all; |
|
| 106 | + } |
|
| 107 | 107 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 108 | 108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 109 | - $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 110 | - try { |
|
| 111 | - $sth = $this->db->prepare($query); |
|
| 112 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | - } catch(PDOException $e) { |
|
| 114 | - echo "error : ".$e->getMessage(); |
|
| 115 | - } |
|
| 116 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | - return $all; |
|
| 118 | - } |
|
| 109 | + $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 110 | + try { |
|
| 111 | + $sth = $this->db->prepare($query); |
|
| 112 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | + } catch(PDOException $e) { |
|
| 114 | + echo "error : ".$e->getMessage(); |
|
| 115 | + } |
|
| 116 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 117 | + return $all; |
|
| 118 | + } |
|
| 119 | 119 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 120 | 120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 121 | - $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 122 | - try { |
|
| 123 | - $sth = $this->db->prepare($query); |
|
| 124 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | - } catch(PDOException $e) { |
|
| 126 | - echo "error : ".$e->getMessage(); |
|
| 127 | - } |
|
| 128 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | - return $all; |
|
| 130 | - } |
|
| 121 | + $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 122 | + try { |
|
| 123 | + $sth = $this->db->prepare($query); |
|
| 124 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | + } catch(PDOException $e) { |
|
| 126 | + echo "error : ".$e->getMessage(); |
|
| 127 | + } |
|
| 128 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 129 | + return $all; |
|
| 130 | + } |
|
| 131 | 131 | |
| 132 | 132 | public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | - $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | - try { |
|
| 136 | - $sth = $this->db->prepare($query); |
|
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 139 | - echo "error : ".$e->getMessage(); |
|
| 140 | - } |
|
| 141 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | - return $all; |
|
| 143 | - } |
|
| 134 | + $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
|
| 135 | + try { |
|
| 136 | + $sth = $this->db->prepare($query); |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | + } catch(PDOException $e) { |
|
| 139 | + echo "error : ".$e->getMessage(); |
|
| 140 | + } |
|
| 141 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 142 | + return $all; |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | 145 | public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | - $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | - try { |
|
| 149 | - $sth = $this->db->prepare($query); |
|
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 152 | - echo "error : ".$e->getMessage(); |
|
| 153 | - } |
|
| 154 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | - return $all; |
|
| 156 | - } |
|
| 147 | + $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
|
| 148 | + try { |
|
| 149 | + $sth = $this->db->prepare($query); |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | + } catch(PDOException $e) { |
|
| 152 | + echo "error : ".$e->getMessage(); |
|
| 153 | + } |
|
| 154 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 155 | + return $all; |
|
| 156 | + } |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
@@ -170,16 +170,16 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | 172 | } else $all = array(); |
| 173 | - if (empty($all)) { |
|
| 174 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | - if ($filter_name != '') { |
|
| 176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | - } |
|
| 178 | - $Spotter = new Spotter($this->db); |
|
| 179 | - //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | - } |
|
| 182 | - return $all; |
|
| 173 | + if (empty($all)) { |
|
| 174 | + $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 175 | + if ($filter_name != '') { |
|
| 176 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 177 | + } |
|
| 178 | + $Spotter = new Spotter($this->db); |
|
| 179 | + //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
|
| 180 | + $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 181 | + } |
|
| 182 | + return $all; |
|
| 183 | 183 | } |
| 184 | 184 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 185 | 185 | global $globalStatsFilters; |
@@ -195,17 +195,17 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 197 | 197 | } else $all = array(); |
| 198 | - if (empty($all)) { |
|
| 199 | - $Spotter = new Spotter($this->db); |
|
| 200 | - $filters = array(); |
|
| 201 | - $filters = array('year' => $year,'month' => $month); |
|
| 202 | - if ($filter_name != '') { |
|
| 203 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | - } |
|
| 205 | - //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | - } |
|
| 208 | - return $all; |
|
| 198 | + if (empty($all)) { |
|
| 199 | + $Spotter = new Spotter($this->db); |
|
| 200 | + $filters = array(); |
|
| 201 | + $filters = array('year' => $year,'month' => $month); |
|
| 202 | + if ($filter_name != '') { |
|
| 203 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 204 | + } |
|
| 205 | + //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
|
| 206 | + $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 207 | + } |
|
| 208 | + return $all; |
|
| 209 | 209 | } |
| 210 | 210 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 211 | 211 | global $globalStatsFilters; |
@@ -247,39 +247,39 @@ discard block |
||
| 247 | 247 | } |
| 248 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | 249 | } else $all = array(); |
| 250 | - if (empty($all)) { |
|
| 250 | + if (empty($all)) { |
|
| 251 | 251 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 252 | 252 | if ($filter_name != '') { |
| 253 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 253 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 254 | 254 | } |
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 257 | 257 | $all = $Spotter->countAllArrivalCountries($limit,$filters); |
| 258 | - } |
|
| 259 | - return $all; |
|
| 258 | + } |
|
| 259 | + return $all; |
|
| 260 | 260 | } |
| 261 | 261 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 262 | 262 | global $globalStatsFilters; |
| 263 | 263 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 264 | 264 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, 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"; |
| 265 | 265 | 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"; |
| 266 | - try { |
|
| 267 | - $sth = $this->db->prepare($query); |
|
| 268 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | - } catch(PDOException $e) { |
|
| 270 | - echo "error : ".$e->getMessage(); |
|
| 271 | - } |
|
| 272 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | - if (empty($all)) { |
|
| 266 | + try { |
|
| 267 | + $sth = $this->db->prepare($query); |
|
| 268 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | + } catch(PDOException $e) { |
|
| 270 | + echo "error : ".$e->getMessage(); |
|
| 271 | + } |
|
| 272 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + if (empty($all)) { |
|
| 274 | 274 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 275 | 275 | if ($filter_name != '') { |
| 276 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 276 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 277 | 277 | } |
| 278 | 278 | $Spotter = new Spotter($this->db); |
| 279 | 279 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
| 280 | 280 | $all = $Spotter->countAllDepartureCountries($filters); |
| 281 | - } |
|
| 282 | - return $all; |
|
| 281 | + } |
|
| 282 | + return $all; |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
@@ -305,17 +305,17 @@ discard block |
||
| 305 | 305 | } |
| 306 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 307 | 307 | } else $all = array(); |
| 308 | - if (empty($all)) { |
|
| 309 | - $Spotter = new Spotter($this->db); |
|
| 310 | - $filters = array(); |
|
| 308 | + if (empty($all)) { |
|
| 309 | + $Spotter = new Spotter($this->db); |
|
| 310 | + $filters = array(); |
|
| 311 | 311 | $filters = array('year' => $year,'month' => $month); |
| 312 | - if ($filter_name != '') { |
|
| 313 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 312 | + if ($filter_name != '') { |
|
| 313 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 314 | 314 | } |
| 315 | 315 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 316 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | - } |
|
| 318 | - return $all; |
|
| 316 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 317 | + } |
|
| 318 | + return $all; |
|
| 319 | 319 | } |
| 320 | 320 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 321 | 321 | global $globalStatsFilters; |
@@ -331,16 +331,16 @@ discard block |
||
| 331 | 331 | } |
| 332 | 332 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | 333 | } else $all = array(); |
| 334 | - if (empty($all)) { |
|
| 334 | + if (empty($all)) { |
|
| 335 | 335 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 336 | 336 | if ($filter_name != '') { |
| 337 | 337 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 338 | 338 | } |
| 339 | - $Spotter = new Spotter($this->db); |
|
| 340 | - //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | - } |
|
| 343 | - return $all; |
|
| 339 | + $Spotter = new Spotter($this->db); |
|
| 340 | + //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
|
| 341 | + $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 342 | + } |
|
| 343 | + return $all; |
|
| 344 | 344 | } |
| 345 | 345 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 346 | 346 | global $globalStatsFilters; |
@@ -381,7 +381,7 @@ discard block |
||
| 381 | 381 | echo "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 384 | - /* |
|
| 384 | + /* |
|
| 385 | 385 | if (empty($all)) { |
| 386 | 386 | $Spotter = new Spotter($this->db); |
| 387 | 387 | $all = $Spotter->countAllFlightOverCountries($limit); |
@@ -433,16 +433,16 @@ discard block |
||
| 433 | 433 | } |
| 434 | 434 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | 435 | } else $all = array(); |
| 436 | - if (empty($all)) { |
|
| 436 | + if (empty($all)) { |
|
| 437 | 437 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 438 | 438 | if ($filter_name != '') { |
| 439 | 439 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 440 | 440 | } |
| 441 | - $Spotter = new Spotter($this->db); |
|
| 442 | - //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | - } |
|
| 445 | - return $all; |
|
| 441 | + $Spotter = new Spotter($this->db); |
|
| 442 | + //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
|
| 443 | + $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 444 | + } |
|
| 445 | + return $all; |
|
| 446 | 446 | } |
| 447 | 447 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 448 | 448 | global $globalStatsFilters; |
@@ -458,35 +458,35 @@ discard block |
||
| 458 | 458 | } |
| 459 | 459 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | 460 | } else $all = array(); |
| 461 | - if (empty($all)) { |
|
| 461 | + if (empty($all)) { |
|
| 462 | 462 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 463 | - if ($filter_name != '') { |
|
| 464 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 463 | + if ($filter_name != '') { |
|
| 464 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 465 | 465 | } |
| 466 | - $Spotter = new Spotter($this->db); |
|
| 466 | + $Spotter = new Spotter($this->db); |
|
| 467 | 467 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 468 | 468 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 469 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | - $all = array(); |
|
| 472 | - foreach ($pall as $value) { |
|
| 473 | - $icao = $value['airport_departure_icao']; |
|
| 474 | - $all[$icao] = $value; |
|
| 475 | - } |
|
| 469 | + $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 471 | + $all = array(); |
|
| 472 | + foreach ($pall as $value) { |
|
| 473 | + $icao = $value['airport_departure_icao']; |
|
| 474 | + $all[$icao] = $value; |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - foreach ($dall as $value) { |
|
| 478 | - $icao = $value['airport_departure_icao']; |
|
| 479 | - if (isset($all[$icao])) { |
|
| 480 | - $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | - } else $all[$icao] = $value; |
|
| 482 | - } |
|
| 483 | - $count = array(); |
|
| 484 | - foreach ($all as $key => $row) { |
|
| 485 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | - } |
|
| 487 | - array_multisort($count,SORT_DESC,$all); |
|
| 488 | - } |
|
| 489 | - return $all; |
|
| 477 | + foreach ($dall as $value) { |
|
| 478 | + $icao = $value['airport_departure_icao']; |
|
| 479 | + if (isset($all[$icao])) { |
|
| 480 | + $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 481 | + } else $all[$icao] = $value; |
|
| 482 | + } |
|
| 483 | + $count = array(); |
|
| 484 | + foreach ($all as $key => $row) { |
|
| 485 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 486 | + } |
|
| 487 | + array_multisort($count,SORT_DESC,$all); |
|
| 488 | + } |
|
| 489 | + return $all; |
|
| 490 | 490 | } |
| 491 | 491 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 492 | 492 | global $globalStatsFilters; |
@@ -512,26 +512,26 @@ discard block |
||
| 512 | 512 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 513 | 513 | $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
| 514 | 514 | $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
| 515 | - $all = array(); |
|
| 516 | - foreach ($pall as $value) { |
|
| 517 | - $icao = $value['airport_arrival_icao']; |
|
| 518 | - $all[$icao] = $value; |
|
| 519 | - } |
|
| 515 | + $all = array(); |
|
| 516 | + foreach ($pall as $value) { |
|
| 517 | + $icao = $value['airport_arrival_icao']; |
|
| 518 | + $all[$icao] = $value; |
|
| 519 | + } |
|
| 520 | 520 | |
| 521 | - foreach ($dall as $value) { |
|
| 522 | - $icao = $value['airport_arrival_icao']; |
|
| 523 | - if (isset($all[$icao])) { |
|
| 524 | - $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | - } else $all[$icao] = $value; |
|
| 526 | - } |
|
| 527 | - $count = array(); |
|
| 528 | - foreach ($all as $key => $row) { |
|
| 529 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | - } |
|
| 531 | - array_multisort($count,SORT_DESC,$all); |
|
| 532 | - } |
|
| 521 | + foreach ($dall as $value) { |
|
| 522 | + $icao = $value['airport_arrival_icao']; |
|
| 523 | + if (isset($all[$icao])) { |
|
| 524 | + $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 525 | + } else $all[$icao] = $value; |
|
| 526 | + } |
|
| 527 | + $count = array(); |
|
| 528 | + foreach ($all as $key => $row) { |
|
| 529 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 530 | + } |
|
| 531 | + array_multisort($count,SORT_DESC,$all); |
|
| 532 | + } |
|
| 533 | 533 | |
| 534 | - return $all; |
|
| 534 | + return $all; |
|
| 535 | 535 | } |
| 536 | 536 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 537 | 537 | global $globalDBdriver, $globalStatsFilters; |
@@ -544,23 +544,23 @@ discard block |
||
| 544 | 544 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 545 | 545 | } |
| 546 | 546 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 547 | - try { |
|
| 548 | - $sth = $this->db->prepare($query); |
|
| 549 | - $sth->execute($query_data); |
|
| 550 | - } catch(PDOException $e) { |
|
| 551 | - echo "error : ".$e->getMessage(); |
|
| 552 | - } |
|
| 553 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | - if (empty($all)) { |
|
| 547 | + try { |
|
| 548 | + $sth = $this->db->prepare($query); |
|
| 549 | + $sth->execute($query_data); |
|
| 550 | + } catch(PDOException $e) { |
|
| 551 | + echo "error : ".$e->getMessage(); |
|
| 552 | + } |
|
| 553 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 554 | + if (empty($all)) { |
|
| 555 | 555 | $filters = array('airlines' => array($stats_airline)); |
| 556 | 556 | if ($filter_name != '') { |
| 557 | 557 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 558 | 558 | } |
| 559 | - $Spotter = new Spotter($this->db); |
|
| 560 | - $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | - } |
|
| 559 | + $Spotter = new Spotter($this->db); |
|
| 560 | + $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 561 | + } |
|
| 562 | 562 | |
| 563 | - return $all; |
|
| 563 | + return $all; |
|
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
@@ -568,22 +568,22 @@ discard block |
||
| 568 | 568 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 569 | 569 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 570 | 570 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 571 | - try { |
|
| 572 | - $sth = $this->db->prepare($query); |
|
| 573 | - $sth->execute($query_data); |
|
| 574 | - } catch(PDOException $e) { |
|
| 575 | - echo "error : ".$e->getMessage(); |
|
| 576 | - } |
|
| 577 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | - if (empty($all)) { |
|
| 571 | + try { |
|
| 572 | + $sth = $this->db->prepare($query); |
|
| 573 | + $sth->execute($query_data); |
|
| 574 | + } catch(PDOException $e) { |
|
| 575 | + echo "error : ".$e->getMessage(); |
|
| 576 | + } |
|
| 577 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 578 | + if (empty($all)) { |
|
| 579 | 579 | $filters = array('airlines' => array($stats_airline)); |
| 580 | 580 | if ($filter_name != '') { |
| 581 | 581 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 582 | 582 | } |
| 583 | - $Spotter = new Spotter($this->db); |
|
| 584 | - $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | - } |
|
| 586 | - return $all; |
|
| 583 | + $Spotter = new Spotter($this->db); |
|
| 584 | + $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 585 | + } |
|
| 586 | + return $all; |
|
| 587 | 587 | } |
| 588 | 588 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 589 | 589 | global $globalDBdriver, $globalStatsFilters; |
@@ -594,66 +594,66 @@ discard block |
||
| 594 | 594 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 595 | 595 | } |
| 596 | 596 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 597 | - try { |
|
| 598 | - $sth = $this->db->prepare($query); |
|
| 599 | - $sth->execute($query_data); |
|
| 600 | - } catch(PDOException $e) { |
|
| 601 | - echo "error : ".$e->getMessage(); |
|
| 602 | - } |
|
| 603 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | - if (empty($all)) { |
|
| 597 | + try { |
|
| 598 | + $sth = $this->db->prepare($query); |
|
| 599 | + $sth->execute($query_data); |
|
| 600 | + } catch(PDOException $e) { |
|
| 601 | + echo "error : ".$e->getMessage(); |
|
| 602 | + } |
|
| 603 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 604 | + if (empty($all)) { |
|
| 605 | 605 | $filters = array('airlines' => array($stats_airline)); |
| 606 | 606 | if ($filter_name != '') { |
| 607 | 607 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 608 | 608 | } |
| 609 | - $Spotter = new Spotter($this->db); |
|
| 610 | - $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | - } |
|
| 612 | - return $all; |
|
| 609 | + $Spotter = new Spotter($this->db); |
|
| 610 | + $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 611 | + } |
|
| 612 | + return $all; |
|
| 613 | 613 | } |
| 614 | 614 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 615 | 615 | global $globalStatsFilters; |
| 616 | 616 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 617 | 617 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 618 | 618 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 619 | - try { |
|
| 620 | - $sth = $this->db->prepare($query); |
|
| 621 | - $sth->execute($query_data); |
|
| 622 | - } catch(PDOException $e) { |
|
| 623 | - echo "error : ".$e->getMessage(); |
|
| 624 | - } |
|
| 625 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | - if (empty($all)) { |
|
| 619 | + try { |
|
| 620 | + $sth = $this->db->prepare($query); |
|
| 621 | + $sth->execute($query_data); |
|
| 622 | + } catch(PDOException $e) { |
|
| 623 | + echo "error : ".$e->getMessage(); |
|
| 624 | + } |
|
| 625 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 626 | + if (empty($all)) { |
|
| 627 | 627 | $filters = array('airlines' => array($stats_airline)); |
| 628 | 628 | if ($filter_name != '') { |
| 629 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 629 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 630 | 630 | } |
| 631 | - $Spotter = new Spotter($this->db); |
|
| 632 | - $all = $Spotter->countAllDates($filters); |
|
| 633 | - } |
|
| 634 | - return $all; |
|
| 631 | + $Spotter = new Spotter($this->db); |
|
| 632 | + $all = $Spotter->countAllDates($filters); |
|
| 633 | + } |
|
| 634 | + return $all; |
|
| 635 | 635 | } |
| 636 | 636 | public function countAllDatesByAirlines($filter_name = '') { |
| 637 | 637 | global $globalStatsFilters; |
| 638 | 638 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 639 | 639 | $query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name"; |
| 640 | 640 | $query_data = array('filter_name' => $filter_name); |
| 641 | - try { |
|
| 642 | - $sth = $this->db->prepare($query); |
|
| 643 | - $sth->execute($query_data); |
|
| 644 | - } catch(PDOException $e) { |
|
| 645 | - echo "error : ".$e->getMessage(); |
|
| 646 | - } |
|
| 647 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | - if (empty($all)) { |
|
| 649 | - $filters = array(); |
|
| 650 | - if ($filter_name != '') { |
|
| 651 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 641 | + try { |
|
| 642 | + $sth = $this->db->prepare($query); |
|
| 643 | + $sth->execute($query_data); |
|
| 644 | + } catch(PDOException $e) { |
|
| 645 | + echo "error : ".$e->getMessage(); |
|
| 646 | + } |
|
| 647 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 648 | + if (empty($all)) { |
|
| 649 | + $filters = array(); |
|
| 650 | + if ($filter_name != '') { |
|
| 651 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 652 | 652 | } |
| 653 | - $Spotter = new Spotter($this->db); |
|
| 654 | - $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | - } |
|
| 656 | - return $all; |
|
| 653 | + $Spotter = new Spotter($this->db); |
|
| 654 | + $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 655 | + } |
|
| 656 | + return $all; |
|
| 657 | 657 | } |
| 658 | 658 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 659 | 659 | global $globalStatsFilters, $globalDBdriver; |
@@ -663,24 +663,24 @@ discard block |
||
| 663 | 663 | } else { |
| 664 | 664 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 665 | 665 | } |
| 666 | - try { |
|
| 667 | - $sth = $this->db->prepare($query); |
|
| 668 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | - } catch(PDOException $e) { |
|
| 670 | - echo "error : ".$e->getMessage(); |
|
| 671 | - } |
|
| 672 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 666 | + try { |
|
| 667 | + $sth = $this->db->prepare($query); |
|
| 668 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 669 | + } catch(PDOException $e) { |
|
| 670 | + echo "error : ".$e->getMessage(); |
|
| 671 | + } |
|
| 672 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 673 | 673 | |
| 674 | - if (empty($all)) { |
|
| 674 | + if (empty($all)) { |
|
| 675 | 675 | $filters = array('airlines' => array($stats_airline)); |
| 676 | 676 | if ($filter_name != '') { |
| 677 | 677 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 678 | 678 | } |
| 679 | - $Spotter = new Spotter($this->db); |
|
| 680 | - $all = $Spotter->countAllMonths($filters); |
|
| 681 | - } |
|
| 679 | + $Spotter = new Spotter($this->db); |
|
| 680 | + $all = $Spotter->countAllMonths($filters); |
|
| 681 | + } |
|
| 682 | 682 | |
| 683 | - return $all; |
|
| 683 | + return $all; |
|
| 684 | 684 | } |
| 685 | 685 | public function countFatalitiesLast12Months() { |
| 686 | 686 | global $globalStatsFilters, $globalDBdriver; |
@@ -689,19 +689,19 @@ discard block |
||
| 689 | 689 | } else { |
| 690 | 690 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date"; |
| 691 | 691 | } |
| 692 | - try { |
|
| 693 | - $sth = $this->db->prepare($query); |
|
| 694 | - $sth->execute(); |
|
| 695 | - } catch(PDOException $e) { |
|
| 696 | - echo "error : ".$e->getMessage(); |
|
| 697 | - } |
|
| 698 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 692 | + try { |
|
| 693 | + $sth = $this->db->prepare($query); |
|
| 694 | + $sth->execute(); |
|
| 695 | + } catch(PDOException $e) { |
|
| 696 | + echo "error : ".$e->getMessage(); |
|
| 697 | + } |
|
| 698 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 699 | 699 | |
| 700 | - if (empty($all)) { |
|
| 701 | - $Accident = new Accident($this->db); |
|
| 702 | - $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | - } |
|
| 704 | - return $all; |
|
| 700 | + if (empty($all)) { |
|
| 701 | + $Accident = new Accident($this->db); |
|
| 702 | + $all = $Accident->countFatalitiesLast12Months(); |
|
| 703 | + } |
|
| 704 | + return $all; |
|
| 705 | 705 | } |
| 706 | 706 | public function countFatalitiesByYear() { |
| 707 | 707 | global $globalStatsFilters, $globalDBdriver; |
@@ -710,40 +710,40 @@ discard block |
||
| 710 | 710 | } else { |
| 711 | 711 | $query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date"; |
| 712 | 712 | } |
| 713 | - try { |
|
| 714 | - $sth = $this->db->prepare($query); |
|
| 715 | - $sth->execute(); |
|
| 716 | - } catch(PDOException $e) { |
|
| 717 | - echo "error : ".$e->getMessage(); |
|
| 718 | - } |
|
| 719 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 713 | + try { |
|
| 714 | + $sth = $this->db->prepare($query); |
|
| 715 | + $sth->execute(); |
|
| 716 | + } catch(PDOException $e) { |
|
| 717 | + echo "error : ".$e->getMessage(); |
|
| 718 | + } |
|
| 719 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 720 | 720 | |
| 721 | - if (empty($all)) { |
|
| 722 | - $Accident = new Accident($this->db); |
|
| 723 | - $all = $Accident->countFatalitiesByYear(); |
|
| 724 | - } |
|
| 725 | - return $all; |
|
| 721 | + if (empty($all)) { |
|
| 722 | + $Accident = new Accident($this->db); |
|
| 723 | + $all = $Accident->countFatalitiesByYear(); |
|
| 724 | + } |
|
| 725 | + return $all; |
|
| 726 | 726 | } |
| 727 | 727 | public function countAllMilitaryMonths($filter_name = '') { |
| 728 | 728 | global $globalStatsFilters; |
| 729 | 729 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 730 | - $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
|
| 731 | - try { |
|
| 732 | - $sth = $this->db->prepare($query); |
|
| 733 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | - } catch(PDOException $e) { |
|
| 735 | - echo "error : ".$e->getMessage(); |
|
| 736 | - } |
|
| 737 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | - if (empty($all)) { |
|
| 739 | - $filters = array(); |
|
| 740 | - if ($filter_name != '') { |
|
| 741 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 730 | + $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
|
| 731 | + try { |
|
| 732 | + $sth = $this->db->prepare($query); |
|
| 733 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 734 | + } catch(PDOException $e) { |
|
| 735 | + echo "error : ".$e->getMessage(); |
|
| 736 | + } |
|
| 737 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 738 | + if (empty($all)) { |
|
| 739 | + $filters = array(); |
|
| 740 | + if ($filter_name != '') { |
|
| 741 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 742 | 742 | } |
| 743 | - $Spotter = new Spotter($this->db); |
|
| 744 | - $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | - } |
|
| 746 | - return $all; |
|
| 743 | + $Spotter = new Spotter($this->db); |
|
| 744 | + $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 745 | + } |
|
| 746 | + return $all; |
|
| 747 | 747 | } |
| 748 | 748 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 749 | 749 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
@@ -759,22 +759,22 @@ discard block |
||
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
| 762 | - try { |
|
| 763 | - $sth = $this->db->prepare($query); |
|
| 764 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | - } catch(PDOException $e) { |
|
| 766 | - echo "error : ".$e->getMessage(); |
|
| 767 | - } |
|
| 768 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | - if (empty($all)) { |
|
| 762 | + try { |
|
| 763 | + $sth = $this->db->prepare($query); |
|
| 764 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 765 | + } catch(PDOException $e) { |
|
| 766 | + echo "error : ".$e->getMessage(); |
|
| 767 | + } |
|
| 768 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 769 | + if (empty($all)) { |
|
| 770 | 770 | $filters = array('airlines' => array($stats_airline)); |
| 771 | 771 | if ($filter_name != '') { |
| 772 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 772 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 773 | 773 | } |
| 774 | - $Spotter = new Spotter($this->db); |
|
| 775 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | - } |
|
| 777 | - return $all; |
|
| 774 | + $Spotter = new Spotter($this->db); |
|
| 775 | + $all = $Spotter->countAllHours($orderby,$filters); |
|
| 776 | + } |
|
| 777 | + return $all; |
|
| 778 | 778 | } |
| 779 | 779 | |
| 780 | 780 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
@@ -799,10 +799,10 @@ discard block |
||
| 799 | 799 | if ($year == '') $year = date('Y'); |
| 800 | 800 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 801 | 801 | if (empty($all)) { |
| 802 | - $filters = array(); |
|
| 802 | + $filters = array(); |
|
| 803 | 803 | $filters = array('year' => $year,'month' => $month); |
| 804 | - if ($filter_name != '') { |
|
| 805 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 804 | + if ($filter_name != '') { |
|
| 805 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 806 | 806 | } |
| 807 | 807 | $Spotter = new Spotter($this->db); |
| 808 | 808 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -866,10 +866,10 @@ discard block |
||
| 866 | 866 | $all = $result[0]['nb_airline']; |
| 867 | 867 | } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
| 868 | 868 | if (empty($all)) { |
| 869 | - $filters = array(); |
|
| 869 | + $filters = array(); |
|
| 870 | 870 | $filters = array('year' => $year,'month' => $month); |
| 871 | - if ($filter_name != '') { |
|
| 872 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 871 | + if ($filter_name != '') { |
|
| 872 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 873 | 873 | } |
| 874 | 874 | $Spotter = new Spotter($this->db); |
| 875 | 875 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -939,44 +939,44 @@ discard block |
||
| 939 | 939 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 940 | 940 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 941 | 941 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 942 | - try { |
|
| 943 | - $sth = $this->db->prepare($query); |
|
| 944 | - $sth->execute($query_values); |
|
| 945 | - } catch(PDOException $e) { |
|
| 946 | - echo "error : ".$e->getMessage(); |
|
| 947 | - } |
|
| 948 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | - return $all; |
|
| 942 | + try { |
|
| 943 | + $sth = $this->db->prepare($query); |
|
| 944 | + $sth->execute($query_values); |
|
| 945 | + } catch(PDOException $e) { |
|
| 946 | + echo "error : ".$e->getMessage(); |
|
| 947 | + } |
|
| 948 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 949 | + return $all; |
|
| 950 | 950 | } |
| 951 | 951 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 952 | 952 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 953 | - $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | - try { |
|
| 956 | - $sth = $this->db->prepare($query); |
|
| 957 | - $sth->execute($query_values); |
|
| 958 | - } catch(PDOException $e) { |
|
| 959 | - echo "error : ".$e->getMessage(); |
|
| 960 | - } |
|
| 961 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | - return $all; |
|
| 963 | - } |
|
| 953 | + $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 954 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 955 | + try { |
|
| 956 | + $sth = $this->db->prepare($query); |
|
| 957 | + $sth->execute($query_values); |
|
| 958 | + } catch(PDOException $e) { |
|
| 959 | + echo "error : ".$e->getMessage(); |
|
| 960 | + } |
|
| 961 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 962 | + return $all; |
|
| 963 | + } |
|
| 964 | 964 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 965 | 965 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | - $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | - try { |
|
| 969 | - $sth = $this->db->prepare($query); |
|
| 970 | - $sth->execute($query_values); |
|
| 971 | - } catch(PDOException $e) { |
|
| 972 | - echo "error : ".$e->getMessage(); |
|
| 973 | - } |
|
| 974 | - } |
|
| 966 | + $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 967 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 968 | + try { |
|
| 969 | + $sth = $this->db->prepare($query); |
|
| 970 | + $sth->execute($query_values); |
|
| 971 | + } catch(PDOException $e) { |
|
| 972 | + echo "error : ".$e->getMessage(); |
|
| 973 | + } |
|
| 974 | + } |
|
| 975 | 975 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 976 | 976 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 977 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 978 | - if ($globalDBdriver == 'mysql') { |
|
| 979 | - if ($month == '') { |
|
| 977 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 978 | + if ($globalDBdriver == 'mysql') { |
|
| 979 | + if ($month == '') { |
|
| 980 | 980 | $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"; |
| 981 | 981 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 982 | 982 | } else { |
@@ -991,165 +991,165 @@ discard block |
||
| 991 | 991 | $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"; |
| 992 | 992 | $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
| 993 | 993 | } |
| 994 | - } |
|
| 995 | - try { |
|
| 996 | - $sth = $this->db->prepare($query); |
|
| 997 | - $sth->execute($query_values); |
|
| 998 | - } catch(PDOException $e) { |
|
| 999 | - echo "error : ".$e->getMessage(); |
|
| 1000 | - } |
|
| 1001 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1002 | - return $all[0]['total']; |
|
| 1003 | - } |
|
| 994 | + } |
|
| 995 | + try { |
|
| 996 | + $sth = $this->db->prepare($query); |
|
| 997 | + $sth->execute($query_values); |
|
| 998 | + } catch(PDOException $e) { |
|
| 999 | + echo "error : ".$e->getMessage(); |
|
| 1000 | + } |
|
| 1001 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1002 | + return $all[0]['total']; |
|
| 1003 | + } |
|
| 1004 | 1004 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1005 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1005 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1006 | 1006 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1007 | - if ($globalDBdriver == 'mysql') { |
|
| 1007 | + if ($globalDBdriver == 'mysql') { |
|
| 1008 | 1008 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1009 | 1009 | } else { |
| 1010 | 1010 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1011 | - } |
|
| 1012 | - $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1013 | - try { |
|
| 1014 | - $sth = $this->db->prepare($query); |
|
| 1015 | - $sth->execute($query_values); |
|
| 1016 | - } catch(PDOException $e) { |
|
| 1017 | - echo "error : ".$e->getMessage(); |
|
| 1018 | - } |
|
| 1019 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1020 | - return $all[0]['total']; |
|
| 1021 | - } |
|
| 1011 | + } |
|
| 1012 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1013 | + try { |
|
| 1014 | + $sth = $this->db->prepare($query); |
|
| 1015 | + $sth->execute($query_values); |
|
| 1016 | + } catch(PDOException $e) { |
|
| 1017 | + echo "error : ".$e->getMessage(); |
|
| 1018 | + } |
|
| 1019 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1020 | + return $all[0]['total']; |
|
| 1021 | + } |
|
| 1022 | 1022 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1023 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1023 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1024 | 1024 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1025 | - if ($globalDBdriver == 'mysql') { |
|
| 1025 | + if ($globalDBdriver == 'mysql') { |
|
| 1026 | 1026 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1027 | - } else { |
|
| 1027 | + } else { |
|
| 1028 | 1028 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1029 | - } |
|
| 1030 | - try { |
|
| 1031 | - $sth = $this->db->prepare($query); |
|
| 1032 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1033 | - } catch(PDOException $e) { |
|
| 1034 | - echo "error : ".$e->getMessage(); |
|
| 1035 | - } |
|
| 1036 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1037 | - return $all[0]['total']; |
|
| 1038 | - } |
|
| 1029 | + } |
|
| 1030 | + try { |
|
| 1031 | + $sth = $this->db->prepare($query); |
|
| 1032 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 1033 | + } catch(PDOException $e) { |
|
| 1034 | + echo "error : ".$e->getMessage(); |
|
| 1035 | + } |
|
| 1036 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1037 | + return $all[0]['total']; |
|
| 1038 | + } |
|
| 1039 | 1039 | public function getStatsAirlineTotal($filter_name = '') { |
| 1040 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1040 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1041 | 1041 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1042 | - if ($globalDBdriver == 'mysql') { |
|
| 1042 | + if ($globalDBdriver == 'mysql') { |
|
| 1043 | 1043 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1044 | - } else { |
|
| 1044 | + } else { |
|
| 1045 | 1045 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1046 | - } |
|
| 1047 | - try { |
|
| 1048 | - $sth = $this->db->prepare($query); |
|
| 1049 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1050 | - } catch(PDOException $e) { |
|
| 1051 | - echo "error : ".$e->getMessage(); |
|
| 1052 | - } |
|
| 1053 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1054 | - return $all[0]['total']; |
|
| 1055 | - } |
|
| 1046 | + } |
|
| 1047 | + try { |
|
| 1048 | + $sth = $this->db->prepare($query); |
|
| 1049 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1050 | + } catch(PDOException $e) { |
|
| 1051 | + echo "error : ".$e->getMessage(); |
|
| 1052 | + } |
|
| 1053 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1054 | + return $all[0]['total']; |
|
| 1055 | + } |
|
| 1056 | 1056 | public function getStatsOwnerTotal($filter_name = '') { |
| 1057 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1057 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1058 | 1058 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1059 | - if ($globalDBdriver == 'mysql') { |
|
| 1059 | + if ($globalDBdriver == 'mysql') { |
|
| 1060 | 1060 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1061 | 1061 | } else { |
| 1062 | 1062 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1063 | - } |
|
| 1064 | - try { |
|
| 1065 | - $sth = $this->db->prepare($query); |
|
| 1066 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1067 | - } catch(PDOException $e) { |
|
| 1068 | - echo "error : ".$e->getMessage(); |
|
| 1069 | - } |
|
| 1070 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1071 | - return $all[0]['total']; |
|
| 1072 | - } |
|
| 1063 | + } |
|
| 1064 | + try { |
|
| 1065 | + $sth = $this->db->prepare($query); |
|
| 1066 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1067 | + } catch(PDOException $e) { |
|
| 1068 | + echo "error : ".$e->getMessage(); |
|
| 1069 | + } |
|
| 1070 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1071 | + return $all[0]['total']; |
|
| 1072 | + } |
|
| 1073 | 1073 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1074 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1074 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1075 | 1075 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1076 | 1076 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1077 | - try { |
|
| 1078 | - $sth = $this->db->prepare($query); |
|
| 1079 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | - } catch(PDOException $e) { |
|
| 1081 | - echo "error : ".$e->getMessage(); |
|
| 1082 | - } |
|
| 1083 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1084 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1085 | - else return 0; |
|
| 1086 | - } |
|
| 1077 | + try { |
|
| 1078 | + $sth = $this->db->prepare($query); |
|
| 1079 | + $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | + } catch(PDOException $e) { |
|
| 1081 | + echo "error : ".$e->getMessage(); |
|
| 1082 | + } |
|
| 1083 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1084 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1085 | + else return 0; |
|
| 1086 | + } |
|
| 1087 | 1087 | public function getStatsPilotTotal($filter_name = '') { |
| 1088 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1088 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1089 | 1089 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1090 | - if ($globalDBdriver == 'mysql') { |
|
| 1091 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1092 | - } else { |
|
| 1093 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | - } |
|
| 1095 | - try { |
|
| 1096 | - $sth = $this->db->prepare($query); |
|
| 1097 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1098 | - } catch(PDOException $e) { |
|
| 1099 | - echo "error : ".$e->getMessage(); |
|
| 1100 | - } |
|
| 1101 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1102 | - return $all[0]['total']; |
|
| 1103 | - } |
|
| 1090 | + if ($globalDBdriver == 'mysql') { |
|
| 1091 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1092 | + } else { |
|
| 1093 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 1094 | + } |
|
| 1095 | + try { |
|
| 1096 | + $sth = $this->db->prepare($query); |
|
| 1097 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 1098 | + } catch(PDOException $e) { |
|
| 1099 | + echo "error : ".$e->getMessage(); |
|
| 1100 | + } |
|
| 1101 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1102 | + return $all[0]['total']; |
|
| 1103 | + } |
|
| 1104 | 1104 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1105 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 1105 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 1106 | 1106 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1107 | 1107 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1108 | - try { |
|
| 1109 | - $sth = $this->db->prepare($query); |
|
| 1110 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | - } catch(PDOException $e) { |
|
| 1112 | - echo "error : ".$e->getMessage(); |
|
| 1113 | - } |
|
| 1114 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1115 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1116 | - else return 0; |
|
| 1117 | - } |
|
| 1108 | + try { |
|
| 1109 | + $sth = $this->db->prepare($query); |
|
| 1110 | + $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | + } catch(PDOException $e) { |
|
| 1112 | + echo "error : ".$e->getMessage(); |
|
| 1113 | + } |
|
| 1114 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 1115 | + if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1116 | + else return 0; |
|
| 1117 | + } |
|
| 1118 | 1118 | |
| 1119 | 1119 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1122 | 1122 | if ($globalDBdriver == 'mysql') { |
| 1123 | 1123 | $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"; |
| 1124 | - } else { |
|
| 1124 | + } else { |
|
| 1125 | 1125 | $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);"; |
| 1126 | 1126 | } |
| 1127 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1128 | - try { |
|
| 1129 | - $sth = $this->db->prepare($query); |
|
| 1130 | - $sth->execute($query_values); |
|
| 1131 | - } catch(PDOException $e) { |
|
| 1132 | - return "error : ".$e->getMessage(); |
|
| 1133 | - } |
|
| 1134 | - } |
|
| 1127 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1128 | + try { |
|
| 1129 | + $sth = $this->db->prepare($query); |
|
| 1130 | + $sth->execute($query_values); |
|
| 1131 | + } catch(PDOException $e) { |
|
| 1132 | + return "error : ".$e->getMessage(); |
|
| 1133 | + } |
|
| 1134 | + } |
|
| 1135 | 1135 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1136 | 1136 | global $globalDBdriver; |
| 1137 | 1137 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1138 | 1138 | if ($globalDBdriver == 'mysql') { |
| 1139 | 1139 | $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"; |
| 1140 | 1140 | } else { |
| 1141 | - //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1141 | + //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 1142 | 1142 | $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);"; |
| 1143 | - } |
|
| 1144 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1145 | - try { |
|
| 1146 | - $sth = $this->db->prepare($query); |
|
| 1147 | - $sth->execute($query_values); |
|
| 1148 | - } catch(PDOException $e) { |
|
| 1149 | - return "error : ".$e->getMessage(); |
|
| 1150 | - } |
|
| 1151 | - } |
|
| 1152 | - /* |
|
| 1143 | + } |
|
| 1144 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1145 | + try { |
|
| 1146 | + $sth = $this->db->prepare($query); |
|
| 1147 | + $sth->execute($query_values); |
|
| 1148 | + } catch(PDOException $e) { |
|
| 1149 | + return "error : ".$e->getMessage(); |
|
| 1150 | + } |
|
| 1151 | + } |
|
| 1152 | + /* |
|
| 1153 | 1153 | public function getStatsSource($date,$stats_type = '') { |
| 1154 | 1154 | if ($stats_type == '') { |
| 1155 | 1155 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -1218,25 +1218,25 @@ discard block |
||
| 1218 | 1218 | $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"; |
| 1219 | 1219 | } else { |
| 1220 | 1220 | $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);"; |
| 1221 | - } |
|
| 1222 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1223 | - try { |
|
| 1224 | - $sth = $this->db->prepare($query); |
|
| 1225 | - $sth->execute($query_values); |
|
| 1226 | - } catch(PDOException $e) { |
|
| 1227 | - return "error : ".$e->getMessage(); |
|
| 1228 | - } |
|
| 1229 | - } |
|
| 1230 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1231 | - $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1232 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1233 | - try { |
|
| 1234 | - $sth = $this->db->prepare($query); |
|
| 1235 | - $sth->execute($query_values); |
|
| 1236 | - } catch(PDOException $e) { |
|
| 1237 | - return "error : ".$e->getMessage(); |
|
| 1238 | - } |
|
| 1239 | - } |
|
| 1221 | + } |
|
| 1222 | + $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1223 | + try { |
|
| 1224 | + $sth = $this->db->prepare($query); |
|
| 1225 | + $sth->execute($query_values); |
|
| 1226 | + } catch(PDOException $e) { |
|
| 1227 | + return "error : ".$e->getMessage(); |
|
| 1228 | + } |
|
| 1229 | + } |
|
| 1230 | + public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1231 | + $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 1232 | + $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1233 | + try { |
|
| 1234 | + $sth = $this->db->prepare($query); |
|
| 1235 | + $sth->execute($query_values); |
|
| 1236 | + } catch(PDOException $e) { |
|
| 1237 | + return "error : ".$e->getMessage(); |
|
| 1238 | + } |
|
| 1239 | + } |
|
| 1240 | 1240 | public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | if ($globalDBdriver == 'mysql') { |
@@ -1252,14 +1252,14 @@ discard block |
||
| 1252 | 1252 | $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);"; |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
| 1255 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | - try { |
|
| 1257 | - $sth = $this->db->prepare($query); |
|
| 1258 | - $sth->execute($query_values); |
|
| 1259 | - } catch(PDOException $e) { |
|
| 1260 | - return "error : ".$e->getMessage(); |
|
| 1261 | - } |
|
| 1262 | - } |
|
| 1255 | + $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | + try { |
|
| 1257 | + $sth = $this->db->prepare($query); |
|
| 1258 | + $sth->execute($query_values); |
|
| 1259 | + } catch(PDOException $e) { |
|
| 1260 | + return "error : ".$e->getMessage(); |
|
| 1261 | + } |
|
| 1262 | + } |
|
| 1263 | 1263 | public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
| 1264 | 1264 | global $globalDBdriver; |
| 1265 | 1265 | if ($globalDBdriver == 'mysql') { |
@@ -1275,14 +1275,14 @@ discard block |
||
| 1275 | 1275 | $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);"; |
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | - try { |
|
| 1280 | - $sth = $this->db->prepare($query); |
|
| 1281 | - $sth->execute($query_values); |
|
| 1282 | - } catch(PDOException $e) { |
|
| 1283 | - return "error : ".$e->getMessage(); |
|
| 1284 | - } |
|
| 1285 | - } |
|
| 1278 | + $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | + try { |
|
| 1280 | + $sth = $this->db->prepare($query); |
|
| 1281 | + $sth->execute($query_values); |
|
| 1282 | + } catch(PDOException $e) { |
|
| 1283 | + return "error : ".$e->getMessage(); |
|
| 1284 | + } |
|
| 1285 | + } |
|
| 1286 | 1286 | public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1287 | 1287 | global $globalDBdriver; |
| 1288 | 1288 | if ($globalDBdriver == 'mysql') { |
@@ -1298,14 +1298,14 @@ discard block |
||
| 1298 | 1298 | $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);"; |
| 1299 | 1299 | } |
| 1300 | 1300 | } |
| 1301 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1302 | - try { |
|
| 1303 | - $sth = $this->db->prepare($query); |
|
| 1304 | - $sth->execute($query_values); |
|
| 1305 | - } catch(PDOException $e) { |
|
| 1306 | - return "error : ".$e->getMessage(); |
|
| 1307 | - } |
|
| 1308 | - } |
|
| 1301 | + $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1302 | + try { |
|
| 1303 | + $sth = $this->db->prepare($query); |
|
| 1304 | + $sth->execute($query_values); |
|
| 1305 | + } catch(PDOException $e) { |
|
| 1306 | + return "error : ".$e->getMessage(); |
|
| 1307 | + } |
|
| 1308 | + } |
|
| 1309 | 1309 | public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
| 1310 | 1310 | global $globalDBdriver; |
| 1311 | 1311 | if ($globalDBdriver == 'mysql') { |
@@ -1321,14 +1321,14 @@ discard block |
||
| 1321 | 1321 | $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);"; |
| 1322 | 1322 | } |
| 1323 | 1323 | } |
| 1324 | - $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); |
|
| 1325 | - try { |
|
| 1326 | - $sth = $this->db->prepare($query); |
|
| 1327 | - $sth->execute($query_values); |
|
| 1328 | - } catch(PDOException $e) { |
|
| 1329 | - return "error : ".$e->getMessage(); |
|
| 1330 | - } |
|
| 1331 | - } |
|
| 1324 | + $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); |
|
| 1325 | + try { |
|
| 1326 | + $sth = $this->db->prepare($query); |
|
| 1327 | + $sth->execute($query_values); |
|
| 1328 | + } catch(PDOException $e) { |
|
| 1329 | + return "error : ".$e->getMessage(); |
|
| 1330 | + } |
|
| 1331 | + } |
|
| 1332 | 1332 | public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
| 1333 | 1333 | global $globalDBdriver; |
| 1334 | 1334 | if ($globalDBdriver == 'mysql') { |
@@ -1344,14 +1344,14 @@ discard block |
||
| 1344 | 1344 | $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);"; |
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1348 | - try { |
|
| 1349 | - $sth = $this->db->prepare($query); |
|
| 1350 | - $sth->execute($query_values); |
|
| 1351 | - } catch(PDOException $e) { |
|
| 1352 | - return "error : ".$e->getMessage(); |
|
| 1353 | - } |
|
| 1354 | - } |
|
| 1347 | + $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1348 | + try { |
|
| 1349 | + $sth = $this->db->prepare($query); |
|
| 1350 | + $sth->execute($query_values); |
|
| 1351 | + } catch(PDOException $e) { |
|
| 1352 | + return "error : ".$e->getMessage(); |
|
| 1353 | + } |
|
| 1354 | + } |
|
| 1355 | 1355 | public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
| 1356 | 1356 | global $globalDBdriver; |
| 1357 | 1357 | if ($globalDBdriver == 'mysql') { |
@@ -1367,14 +1367,14 @@ discard block |
||
| 1367 | 1367 | $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);"; |
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1371 | - try { |
|
| 1372 | - $sth = $this->db->prepare($query); |
|
| 1373 | - $sth->execute($query_values); |
|
| 1374 | - } catch(PDOException $e) { |
|
| 1375 | - return "error : ".$e->getMessage(); |
|
| 1376 | - } |
|
| 1377 | - } |
|
| 1370 | + $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1371 | + try { |
|
| 1372 | + $sth = $this->db->prepare($query); |
|
| 1373 | + $sth->execute($query_values); |
|
| 1374 | + } catch(PDOException $e) { |
|
| 1375 | + return "error : ".$e->getMessage(); |
|
| 1376 | + } |
|
| 1377 | + } |
|
| 1378 | 1378 | public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
| 1379 | 1379 | global $globalDBdriver; |
| 1380 | 1380 | if ($globalDBdriver == 'mysql') { |
@@ -1390,14 +1390,14 @@ discard block |
||
| 1390 | 1390 | $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);"; |
| 1391 | 1391 | } |
| 1392 | 1392 | } |
| 1393 | - $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); |
|
| 1394 | - try { |
|
| 1395 | - $sth = $this->db->prepare($query); |
|
| 1396 | - $sth->execute($query_values); |
|
| 1397 | - } catch(PDOException $e) { |
|
| 1398 | - return "error : ".$e->getMessage(); |
|
| 1399 | - } |
|
| 1400 | - } |
|
| 1393 | + $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); |
|
| 1394 | + try { |
|
| 1395 | + $sth = $this->db->prepare($query); |
|
| 1396 | + $sth->execute($query_values); |
|
| 1397 | + } catch(PDOException $e) { |
|
| 1398 | + return "error : ".$e->getMessage(); |
|
| 1399 | + } |
|
| 1400 | + } |
|
| 1401 | 1401 | public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1402 | 1402 | global $globalDBdriver; |
| 1403 | 1403 | if ($airport_icao != '') { |
@@ -1421,8 +1421,8 @@ discard block |
||
| 1421 | 1421 | } catch(PDOException $e) { |
| 1422 | 1422 | return "error : ".$e->getMessage(); |
| 1423 | 1423 | } |
| 1424 | - } |
|
| 1425 | - } |
|
| 1424 | + } |
|
| 1425 | + } |
|
| 1426 | 1426 | public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
| 1427 | 1427 | global $globalDBdriver; |
| 1428 | 1428 | if ($airport_icao != '') { |
@@ -1438,8 +1438,8 @@ discard block |
||
| 1438 | 1438 | } catch(PDOException $e) { |
| 1439 | 1439 | return "error : ".$e->getMessage(); |
| 1440 | 1440 | } |
| 1441 | - } |
|
| 1442 | - } |
|
| 1441 | + } |
|
| 1442 | + } |
|
| 1443 | 1443 | public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1444 | 1444 | global $globalDBdriver; |
| 1445 | 1445 | if ($airport_icao != '') { |
@@ -1456,15 +1456,15 @@ discard block |
||
| 1456 | 1456 | $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);"; |
| 1457 | 1457 | } |
| 1458 | 1458 | } |
| 1459 | - $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); |
|
| 1459 | + $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); |
|
| 1460 | 1460 | try { |
| 1461 | - $sth = $this->db->prepare($query); |
|
| 1462 | - $sth->execute($query_values); |
|
| 1463 | - } catch(PDOException $e) { |
|
| 1464 | - return "error : ".$e->getMessage(); |
|
| 1465 | - } |
|
| 1466 | - } |
|
| 1467 | - } |
|
| 1461 | + $sth = $this->db->prepare($query); |
|
| 1462 | + $sth->execute($query_values); |
|
| 1463 | + } catch(PDOException $e) { |
|
| 1464 | + return "error : ".$e->getMessage(); |
|
| 1465 | + } |
|
| 1466 | + } |
|
| 1467 | + } |
|
| 1468 | 1468 | public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
| 1469 | 1469 | global $globalDBdriver; |
| 1470 | 1470 | if ($airport_icao != '') { |
@@ -1480,46 +1480,46 @@ discard block |
||
| 1480 | 1480 | } catch(PDOException $e) { |
| 1481 | 1481 | return "error : ".$e->getMessage(); |
| 1482 | 1482 | } |
| 1483 | - } |
|
| 1484 | - } |
|
| 1483 | + } |
|
| 1484 | + } |
|
| 1485 | 1485 | |
| 1486 | 1486 | public function deleteStat($id) { |
| 1487 | - $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1488 | - $query_values = array(':id' => $id); |
|
| 1489 | - try { |
|
| 1490 | - $sth = $this->db->prepare($query); |
|
| 1491 | - $sth->execute($query_values); |
|
| 1492 | - } catch(PDOException $e) { |
|
| 1493 | - return "error : ".$e->getMessage(); |
|
| 1494 | - } |
|
| 1495 | - } |
|
| 1487 | + $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1488 | + $query_values = array(':id' => $id); |
|
| 1489 | + try { |
|
| 1490 | + $sth = $this->db->prepare($query); |
|
| 1491 | + $sth->execute($query_values); |
|
| 1492 | + } catch(PDOException $e) { |
|
| 1493 | + return "error : ".$e->getMessage(); |
|
| 1494 | + } |
|
| 1495 | + } |
|
| 1496 | 1496 | public function deleteStatFlight($type) { |
| 1497 | - $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1498 | - $query_values = array(':type' => $type); |
|
| 1499 | - try { |
|
| 1500 | - $sth = $this->db->prepare($query); |
|
| 1501 | - $sth->execute($query_values); |
|
| 1502 | - } catch(PDOException $e) { |
|
| 1503 | - return "error : ".$e->getMessage(); |
|
| 1504 | - } |
|
| 1505 | - } |
|
| 1497 | + $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1498 | + $query_values = array(':type' => $type); |
|
| 1499 | + try { |
|
| 1500 | + $sth = $this->db->prepare($query); |
|
| 1501 | + $sth->execute($query_values); |
|
| 1502 | + } catch(PDOException $e) { |
|
| 1503 | + return "error : ".$e->getMessage(); |
|
| 1504 | + } |
|
| 1505 | + } |
|
| 1506 | 1506 | public function deleteStatAirport($type) { |
| 1507 | - $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1508 | - $query_values = array(':type' => $type); |
|
| 1509 | - try { |
|
| 1510 | - $sth = $this->db->prepare($query); |
|
| 1511 | - $sth->execute($query_values); |
|
| 1512 | - } catch(PDOException $e) { |
|
| 1513 | - return "error : ".$e->getMessage(); |
|
| 1514 | - } |
|
| 1515 | - } |
|
| 1507 | + $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1508 | + $query_values = array(':type' => $type); |
|
| 1509 | + try { |
|
| 1510 | + $sth = $this->db->prepare($query); |
|
| 1511 | + $sth->execute($query_values); |
|
| 1512 | + } catch(PDOException $e) { |
|
| 1513 | + return "error : ".$e->getMessage(); |
|
| 1514 | + } |
|
| 1515 | + } |
|
| 1516 | 1516 | |
| 1517 | - public function addOldStats() { |
|
| 1518 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1519 | - $Common = new Common(); |
|
| 1520 | - $Connection = new Connection(); |
|
| 1521 | - date_default_timezone_set('UTC'); |
|
| 1522 | - $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1517 | + public function addOldStats() { |
|
| 1518 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1519 | + $Common = new Common(); |
|
| 1520 | + $Connection = new Connection(); |
|
| 1521 | + date_default_timezone_set('UTC'); |
|
| 1522 | + $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1523 | 1523 | if ($globalDebug) echo 'Update stats !'."\n"; |
| 1524 | 1524 | if (isset($last_update[0]['value'])) { |
| 1525 | 1525 | $last_update_day = $last_update[0]['value']; |
@@ -1566,24 +1566,24 @@ discard block |
||
| 1566 | 1566 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1567 | 1567 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1568 | 1568 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1569 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1569 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1570 | 1570 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1571 | - $alldata = array(); |
|
| 1571 | + $alldata = array(); |
|
| 1572 | 1572 | |
| 1573 | - foreach ($pall as $value) { |
|
| 1574 | - $icao = $value['airport_departure_icao']; |
|
| 1575 | - $alldata[$icao] = $value; |
|
| 1576 | - } |
|
| 1577 | - foreach ($dall as $value) { |
|
| 1578 | - $icao = $value['airport_departure_icao']; |
|
| 1579 | - if (isset($alldata[$icao])) { |
|
| 1580 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1581 | - } else $alldata[$icao] = $value; |
|
| 1582 | - } |
|
| 1583 | - $count = array(); |
|
| 1584 | - foreach ($alldata as $key => $row) { |
|
| 1585 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 1586 | - } |
|
| 1573 | + foreach ($pall as $value) { |
|
| 1574 | + $icao = $value['airport_departure_icao']; |
|
| 1575 | + $alldata[$icao] = $value; |
|
| 1576 | + } |
|
| 1577 | + foreach ($dall as $value) { |
|
| 1578 | + $icao = $value['airport_departure_icao']; |
|
| 1579 | + if (isset($alldata[$icao])) { |
|
| 1580 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1581 | + } else $alldata[$icao] = $value; |
|
| 1582 | + } |
|
| 1583 | + $count = array(); |
|
| 1584 | + foreach ($alldata as $key => $row) { |
|
| 1585 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 1586 | + } |
|
| 1587 | 1587 | array_multisort($count,SORT_DESC,$alldata); |
| 1588 | 1588 | foreach ($alldata as $number) { |
| 1589 | 1589 | 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); |
@@ -1591,25 +1591,25 @@ discard block |
||
| 1591 | 1591 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1592 | 1592 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1593 | 1593 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1594 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1594 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1595 | 1595 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1596 | - $alldata = array(); |
|
| 1597 | - foreach ($pall as $value) { |
|
| 1598 | - $icao = $value['airport_arrival_icao']; |
|
| 1599 | - $alldata[$icao] = $value; |
|
| 1600 | - } |
|
| 1601 | - foreach ($dall as $value) { |
|
| 1602 | - $icao = $value['airport_arrival_icao']; |
|
| 1603 | - if (isset($alldata[$icao])) { |
|
| 1604 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1605 | - } else $alldata[$icao] = $value; |
|
| 1606 | - } |
|
| 1607 | - $count = array(); |
|
| 1608 | - foreach ($alldata as $key => $row) { |
|
| 1609 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1610 | - } |
|
| 1611 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1612 | - foreach ($alldata as $number) { |
|
| 1596 | + $alldata = array(); |
|
| 1597 | + foreach ($pall as $value) { |
|
| 1598 | + $icao = $value['airport_arrival_icao']; |
|
| 1599 | + $alldata[$icao] = $value; |
|
| 1600 | + } |
|
| 1601 | + foreach ($dall as $value) { |
|
| 1602 | + $icao = $value['airport_arrival_icao']; |
|
| 1603 | + if (isset($alldata[$icao])) { |
|
| 1604 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1605 | + } else $alldata[$icao] = $value; |
|
| 1606 | + } |
|
| 1607 | + $count = array(); |
|
| 1608 | + foreach ($alldata as $key => $row) { |
|
| 1609 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1610 | + } |
|
| 1611 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 1612 | + foreach ($alldata as $number) { |
|
| 1613 | 1613 | 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); |
| 1614 | 1614 | } |
| 1615 | 1615 | if ($Connection->tableExists('countries')) { |
@@ -1684,8 +1684,8 @@ discard block |
||
| 1684 | 1684 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1685 | 1685 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
| 1686 | 1686 | $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1687 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1688 | - /* |
|
| 1687 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1688 | + /* |
|
| 1689 | 1689 | $alldata = array(); |
| 1690 | 1690 | foreach ($pall as $value) { |
| 1691 | 1691 | $icao = $value['departure_airport_icao']; |
@@ -1704,29 +1704,29 @@ discard block |
||
| 1704 | 1704 | } |
| 1705 | 1705 | array_multisort($count,SORT_DESC,$alldata); |
| 1706 | 1706 | */ |
| 1707 | - foreach ($dall as $value) { |
|
| 1708 | - $icao = $value['departure_airport_icao']; |
|
| 1709 | - $ddate = $value['date']; |
|
| 1710 | - $find = false; |
|
| 1711 | - foreach ($pall as $pvalue) { |
|
| 1712 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1713 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1714 | - $find = true; |
|
| 1715 | - break; |
|
| 1716 | - } |
|
| 1717 | - } |
|
| 1718 | - if ($find === false) { |
|
| 1719 | - $pall[] = $value; |
|
| 1720 | - } |
|
| 1721 | - } |
|
| 1722 | - $alldata = $pall; |
|
| 1707 | + foreach ($dall as $value) { |
|
| 1708 | + $icao = $value['departure_airport_icao']; |
|
| 1709 | + $ddate = $value['date']; |
|
| 1710 | + $find = false; |
|
| 1711 | + foreach ($pall as $pvalue) { |
|
| 1712 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1713 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1714 | + $find = true; |
|
| 1715 | + break; |
|
| 1716 | + } |
|
| 1717 | + } |
|
| 1718 | + if ($find === false) { |
|
| 1719 | + $pall[] = $value; |
|
| 1720 | + } |
|
| 1721 | + } |
|
| 1722 | + $alldata = $pall; |
|
| 1723 | 1723 | foreach ($alldata as $number) { |
| 1724 | 1724 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
| 1725 | 1725 | } |
| 1726 | 1726 | echo '...Arrival'."\n"; |
| 1727 | 1727 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
| 1728 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1729 | - /* |
|
| 1728 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1729 | + /* |
|
| 1730 | 1730 | $alldata = array(); |
| 1731 | 1731 | foreach ($pall as $value) { |
| 1732 | 1732 | $icao = $value['arrival_airport_icao']; |
@@ -1746,22 +1746,22 @@ discard block |
||
| 1746 | 1746 | */ |
| 1747 | 1747 | |
| 1748 | 1748 | |
| 1749 | - foreach ($dall as $value) { |
|
| 1750 | - $icao = $value['arrival_airport_icao']; |
|
| 1751 | - $ddate = $value['date']; |
|
| 1752 | - $find = false; |
|
| 1753 | - foreach ($pall as $pvalue) { |
|
| 1754 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1755 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1756 | - $find = true; |
|
| 1757 | - break; |
|
| 1758 | - } |
|
| 1759 | - } |
|
| 1760 | - if ($find === false) { |
|
| 1761 | - $pall[] = $value; |
|
| 1762 | - } |
|
| 1763 | - } |
|
| 1764 | - $alldata = $pall; |
|
| 1749 | + foreach ($dall as $value) { |
|
| 1750 | + $icao = $value['arrival_airport_icao']; |
|
| 1751 | + $ddate = $value['date']; |
|
| 1752 | + $find = false; |
|
| 1753 | + foreach ($pall as $pvalue) { |
|
| 1754 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1755 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1756 | + $find = true; |
|
| 1757 | + break; |
|
| 1758 | + } |
|
| 1759 | + } |
|
| 1760 | + if ($find === false) { |
|
| 1761 | + $pall[] = $value; |
|
| 1762 | + } |
|
| 1763 | + } |
|
| 1764 | + $alldata = $pall; |
|
| 1765 | 1765 | foreach ($alldata as $number) { |
| 1766 | 1766 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
| 1767 | 1767 | } |
@@ -1838,51 +1838,51 @@ discard block |
||
| 1838 | 1838 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1839 | 1839 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1840 | 1840 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1841 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1841 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1842 | 1842 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1843 | - //$alldata = array(); |
|
| 1844 | - foreach ($dall as $value) { |
|
| 1845 | - $icao = $value['airport_departure_icao']; |
|
| 1846 | - $dicao = $value['airline_icao']; |
|
| 1847 | - $find = false; |
|
| 1848 | - foreach ($pall as $pvalue) { |
|
| 1849 | - if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1850 | - $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1851 | - $find = true; |
|
| 1852 | - break; |
|
| 1853 | - } |
|
| 1854 | - } |
|
| 1855 | - if ($find === false) { |
|
| 1856 | - $pall[] = $value; |
|
| 1857 | - } |
|
| 1858 | - } |
|
| 1859 | - $alldata = $pall; |
|
| 1843 | + //$alldata = array(); |
|
| 1844 | + foreach ($dall as $value) { |
|
| 1845 | + $icao = $value['airport_departure_icao']; |
|
| 1846 | + $dicao = $value['airline_icao']; |
|
| 1847 | + $find = false; |
|
| 1848 | + foreach ($pall as $pvalue) { |
|
| 1849 | + if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1850 | + $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1851 | + $find = true; |
|
| 1852 | + break; |
|
| 1853 | + } |
|
| 1854 | + } |
|
| 1855 | + if ($find === false) { |
|
| 1856 | + $pall[] = $value; |
|
| 1857 | + } |
|
| 1858 | + } |
|
| 1859 | + $alldata = $pall; |
|
| 1860 | 1860 | foreach ($alldata as $number) { |
| 1861 | 1861 | 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); |
| 1862 | 1862 | } |
| 1863 | 1863 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1864 | 1864 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1865 | 1865 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1866 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1866 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1867 | 1867 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1868 | - //$alldata = array(); |
|
| 1869 | - foreach ($dall as $value) { |
|
| 1870 | - $icao = $value['airport_arrival_icao']; |
|
| 1871 | - $dicao = $value['airline_icao']; |
|
| 1872 | - $find = false; |
|
| 1873 | - foreach ($pall as $pvalue) { |
|
| 1874 | - if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1875 | - $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1876 | - $find = true; |
|
| 1877 | - break; |
|
| 1878 | - } |
|
| 1879 | - } |
|
| 1880 | - if ($find === false) { |
|
| 1881 | - $pall[] = $value; |
|
| 1882 | - } |
|
| 1883 | - } |
|
| 1884 | - $alldata = $pall; |
|
| 1885 | - foreach ($alldata as $number) { |
|
| 1868 | + //$alldata = array(); |
|
| 1869 | + foreach ($dall as $value) { |
|
| 1870 | + $icao = $value['airport_arrival_icao']; |
|
| 1871 | + $dicao = $value['airline_icao']; |
|
| 1872 | + $find = false; |
|
| 1873 | + foreach ($pall as $pvalue) { |
|
| 1874 | + if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1875 | + $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1876 | + $find = true; |
|
| 1877 | + break; |
|
| 1878 | + } |
|
| 1879 | + } |
|
| 1880 | + if ($find === false) { |
|
| 1881 | + $pall[] = $value; |
|
| 1882 | + } |
|
| 1883 | + } |
|
| 1884 | + $alldata = $pall; |
|
| 1885 | + foreach ($alldata as $number) { |
|
| 1886 | 1886 | 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); |
| 1887 | 1887 | } |
| 1888 | 1888 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
@@ -1915,47 +1915,47 @@ discard block |
||
| 1915 | 1915 | } |
| 1916 | 1916 | if ($globalDebug) echo '...Departure'."\n"; |
| 1917 | 1917 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1918 | - $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1919 | - foreach ($dall as $value) { |
|
| 1920 | - $icao = $value['departure_airport_icao']; |
|
| 1921 | - $airline = $value['airline_icao']; |
|
| 1922 | - $ddate = $value['date']; |
|
| 1923 | - $find = false; |
|
| 1924 | - foreach ($pall as $pvalue) { |
|
| 1925 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1926 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1927 | - $find = true; |
|
| 1928 | - break; |
|
| 1929 | - } |
|
| 1930 | - } |
|
| 1931 | - if ($find === false) { |
|
| 1932 | - $pall[] = $value; |
|
| 1933 | - } |
|
| 1934 | - } |
|
| 1935 | - $alldata = $pall; |
|
| 1918 | + $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1919 | + foreach ($dall as $value) { |
|
| 1920 | + $icao = $value['departure_airport_icao']; |
|
| 1921 | + $airline = $value['airline_icao']; |
|
| 1922 | + $ddate = $value['date']; |
|
| 1923 | + $find = false; |
|
| 1924 | + foreach ($pall as $pvalue) { |
|
| 1925 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1926 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1927 | + $find = true; |
|
| 1928 | + break; |
|
| 1929 | + } |
|
| 1930 | + } |
|
| 1931 | + if ($find === false) { |
|
| 1932 | + $pall[] = $value; |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | + $alldata = $pall; |
|
| 1936 | 1936 | foreach ($alldata as $number) { |
| 1937 | 1937 | $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']); |
| 1938 | 1938 | } |
| 1939 | 1939 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1940 | 1940 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1941 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1942 | - foreach ($dall as $value) { |
|
| 1943 | - $icao = $value['arrival_airport_icao']; |
|
| 1944 | - $airline = $value['airline_icao']; |
|
| 1945 | - $ddate = $value['date']; |
|
| 1946 | - $find = false; |
|
| 1947 | - foreach ($pall as $pvalue) { |
|
| 1948 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1949 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1950 | - $find = true; |
|
| 1951 | - break; |
|
| 1952 | - } |
|
| 1953 | - } |
|
| 1954 | - if ($find === false) { |
|
| 1955 | - $pall[] = $value; |
|
| 1956 | - } |
|
| 1957 | - } |
|
| 1958 | - $alldata = $pall; |
|
| 1941 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1942 | + foreach ($dall as $value) { |
|
| 1943 | + $icao = $value['arrival_airport_icao']; |
|
| 1944 | + $airline = $value['airline_icao']; |
|
| 1945 | + $ddate = $value['date']; |
|
| 1946 | + $find = false; |
|
| 1947 | + foreach ($pall as $pvalue) { |
|
| 1948 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1949 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1950 | + $find = true; |
|
| 1951 | + break; |
|
| 1952 | + } |
|
| 1953 | + } |
|
| 1954 | + if ($find === false) { |
|
| 1955 | + $pall[] = $value; |
|
| 1956 | + } |
|
| 1957 | + } |
|
| 1958 | + $alldata = $pall; |
|
| 1959 | 1959 | foreach ($alldata as $number) { |
| 1960 | 1960 | $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']); |
| 1961 | 1961 | } |
@@ -2040,44 +2040,44 @@ discard block |
||
| 2040 | 2040 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 2041 | 2041 | } |
| 2042 | 2042 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 2043 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2044 | - $alldata = array(); |
|
| 2045 | - foreach ($pall as $value) { |
|
| 2046 | - $icao = $value['airport_departure_icao']; |
|
| 2047 | - $alldata[$icao] = $value; |
|
| 2048 | - } |
|
| 2049 | - foreach ($dall as $value) { |
|
| 2050 | - $icao = $value['airport_departure_icao']; |
|
| 2051 | - if (isset($alldata[$icao])) { |
|
| 2052 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2053 | - } else $alldata[$icao] = $value; |
|
| 2054 | - } |
|
| 2055 | - $count = array(); |
|
| 2056 | - foreach ($alldata as $key => $row) { |
|
| 2057 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 2058 | - } |
|
| 2043 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2044 | + $alldata = array(); |
|
| 2045 | + foreach ($pall as $value) { |
|
| 2046 | + $icao = $value['airport_departure_icao']; |
|
| 2047 | + $alldata[$icao] = $value; |
|
| 2048 | + } |
|
| 2049 | + foreach ($dall as $value) { |
|
| 2050 | + $icao = $value['airport_departure_icao']; |
|
| 2051 | + if (isset($alldata[$icao])) { |
|
| 2052 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 2053 | + } else $alldata[$icao] = $value; |
|
| 2054 | + } |
|
| 2055 | + $count = array(); |
|
| 2056 | + foreach ($alldata as $key => $row) { |
|
| 2057 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 2058 | + } |
|
| 2059 | 2059 | array_multisort($count,SORT_DESC,$alldata); |
| 2060 | 2060 | foreach ($alldata as $number) { |
| 2061 | - 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); |
|
| 2061 | + 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); |
|
| 2062 | 2062 | } |
| 2063 | 2063 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 2064 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2064 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2065 | 2065 | $alldata = array(); |
| 2066 | - foreach ($pall as $value) { |
|
| 2067 | - $icao = $value['airport_arrival_icao']; |
|
| 2068 | - $alldata[$icao] = $value; |
|
| 2069 | - } |
|
| 2070 | - foreach ($dall as $value) { |
|
| 2071 | - $icao = $value['airport_arrival_icao']; |
|
| 2072 | - if (isset($alldata[$icao])) { |
|
| 2073 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2074 | - } else $alldata[$icao] = $value; |
|
| 2075 | - } |
|
| 2076 | - $count = array(); |
|
| 2077 | - foreach ($alldata as $key => $row) { |
|
| 2078 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2079 | - } |
|
| 2080 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2066 | + foreach ($pall as $value) { |
|
| 2067 | + $icao = $value['airport_arrival_icao']; |
|
| 2068 | + $alldata[$icao] = $value; |
|
| 2069 | + } |
|
| 2070 | + foreach ($dall as $value) { |
|
| 2071 | + $icao = $value['airport_arrival_icao']; |
|
| 2072 | + if (isset($alldata[$icao])) { |
|
| 2073 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 2074 | + } else $alldata[$icao] = $value; |
|
| 2075 | + } |
|
| 2076 | + $count = array(); |
|
| 2077 | + foreach ($alldata as $key => $row) { |
|
| 2078 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 2079 | + } |
|
| 2080 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 2081 | 2081 | foreach ($alldata as $number) { |
| 2082 | 2082 | 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); |
| 2083 | 2083 | } |
@@ -2110,45 +2110,45 @@ discard block |
||
| 2110 | 2110 | } |
| 2111 | 2111 | echo '...Departure'."\n"; |
| 2112 | 2112 | $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
| 2113 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2113 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2114 | 2114 | foreach ($dall as $value) { |
| 2115 | - $icao = $value['departure_airport_icao']; |
|
| 2116 | - $ddate = $value['date']; |
|
| 2117 | - $find = false; |
|
| 2118 | - foreach ($pall as $pvalue) { |
|
| 2119 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2120 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2121 | - $find = true; |
|
| 2122 | - break; |
|
| 2123 | - } |
|
| 2124 | - } |
|
| 2125 | - if ($find === false) { |
|
| 2126 | - $pall[] = $value; |
|
| 2127 | - } |
|
| 2128 | - } |
|
| 2129 | - $alldata = $pall; |
|
| 2115 | + $icao = $value['departure_airport_icao']; |
|
| 2116 | + $ddate = $value['date']; |
|
| 2117 | + $find = false; |
|
| 2118 | + foreach ($pall as $pvalue) { |
|
| 2119 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2120 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 2121 | + $find = true; |
|
| 2122 | + break; |
|
| 2123 | + } |
|
| 2124 | + } |
|
| 2125 | + if ($find === false) { |
|
| 2126 | + $pall[] = $value; |
|
| 2127 | + } |
|
| 2128 | + } |
|
| 2129 | + $alldata = $pall; |
|
| 2130 | 2130 | foreach ($alldata as $number) { |
| 2131 | 2131 | $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); |
| 2132 | 2132 | } |
| 2133 | 2133 | echo '...Arrival'."\n"; |
| 2134 | 2134 | $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
| 2135 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2135 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2136 | 2136 | foreach ($dall as $value) { |
| 2137 | 2137 | $icao = $value['arrival_airport_icao']; |
| 2138 | 2138 | $ddate = $value['date']; |
| 2139 | - $find = false; |
|
| 2139 | + $find = false; |
|
| 2140 | 2140 | foreach ($pall as $pvalue) { |
| 2141 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2142 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2143 | - $find = true; |
|
| 2144 | - break; |
|
| 2145 | - } |
|
| 2146 | - } |
|
| 2147 | - if ($find === false) { |
|
| 2148 | - $pall[] = $value; |
|
| 2149 | - } |
|
| 2150 | - } |
|
| 2151 | - $alldata = $pall; |
|
| 2141 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 2142 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 2143 | + $find = true; |
|
| 2144 | + break; |
|
| 2145 | + } |
|
| 2146 | + } |
|
| 2147 | + if ($find === false) { |
|
| 2148 | + $pall[] = $value; |
|
| 2149 | + } |
|
| 2150 | + } |
|
| 2151 | + $alldata = $pall; |
|
| 2152 | 2152 | foreach ($alldata as $number) { |
| 2153 | 2153 | $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); |
| 2154 | 2154 | } |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 21 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 22 | 22 | $query = "DELETE FROM config WHERE name = :type; |
| 23 | 23 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 24 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 24 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 25 | 25 | try { |
| 26 | 26 | $sth = $this->db->prepare($query); |
| 27 | 27 | $sth->execute($query_values); |
| 28 | - } catch(PDOException $e) { |
|
| 28 | + } catch (PDOException $e) { |
|
| 29 | 29 | return "error : ".$e->getMessage(); |
| 30 | 30 | } |
| 31 | 31 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | try { |
| 36 | 36 | $sth = $this->db->prepare($query); |
| 37 | 37 | $sth->execute(array(':type' => $type)); |
| 38 | - } catch(PDOException $e) { |
|
| 38 | + } catch (PDOException $e) { |
|
| 39 | 39 | echo "error : ".$e->getMessage(); |
| 40 | 40 | } |
| 41 | 41 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | try { |
| 56 | 56 | $sth = $this->db->prepare($query); |
| 57 | 57 | $sth->execute(array(':filter_name' => $filter_name)); |
| 58 | - } catch(PDOException $e) { |
|
| 58 | + } catch (PDOException $e) { |
|
| 59 | 59 | return "error : ".$e->getMessage(); |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $this->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error : ".$e->getMessage(); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $this->db->prepare($query); |
| 78 | 78 | $sth->execute(array(':filter_name' => $filter_name)); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error : ".$e->getMessage(); |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -86,69 +86,69 @@ discard block |
||
| 86 | 86 | try { |
| 87 | 87 | $sth = $this->db->prepare($query); |
| 88 | 88 | $sth->execute(array(':filter_name' => $filter_name)); |
| 89 | - } catch(PDOException $e) { |
|
| 89 | + } catch (PDOException $e) { |
|
| 90 | 90 | echo "error : ".$e->getMessage(); |
| 91 | 91 | } |
| 92 | 92 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 93 | 93 | return $all; |
| 94 | 94 | } |
| 95 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 95 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 96 | 96 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 97 | 97 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 98 | 98 | try { |
| 99 | 99 | $sth = $this->db->prepare($query); |
| 100 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | - } catch(PDOException $e) { |
|
| 100 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 101 | + } catch (PDOException $e) { |
|
| 102 | 102 | echo "error : ".$e->getMessage(); |
| 103 | 103 | } |
| 104 | 104 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 105 | 105 | return $all; |
| 106 | 106 | } |
| 107 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 107 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 108 | 108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 109 | 109 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 110 | 110 | try { |
| 111 | 111 | $sth = $this->db->prepare($query); |
| 112 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | - } catch(PDOException $e) { |
|
| 112 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | echo "error : ".$e->getMessage(); |
| 115 | 115 | } |
| 116 | 116 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 117 | 117 | return $all; |
| 118 | 118 | } |
| 119 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 119 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 120 | 120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 121 | 121 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 122 | 122 | try { |
| 123 | 123 | $sth = $this->db->prepare($query); |
| 124 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | - } catch(PDOException $e) { |
|
| 124 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 125 | + } catch (PDOException $e) { |
|
| 126 | 126 | echo "error : ".$e->getMessage(); |
| 127 | 127 | } |
| 128 | 128 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 129 | 129 | return $all; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 132 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | 134 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name 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 getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 145 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | 147 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 148 | 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); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | |
| 159 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 159 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 160 | 160 | global $globalStatsFilters; |
| 161 | 161 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 162 | 162 | if ($year == '' && $month == '') { |
@@ -164,24 +164,24 @@ discard block |
||
| 164 | 164 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
| 165 | 165 | try { |
| 166 | 166 | $sth = $this->db->prepare($query); |
| 167 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 168 | - } catch(PDOException $e) { |
|
| 167 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 168 | + } catch (PDOException $e) { |
|
| 169 | 169 | echo "error : ".$e->getMessage(); |
| 170 | 170 | } |
| 171 | 171 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | 172 | } else $all = array(); |
| 173 | 173 | if (empty($all)) { |
| 174 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 174 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 175 | 175 | if ($filter_name != '') { |
| 176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 176 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 177 | 177 | } |
| 178 | 178 | $Spotter = new Spotter($this->db); |
| 179 | 179 | //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
| 180 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 180 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 181 | 181 | } |
| 182 | 182 | return $all; |
| 183 | 183 | } |
| 184 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 184 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 185 | 185 | global $globalStatsFilters; |
| 186 | 186 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 187 | 187 | if ($year == '' && $month == '') { |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | try { |
| 191 | 191 | $sth = $this->db->prepare($query); |
| 192 | 192 | $sth->execute(array(':filter_name' => $filter_name)); |
| 193 | - } catch(PDOException $e) { |
|
| 193 | + } catch (PDOException $e) { |
|
| 194 | 194 | echo "error : ".$e->getMessage(); |
| 195 | 195 | } |
| 196 | 196 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -198,16 +198,16 @@ discard block |
||
| 198 | 198 | if (empty($all)) { |
| 199 | 199 | $Spotter = new Spotter($this->db); |
| 200 | 200 | $filters = array(); |
| 201 | - $filters = array('year' => $year,'month' => $month); |
|
| 201 | + $filters = array('year' => $year, 'month' => $month); |
|
| 202 | 202 | if ($filter_name != '') { |
| 203 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 203 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 204 | 204 | } |
| 205 | 205 | //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
| 206 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 206 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 207 | 207 | } |
| 208 | 208 | return $all; |
| 209 | 209 | } |
| 210 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 210 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 211 | 211 | global $globalStatsFilters; |
| 212 | 212 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 213 | 213 | if ($year == '' && $month == '') { |
@@ -215,16 +215,16 @@ discard block |
||
| 215 | 215 | 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"; |
| 216 | 216 | try { |
| 217 | 217 | $sth = $this->db->prepare($query); |
| 218 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 219 | - } catch(PDOException $e) { |
|
| 218 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 219 | + } catch (PDOException $e) { |
|
| 220 | 220 | echo "error : ".$e->getMessage(); |
| 221 | 221 | } |
| 222 | 222 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 223 | 223 | } else $all = array(); |
| 224 | 224 | if (empty($all)) { |
| 225 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 225 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 226 | 226 | if ($filter_name != '') { |
| 227 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 227 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 228 | 228 | } |
| 229 | 229 | $Spotter = new Spotter($this->db); |
| 230 | 230 | //$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | return $all; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 236 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 237 | 237 | global $globalStatsFilters; |
| 238 | 238 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 239 | 239 | if ($year == '' && $month == '') { |
@@ -241,20 +241,20 @@ discard block |
||
| 241 | 241 | 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"; |
| 242 | 242 | try { |
| 243 | 243 | $sth = $this->db->prepare($query); |
| 244 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 245 | - } catch(PDOException $e) { |
|
| 244 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 245 | + } catch (PDOException $e) { |
|
| 246 | 246 | echo "error : ".$e->getMessage(); |
| 247 | 247 | } |
| 248 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | 249 | } else $all = array(); |
| 250 | 250 | if (empty($all)) { |
| 251 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 251 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 252 | 252 | if ($filter_name != '') { |
| 253 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 253 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 254 | 254 | } |
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 257 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 257 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 258 | 258 | } |
| 259 | 259 | return $all; |
| 260 | 260 | } |
@@ -265,15 +265,15 @@ discard block |
||
| 265 | 265 | 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"; |
| 266 | 266 | try { |
| 267 | 267 | $sth = $this->db->prepare($query); |
| 268 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | - } catch(PDOException $e) { |
|
| 268 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 269 | + } catch (PDOException $e) { |
|
| 270 | 270 | echo "error : ".$e->getMessage(); |
| 271 | 271 | } |
| 272 | 272 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 273 | 273 | if (empty($all)) { |
| 274 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 274 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 275 | 275 | if ($filter_name != '') { |
| 276 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 276 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 277 | 277 | } |
| 278 | 278 | $Spotter = new Spotter($this->db); |
| 279 | 279 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | return $all; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 285 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 286 | 286 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 287 | 287 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 288 | 288 | if ($year == '' && $month == '') { |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | if (isset($forsource)) { |
| 292 | 292 | 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"; |
| 293 | 293 | 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"; |
| 294 | - $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
|
| 294 | + $query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource); |
|
| 295 | 295 | } else { |
| 296 | 296 | 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"; |
| 297 | 297 | 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"; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | try { |
| 301 | 301 | $sth = $this->db->prepare($query); |
| 302 | 302 | $sth->execute($query_values); |
| 303 | - } catch(PDOException $e) { |
|
| 303 | + } catch (PDOException $e) { |
|
| 304 | 304 | echo "error : ".$e->getMessage(); |
| 305 | 305 | } |
| 306 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -308,16 +308,16 @@ discard block |
||
| 308 | 308 | if (empty($all)) { |
| 309 | 309 | $Spotter = new Spotter($this->db); |
| 310 | 310 | $filters = array(); |
| 311 | - $filters = array('year' => $year,'month' => $month); |
|
| 311 | + $filters = array('year' => $year, 'month' => $month); |
|
| 312 | 312 | if ($filter_name != '') { |
| 313 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 313 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 314 | 314 | } |
| 315 | 315 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 316 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 316 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 317 | 317 | } |
| 318 | 318 | return $all; |
| 319 | 319 | } |
| 320 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 320 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 321 | 321 | global $globalStatsFilters; |
| 322 | 322 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 323 | 323 | if ($year == '' && $month == '') { |
@@ -325,24 +325,24 @@ discard block |
||
| 325 | 325 | 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"; |
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 329 | - } catch(PDOException $e) { |
|
| 328 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo "error : ".$e->getMessage(); |
| 331 | 331 | } |
| 332 | 332 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | 333 | } else $all = array(); |
| 334 | 334 | if (empty($all)) { |
| 335 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 335 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 336 | 336 | if ($filter_name != '') { |
| 337 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 337 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 338 | 338 | } |
| 339 | 339 | $Spotter = new Spotter($this->db); |
| 340 | 340 | //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
| 341 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 341 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 342 | 342 | } |
| 343 | 343 | return $all; |
| 344 | 344 | } |
| 345 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 345 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 346 | 346 | global $globalStatsFilters; |
| 347 | 347 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 348 | 348 | if ($year == '' && $month == '') { |
@@ -350,24 +350,24 @@ discard block |
||
| 350 | 350 | 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"; |
| 351 | 351 | try { |
| 352 | 352 | $sth = $this->db->prepare($query); |
| 353 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 354 | - } catch(PDOException $e) { |
|
| 353 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 354 | + } catch (PDOException $e) { |
|
| 355 | 355 | echo "error : ".$e->getMessage(); |
| 356 | 356 | } |
| 357 | 357 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 358 | 358 | } else $all = array(); |
| 359 | 359 | if (empty($all)) { |
| 360 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 360 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 361 | 361 | if ($filter_name != '') { |
| 362 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 362 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 363 | 363 | } |
| 364 | 364 | $Spotter = new Spotter($this->db); |
| 365 | 365 | //$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
| 366 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 366 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 367 | 367 | } |
| 368 | 368 | return $all; |
| 369 | 369 | } |
| 370 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 370 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 371 | 371 | $Connection = new Connection(); |
| 372 | 372 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 373 | 373 | if ($Connection->tableExists('countries')) { |
@@ -376,8 +376,8 @@ discard block |
||
| 376 | 376 | 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"; |
| 377 | 377 | try { |
| 378 | 378 | $sth = $this->db->prepare($query); |
| 379 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 380 | - } catch(PDOException $e) { |
|
| 379 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 380 | + } catch (PDOException $e) { |
|
| 381 | 381 | echo "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | return array(); |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 396 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 397 | 397 | global $globalStatsFilters; |
| 398 | 398 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 399 | 399 | if ($year == '' && $month == '') { |
@@ -401,25 +401,25 @@ discard block |
||
| 401 | 401 | 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"; |
| 402 | 402 | try { |
| 403 | 403 | $sth = $this->db->prepare($query); |
| 404 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 405 | - } catch(PDOException $e) { |
|
| 404 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 405 | + } catch (PDOException $e) { |
|
| 406 | 406 | echo "error : ".$e->getMessage(); |
| 407 | 407 | } |
| 408 | 408 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 409 | 409 | } else $all = array(); |
| 410 | 410 | if (empty($all)) { |
| 411 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 411 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 412 | 412 | if ($filter_name != '') { |
| 413 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 413 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 414 | 414 | } |
| 415 | 415 | $Spotter = new Spotter($this->db); |
| 416 | 416 | //$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
| 417 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 417 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 418 | 418 | } |
| 419 | 419 | return $all; |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 422 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 423 | 423 | global $globalStatsFilters; |
| 424 | 424 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 425 | 425 | if ($year == '' && $month == '') { |
@@ -427,24 +427,24 @@ discard block |
||
| 427 | 427 | 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"; |
| 428 | 428 | try { |
| 429 | 429 | $sth = $this->db->prepare($query); |
| 430 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 431 | - } catch(PDOException $e) { |
|
| 430 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 431 | + } catch (PDOException $e) { |
|
| 432 | 432 | echo "error : ".$e->getMessage(); |
| 433 | 433 | } |
| 434 | 434 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | 435 | } else $all = array(); |
| 436 | 436 | if (empty($all)) { |
| 437 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 437 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 438 | 438 | if ($filter_name != '') { |
| 439 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 439 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 440 | 440 | } |
| 441 | 441 | $Spotter = new Spotter($this->db); |
| 442 | 442 | //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
| 443 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 443 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 444 | 444 | } |
| 445 | 445 | return $all; |
| 446 | 446 | } |
| 447 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 447 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 448 | 448 | global $globalStatsFilters; |
| 449 | 449 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 450 | 450 | if ($year == '' && $month == '') { |
@@ -452,22 +452,22 @@ discard block |
||
| 452 | 452 | 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"; |
| 453 | 453 | try { |
| 454 | 454 | $sth = $this->db->prepare($query); |
| 455 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 456 | - } catch(PDOException $e) { |
|
| 455 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 456 | + } catch (PDOException $e) { |
|
| 457 | 457 | echo "error : ".$e->getMessage(); |
| 458 | 458 | } |
| 459 | 459 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | 460 | } else $all = array(); |
| 461 | 461 | if (empty($all)) { |
| 462 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 462 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 463 | 463 | if ($filter_name != '') { |
| 464 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 464 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 465 | 465 | } |
| 466 | 466 | $Spotter = new Spotter($this->db); |
| 467 | 467 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 468 | 468 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 469 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 469 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 470 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 471 | 471 | $all = array(); |
| 472 | 472 | foreach ($pall as $value) { |
| 473 | 473 | $icao = $value['airport_departure_icao']; |
@@ -484,11 +484,11 @@ discard block |
||
| 484 | 484 | foreach ($all as $key => $row) { |
| 485 | 485 | $count[$key] = $row['airport_departure_icao_count']; |
| 486 | 486 | } |
| 487 | - array_multisort($count,SORT_DESC,$all); |
|
| 487 | + array_multisort($count, SORT_DESC, $all); |
|
| 488 | 488 | } |
| 489 | 489 | return $all; |
| 490 | 490 | } |
| 491 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 491 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 492 | 492 | global $globalStatsFilters; |
| 493 | 493 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 494 | 494 | if ($year == '' && $month == '') { |
@@ -496,22 +496,22 @@ discard block |
||
| 496 | 496 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 497 | 497 | try { |
| 498 | 498 | $sth = $this->db->prepare($query); |
| 499 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 500 | - } catch(PDOException $e) { |
|
| 499 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 500 | + } catch (PDOException $e) { |
|
| 501 | 501 | echo "error : ".$e->getMessage(); |
| 502 | 502 | } |
| 503 | 503 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 504 | 504 | } else $all = array(); |
| 505 | 505 | if (empty($all)) { |
| 506 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 506 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 507 | 507 | if ($filter_name != '') { |
| 508 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 508 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 509 | 509 | } |
| 510 | 510 | $Spotter = new Spotter($this->db); |
| 511 | 511 | // $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 512 | 512 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 513 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 514 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 513 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 514 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 515 | 515 | $all = array(); |
| 516 | 516 | foreach ($pall as $value) { |
| 517 | 517 | $icao = $value['airport_arrival_icao']; |
@@ -528,12 +528,12 @@ discard block |
||
| 528 | 528 | foreach ($all as $key => $row) { |
| 529 | 529 | $count[$key] = $row['airport_arrival_icao_count']; |
| 530 | 530 | } |
| 531 | - array_multisort($count,SORT_DESC,$all); |
|
| 531 | + array_multisort($count, SORT_DESC, $all); |
|
| 532 | 532 | } |
| 533 | 533 | |
| 534 | 534 | return $all; |
| 535 | 535 | } |
| 536 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 536 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 537 | 537 | global $globalDBdriver, $globalStatsFilters; |
| 538 | 538 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 539 | 539 | if ($globalDBdriver == 'mysql') { |
@@ -543,18 +543,18 @@ discard block |
||
| 543 | 543 | 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"; |
| 544 | 544 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 545 | 545 | } |
| 546 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 546 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 547 | 547 | try { |
| 548 | 548 | $sth = $this->db->prepare($query); |
| 549 | 549 | $sth->execute($query_data); |
| 550 | - } catch(PDOException $e) { |
|
| 550 | + } catch (PDOException $e) { |
|
| 551 | 551 | echo "error : ".$e->getMessage(); |
| 552 | 552 | } |
| 553 | 553 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 554 | 554 | if (empty($all)) { |
| 555 | 555 | $filters = array('airlines' => array($stats_airline)); |
| 556 | 556 | if ($filter_name != '') { |
| 557 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 557 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 558 | 558 | } |
| 559 | 559 | $Spotter = new Spotter($this->db); |
| 560 | 560 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -563,29 +563,29 @@ discard block |
||
| 563 | 563 | return $all; |
| 564 | 564 | } |
| 565 | 565 | |
| 566 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 566 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 567 | 567 | global $globalStatsFilters; |
| 568 | 568 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 569 | 569 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 570 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 570 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 571 | 571 | try { |
| 572 | 572 | $sth = $this->db->prepare($query); |
| 573 | 573 | $sth->execute($query_data); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | echo "error : ".$e->getMessage(); |
| 576 | 576 | } |
| 577 | 577 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 578 | 578 | if (empty($all)) { |
| 579 | 579 | $filters = array('airlines' => array($stats_airline)); |
| 580 | 580 | if ($filter_name != '') { |
| 581 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 581 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 582 | 582 | } |
| 583 | 583 | $Spotter = new Spotter($this->db); |
| 584 | 584 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 585 | 585 | } |
| 586 | 586 | return $all; |
| 587 | 587 | } |
| 588 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 588 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 589 | 589 | global $globalDBdriver, $globalStatsFilters; |
| 590 | 590 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 591 | 591 | if ($globalDBdriver == 'mysql') { |
@@ -593,40 +593,40 @@ discard block |
||
| 593 | 593 | } else { |
| 594 | 594 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 595 | 595 | } |
| 596 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 596 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 597 | 597 | try { |
| 598 | 598 | $sth = $this->db->prepare($query); |
| 599 | 599 | $sth->execute($query_data); |
| 600 | - } catch(PDOException $e) { |
|
| 600 | + } catch (PDOException $e) { |
|
| 601 | 601 | echo "error : ".$e->getMessage(); |
| 602 | 602 | } |
| 603 | 603 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 604 | 604 | if (empty($all)) { |
| 605 | 605 | $filters = array('airlines' => array($stats_airline)); |
| 606 | 606 | if ($filter_name != '') { |
| 607 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 607 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 608 | 608 | } |
| 609 | 609 | $Spotter = new Spotter($this->db); |
| 610 | 610 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 611 | 611 | } |
| 612 | 612 | return $all; |
| 613 | 613 | } |
| 614 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 614 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 615 | 615 | global $globalStatsFilters; |
| 616 | 616 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 617 | 617 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 618 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 618 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 619 | 619 | try { |
| 620 | 620 | $sth = $this->db->prepare($query); |
| 621 | 621 | $sth->execute($query_data); |
| 622 | - } catch(PDOException $e) { |
|
| 622 | + } catch (PDOException $e) { |
|
| 623 | 623 | echo "error : ".$e->getMessage(); |
| 624 | 624 | } |
| 625 | 625 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 626 | 626 | if (empty($all)) { |
| 627 | 627 | $filters = array('airlines' => array($stats_airline)); |
| 628 | 628 | if ($filter_name != '') { |
| 629 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 629 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 630 | 630 | } |
| 631 | 631 | $Spotter = new Spotter($this->db); |
| 632 | 632 | $all = $Spotter->countAllDates($filters); |
@@ -641,21 +641,21 @@ discard block |
||
| 641 | 641 | try { |
| 642 | 642 | $sth = $this->db->prepare($query); |
| 643 | 643 | $sth->execute($query_data); |
| 644 | - } catch(PDOException $e) { |
|
| 644 | + } catch (PDOException $e) { |
|
| 645 | 645 | echo "error : ".$e->getMessage(); |
| 646 | 646 | } |
| 647 | 647 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 648 | 648 | if (empty($all)) { |
| 649 | 649 | $filters = array(); |
| 650 | 650 | if ($filter_name != '') { |
| 651 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 651 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 652 | 652 | } |
| 653 | 653 | $Spotter = new Spotter($this->db); |
| 654 | 654 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 655 | 655 | } |
| 656 | 656 | return $all; |
| 657 | 657 | } |
| 658 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 658 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 659 | 659 | global $globalStatsFilters, $globalDBdriver; |
| 660 | 660 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 661 | 661 | if ($globalDBdriver == 'mysql') { |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | try { |
| 667 | 667 | $sth = $this->db->prepare($query); |
| 668 | 668 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 669 | - } catch(PDOException $e) { |
|
| 669 | + } catch (PDOException $e) { |
|
| 670 | 670 | echo "error : ".$e->getMessage(); |
| 671 | 671 | } |
| 672 | 672 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | if (empty($all)) { |
| 675 | 675 | $filters = array('airlines' => array($stats_airline)); |
| 676 | 676 | if ($filter_name != '') { |
| 677 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 677 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 678 | 678 | } |
| 679 | 679 | $Spotter = new Spotter($this->db); |
| 680 | 680 | $all = $Spotter->countAllMonths($filters); |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | try { |
| 693 | 693 | $sth = $this->db->prepare($query); |
| 694 | 694 | $sth->execute(); |
| 695 | - } catch(PDOException $e) { |
|
| 695 | + } catch (PDOException $e) { |
|
| 696 | 696 | echo "error : ".$e->getMessage(); |
| 697 | 697 | } |
| 698 | 698 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | try { |
| 714 | 714 | $sth = $this->db->prepare($query); |
| 715 | 715 | $sth->execute(); |
| 716 | - } catch(PDOException $e) { |
|
| 716 | + } catch (PDOException $e) { |
|
| 717 | 717 | echo "error : ".$e->getMessage(); |
| 718 | 718 | } |
| 719 | 719 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -731,21 +731,21 @@ discard block |
||
| 731 | 731 | try { |
| 732 | 732 | $sth = $this->db->prepare($query); |
| 733 | 733 | $sth->execute(array(':filter_name' => $filter_name)); |
| 734 | - } catch(PDOException $e) { |
|
| 734 | + } catch (PDOException $e) { |
|
| 735 | 735 | echo "error : ".$e->getMessage(); |
| 736 | 736 | } |
| 737 | 737 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 738 | 738 | if (empty($all)) { |
| 739 | 739 | $filters = array(); |
| 740 | 740 | if ($filter_name != '') { |
| 741 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 741 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 742 | 742 | } |
| 743 | 743 | $Spotter = new Spotter($this->db); |
| 744 | 744 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 745 | 745 | } |
| 746 | 746 | return $all; |
| 747 | 747 | } |
| 748 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 748 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 749 | 749 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 750 | 750 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 751 | 751 | 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"; |
@@ -762,30 +762,30 @@ discard block |
||
| 762 | 762 | try { |
| 763 | 763 | $sth = $this->db->prepare($query); |
| 764 | 764 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 765 | - } catch(PDOException $e) { |
|
| 765 | + } catch (PDOException $e) { |
|
| 766 | 766 | echo "error : ".$e->getMessage(); |
| 767 | 767 | } |
| 768 | 768 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 769 | 769 | if (empty($all)) { |
| 770 | 770 | $filters = array('airlines' => array($stats_airline)); |
| 771 | 771 | if ($filter_name != '') { |
| 772 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 772 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 773 | 773 | } |
| 774 | 774 | $Spotter = new Spotter($this->db); |
| 775 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 775 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 776 | 776 | } |
| 777 | 777 | return $all; |
| 778 | 778 | } |
| 779 | 779 | |
| 780 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 780 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 781 | 781 | global $globalStatsFilters; |
| 782 | 782 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 783 | 783 | if ($year == '') $year = date('Y'); |
| 784 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 784 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 785 | 785 | if (empty($all)) { |
| 786 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 786 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 787 | 787 | if ($filter_name != '') { |
| 788 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 788 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 789 | 789 | } |
| 790 | 790 | $Spotter = new Spotter($this->db); |
| 791 | 791 | //$all = $Spotter->countOverallFlights($filters,$year,$month); |
@@ -793,16 +793,16 @@ discard block |
||
| 793 | 793 | } |
| 794 | 794 | return $all; |
| 795 | 795 | } |
| 796 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 796 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 797 | 797 | global $globalStatsFilters; |
| 798 | 798 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 799 | 799 | if ($year == '') $year = date('Y'); |
| 800 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 800 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 801 | 801 | if (empty($all)) { |
| 802 | 802 | $filters = array(); |
| 803 | - $filters = array('year' => $year,'month' => $month); |
|
| 803 | + $filters = array('year' => $year, 'month' => $month); |
|
| 804 | 804 | if ($filter_name != '') { |
| 805 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 805 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 806 | 806 | } |
| 807 | 807 | $Spotter = new Spotter($this->db); |
| 808 | 808 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -810,15 +810,15 @@ discard block |
||
| 810 | 810 | } |
| 811 | 811 | return $all; |
| 812 | 812 | } |
| 813 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 813 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 814 | 814 | global $globalStatsFilters; |
| 815 | 815 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 816 | 816 | if ($year == '') $year = date('Y'); |
| 817 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 817 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 818 | 818 | if (empty($all)) { |
| 819 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 819 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 820 | 820 | if ($filter_name != '') { |
| 821 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 821 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 822 | 822 | } |
| 823 | 823 | $Spotter = new Spotter($this->db); |
| 824 | 824 | //$all = $Spotter->countOverallArrival($filters,$year,$month); |
@@ -826,24 +826,24 @@ discard block |
||
| 826 | 826 | } |
| 827 | 827 | return $all; |
| 828 | 828 | } |
| 829 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 829 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 830 | 830 | global $globalStatsFilters; |
| 831 | 831 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 832 | 832 | if ($year == '' && $month == '') { |
| 833 | 833 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 834 | 834 | try { |
| 835 | 835 | $sth = $this->db->prepare($query); |
| 836 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 837 | - } catch(PDOException $e) { |
|
| 836 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | echo "error : ".$e->getMessage(); |
| 839 | 839 | } |
| 840 | 840 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 841 | 841 | $all = $result[0]['nb']; |
| 842 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 842 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 843 | 843 | if (empty($all)) { |
| 844 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 844 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 845 | 845 | if ($filter_name != '') { |
| 846 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 846 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 847 | 847 | } |
| 848 | 848 | $Spotter = new Spotter($this->db); |
| 849 | 849 | //$all = $Spotter->countOverallAircrafts($filters,$year,$month); |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | } |
| 852 | 852 | return $all; |
| 853 | 853 | } |
| 854 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 854 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 855 | 855 | global $globalStatsFilters; |
| 856 | 856 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 857 | 857 | if ($year == '' && $month == '') { |
@@ -859,17 +859,17 @@ discard block |
||
| 859 | 859 | try { |
| 860 | 860 | $sth = $this->db->prepare($query); |
| 861 | 861 | $sth->execute(array(':filter_name' => $filter_name)); |
| 862 | - } catch(PDOException $e) { |
|
| 862 | + } catch (PDOException $e) { |
|
| 863 | 863 | echo "error : ".$e->getMessage(); |
| 864 | 864 | } |
| 865 | 865 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 866 | 866 | $all = $result[0]['nb_airline']; |
| 867 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 867 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 868 | 868 | if (empty($all)) { |
| 869 | 869 | $filters = array(); |
| 870 | - $filters = array('year' => $year,'month' => $month); |
|
| 870 | + $filters = array('year' => $year, 'month' => $month); |
|
| 871 | 871 | if ($filter_name != '') { |
| 872 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 872 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 873 | 873 | } |
| 874 | 874 | $Spotter = new Spotter($this->db); |
| 875 | 875 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | } |
| 878 | 878 | return $all; |
| 879 | 879 | } |
| 880 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 880 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 881 | 881 | global $globalStatsFilters; |
| 882 | 882 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 883 | 883 | if ($year == '' && $month == '') { |
@@ -886,18 +886,18 @@ discard block |
||
| 886 | 886 | try { |
| 887 | 887 | $sth = $this->db->prepare($query); |
| 888 | 888 | $sth->execute($query_values); |
| 889 | - } catch(PDOException $e) { |
|
| 889 | + } catch (PDOException $e) { |
|
| 890 | 890 | echo "error : ".$e->getMessage(); |
| 891 | 891 | } |
| 892 | 892 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 893 | 893 | $all = $result[0]['nb']; |
| 894 | 894 | } else { |
| 895 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 895 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 896 | 896 | } |
| 897 | 897 | if (empty($all)) { |
| 898 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 898 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 899 | 899 | if ($filter_name != '') { |
| 900 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 900 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 901 | 901 | } |
| 902 | 902 | $Spotter = new Spotter($this->db); |
| 903 | 903 | //$all = $Spotter->countOverallOwners($filters,$year,$month); |
@@ -905,7 +905,7 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | return $all; |
| 907 | 907 | } |
| 908 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 908 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 909 | 909 | global $globalStatsFilters; |
| 910 | 910 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 911 | 911 | //if ($year == '') $year = date('Y'); |
@@ -915,18 +915,18 @@ discard block |
||
| 915 | 915 | try { |
| 916 | 916 | $sth = $this->db->prepare($query); |
| 917 | 917 | $sth->execute($query_values); |
| 918 | - } catch(PDOException $e) { |
|
| 918 | + } catch (PDOException $e) { |
|
| 919 | 919 | echo "error : ".$e->getMessage(); |
| 920 | 920 | } |
| 921 | 921 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 922 | 922 | $all = $result[0]['nb']; |
| 923 | 923 | } else { |
| 924 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 924 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 925 | 925 | } |
| 926 | 926 | if (empty($all)) { |
| 927 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 927 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 928 | 928 | if ($filter_name != '') { |
| 929 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 929 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 930 | 930 | } |
| 931 | 931 | $Spotter = new Spotter($this->db); |
| 932 | 932 | //$all = $Spotter->countOverallPilots($filters,$year,$month); |
@@ -935,67 +935,67 @@ discard block |
||
| 935 | 935 | return $all; |
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 938 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 939 | 939 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 940 | 940 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 941 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 941 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 942 | 942 | try { |
| 943 | 943 | $sth = $this->db->prepare($query); |
| 944 | 944 | $sth->execute($query_values); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | echo "error : ".$e->getMessage(); |
| 947 | 947 | } |
| 948 | 948 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 949 | 949 | return $all; |
| 950 | 950 | } |
| 951 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 951 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 952 | 952 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 953 | 953 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 954 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 954 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 955 | 955 | try { |
| 956 | 956 | $sth = $this->db->prepare($query); |
| 957 | 957 | $sth->execute($query_values); |
| 958 | - } catch(PDOException $e) { |
|
| 958 | + } catch (PDOException $e) { |
|
| 959 | 959 | echo "error : ".$e->getMessage(); |
| 960 | 960 | } |
| 961 | 961 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 962 | 962 | return $all; |
| 963 | 963 | } |
| 964 | - public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
|
| 964 | + public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') { |
|
| 965 | 965 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | 966 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 967 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 967 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 968 | 968 | try { |
| 969 | 969 | $sth = $this->db->prepare($query); |
| 970 | 970 | $sth->execute($query_values); |
| 971 | - } catch(PDOException $e) { |
|
| 971 | + } catch (PDOException $e) { |
|
| 972 | 972 | echo "error : ".$e->getMessage(); |
| 973 | 973 | } |
| 974 | 974 | } |
| 975 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 975 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 976 | 976 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 977 | 977 | global $globalArchiveMonths, $globalDBdriver; |
| 978 | 978 | if ($globalDBdriver == 'mysql') { |
| 979 | 979 | if ($month == '') { |
| 980 | 980 | $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"; |
| 981 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 981 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 982 | 982 | } else { |
| 983 | 983 | $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"; |
| 984 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 984 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 985 | 985 | } |
| 986 | 986 | } else { |
| 987 | 987 | if ($month == '') { |
| 988 | 988 | $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"; |
| 989 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 989 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 990 | 990 | } else { |
| 991 | 991 | $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"; |
| 992 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 992 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 993 | 993 | } |
| 994 | 994 | } |
| 995 | 995 | try { |
| 996 | 996 | $sth = $this->db->prepare($query); |
| 997 | 997 | $sth->execute($query_values); |
| 998 | - } catch(PDOException $e) { |
|
| 998 | + } catch (PDOException $e) { |
|
| 999 | 999 | echo "error : ".$e->getMessage(); |
| 1000 | 1000 | } |
| 1001 | 1001 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | try { |
| 1014 | 1014 | $sth = $this->db->prepare($query); |
| 1015 | 1015 | $sth->execute($query_values); |
| 1016 | - } catch(PDOException $e) { |
|
| 1016 | + } catch (PDOException $e) { |
|
| 1017 | 1017 | echo "error : ".$e->getMessage(); |
| 1018 | 1018 | } |
| 1019 | 1019 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | try { |
| 1031 | 1031 | $sth = $this->db->prepare($query); |
| 1032 | 1032 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 1033 | - } catch(PDOException $e) { |
|
| 1033 | + } catch (PDOException $e) { |
|
| 1034 | 1034 | echo "error : ".$e->getMessage(); |
| 1035 | 1035 | } |
| 1036 | 1036 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | try { |
| 1048 | 1048 | $sth = $this->db->prepare($query); |
| 1049 | 1049 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1050 | - } catch(PDOException $e) { |
|
| 1050 | + } catch (PDOException $e) { |
|
| 1051 | 1051 | echo "error : ".$e->getMessage(); |
| 1052 | 1052 | } |
| 1053 | 1053 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1064,20 +1064,20 @@ discard block |
||
| 1064 | 1064 | try { |
| 1065 | 1065 | $sth = $this->db->prepare($query); |
| 1066 | 1066 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1067 | - } catch(PDOException $e) { |
|
| 1067 | + } catch (PDOException $e) { |
|
| 1068 | 1068 | echo "error : ".$e->getMessage(); |
| 1069 | 1069 | } |
| 1070 | 1070 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1071 | 1071 | return $all[0]['total']; |
| 1072 | 1072 | } |
| 1073 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 1073 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 1074 | 1074 | global $globalArchiveMonths, $globalDBdriver; |
| 1075 | 1075 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1076 | 1076 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1077 | 1077 | try { |
| 1078 | 1078 | $sth = $this->db->prepare($query); |
| 1079 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | - } catch(PDOException $e) { |
|
| 1079 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | echo "error : ".$e->getMessage(); |
| 1082 | 1082 | } |
| 1083 | 1083 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1095,20 +1095,20 @@ discard block |
||
| 1095 | 1095 | try { |
| 1096 | 1096 | $sth = $this->db->prepare($query); |
| 1097 | 1097 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1098 | - } catch(PDOException $e) { |
|
| 1098 | + } catch (PDOException $e) { |
|
| 1099 | 1099 | echo "error : ".$e->getMessage(); |
| 1100 | 1100 | } |
| 1101 | 1101 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1102 | 1102 | return $all[0]['total']; |
| 1103 | 1103 | } |
| 1104 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1104 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1105 | 1105 | global $globalArchiveMonths, $globalDBdriver; |
| 1106 | 1106 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1107 | 1107 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1108 | 1108 | try { |
| 1109 | 1109 | $sth = $this->db->prepare($query); |
| 1110 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | - } catch(PDOException $e) { |
|
| 1110 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1111 | + } catch (PDOException $e) { |
|
| 1112 | 1112 | echo "error : ".$e->getMessage(); |
| 1113 | 1113 | } |
| 1114 | 1114 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | else return 0; |
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1119 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1122 | 1122 | if ($globalDBdriver == 'mysql') { |
@@ -1124,15 +1124,15 @@ discard block |
||
| 1124 | 1124 | } else { |
| 1125 | 1125 | $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);"; |
| 1126 | 1126 | } |
| 1127 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1127 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1128 | 1128 | try { |
| 1129 | 1129 | $sth = $this->db->prepare($query); |
| 1130 | 1130 | $sth->execute($query_values); |
| 1131 | - } catch(PDOException $e) { |
|
| 1131 | + } catch (PDOException $e) { |
|
| 1132 | 1132 | return "error : ".$e->getMessage(); |
| 1133 | 1133 | } |
| 1134 | 1134 | } |
| 1135 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1135 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1136 | 1136 | global $globalDBdriver; |
| 1137 | 1137 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1138 | 1138 | if ($globalDBdriver == 'mysql') { |
@@ -1141,11 +1141,11 @@ discard block |
||
| 1141 | 1141 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1142 | 1142 | $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);"; |
| 1143 | 1143 | } |
| 1144 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1144 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1145 | 1145 | try { |
| 1146 | 1146 | $sth = $this->db->prepare($query); |
| 1147 | 1147 | $sth->execute($query_values); |
| 1148 | - } catch(PDOException $e) { |
|
| 1148 | + } catch (PDOException $e) { |
|
| 1149 | 1149 | return "error : ".$e->getMessage(); |
| 1150 | 1150 | } |
| 1151 | 1151 | } |
@@ -1169,75 +1169,75 @@ discard block |
||
| 1169 | 1169 | } |
| 1170 | 1170 | */ |
| 1171 | 1171 | |
| 1172 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1172 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1173 | 1173 | global $globalDBdriver; |
| 1174 | 1174 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1175 | 1175 | $query_values = array(); |
| 1176 | 1176 | if ($globalDBdriver == 'mysql') { |
| 1177 | 1177 | if ($year != '') { |
| 1178 | 1178 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1179 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1179 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1180 | 1180 | } |
| 1181 | 1181 | if ($month != '') { |
| 1182 | 1182 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1183 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1183 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1184 | 1184 | } |
| 1185 | 1185 | if ($day != '') { |
| 1186 | 1186 | $query .= ' AND DAY(stats_date) = :day'; |
| 1187 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1187 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1188 | 1188 | } |
| 1189 | 1189 | } else { |
| 1190 | 1190 | if ($year != '') { |
| 1191 | 1191 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1192 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1192 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1193 | 1193 | } |
| 1194 | 1194 | if ($month != '') { |
| 1195 | 1195 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1196 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1196 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1197 | 1197 | } |
| 1198 | 1198 | if ($day != '') { |
| 1199 | 1199 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1200 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1200 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1201 | 1201 | } |
| 1202 | 1202 | } |
| 1203 | 1203 | $query .= " ORDER BY source_name"; |
| 1204 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1204 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1205 | 1205 | try { |
| 1206 | 1206 | $sth = $this->db->prepare($query); |
| 1207 | 1207 | $sth->execute($query_values); |
| 1208 | - } catch(PDOException $e) { |
|
| 1208 | + } catch (PDOException $e) { |
|
| 1209 | 1209 | echo "error : ".$e->getMessage(); |
| 1210 | 1210 | } |
| 1211 | 1211 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1212 | 1212 | return $all; |
| 1213 | 1213 | } |
| 1214 | 1214 | |
| 1215 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1215 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1216 | 1216 | global $globalDBdriver; |
| 1217 | 1217 | if ($globalDBdriver == 'mysql') { |
| 1218 | 1218 | $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"; |
| 1219 | 1219 | } else { |
| 1220 | 1220 | $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);"; |
| 1221 | 1221 | } |
| 1222 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1222 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1223 | 1223 | try { |
| 1224 | 1224 | $sth = $this->db->prepare($query); |
| 1225 | 1225 | $sth->execute($query_values); |
| 1226 | - } catch(PDOException $e) { |
|
| 1226 | + } catch (PDOException $e) { |
|
| 1227 | 1227 | return "error : ".$e->getMessage(); |
| 1228 | 1228 | } |
| 1229 | 1229 | } |
| 1230 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1230 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1231 | 1231 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1232 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1232 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $this->db->prepare($query); |
| 1235 | 1235 | $sth->execute($query_values); |
| 1236 | - } catch(PDOException $e) { |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | return "error : ".$e->getMessage(); |
| 1238 | 1238 | } |
| 1239 | 1239 | } |
| 1240 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1240 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | if ($globalDBdriver == 'mysql') { |
| 1243 | 1243 | if ($reset) { |
@@ -1252,15 +1252,15 @@ discard block |
||
| 1252 | 1252 | $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);"; |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
| 1255 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1255 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | 1256 | try { |
| 1257 | 1257 | $sth = $this->db->prepare($query); |
| 1258 | 1258 | $sth->execute($query_values); |
| 1259 | - } catch(PDOException $e) { |
|
| 1259 | + } catch (PDOException $e) { |
|
| 1260 | 1260 | return "error : ".$e->getMessage(); |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
| 1263 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1263 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1264 | 1264 | global $globalDBdriver; |
| 1265 | 1265 | if ($globalDBdriver == 'mysql') { |
| 1266 | 1266 | if ($reset) { |
@@ -1275,15 +1275,15 @@ discard block |
||
| 1275 | 1275 | $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);"; |
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1278 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | 1279 | try { |
| 1280 | 1280 | $sth = $this->db->prepare($query); |
| 1281 | 1281 | $sth->execute($query_values); |
| 1282 | - } catch(PDOException $e) { |
|
| 1282 | + } catch (PDOException $e) { |
|
| 1283 | 1283 | return "error : ".$e->getMessage(); |
| 1284 | 1284 | } |
| 1285 | 1285 | } |
| 1286 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1286 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1287 | 1287 | global $globalDBdriver; |
| 1288 | 1288 | if ($globalDBdriver == 'mysql') { |
| 1289 | 1289 | if ($reset) { |
@@ -1298,15 +1298,15 @@ discard block |
||
| 1298 | 1298 | $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);"; |
| 1299 | 1299 | } |
| 1300 | 1300 | } |
| 1301 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1301 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $this->db->prepare($query); |
| 1304 | 1304 | $sth->execute($query_values); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error : ".$e->getMessage(); |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
| 1309 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1309 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1310 | 1310 | global $globalDBdriver; |
| 1311 | 1311 | if ($globalDBdriver == 'mysql') { |
| 1312 | 1312 | if ($reset) { |
@@ -1321,15 +1321,15 @@ discard block |
||
| 1321 | 1321 | $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);"; |
| 1322 | 1322 | } |
| 1323 | 1323 | } |
| 1324 | - $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); |
|
| 1324 | + $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); |
|
| 1325 | 1325 | try { |
| 1326 | 1326 | $sth = $this->db->prepare($query); |
| 1327 | 1327 | $sth->execute($query_values); |
| 1328 | - } catch(PDOException $e) { |
|
| 1328 | + } catch (PDOException $e) { |
|
| 1329 | 1329 | return "error : ".$e->getMessage(); |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
| 1332 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1332 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1333 | 1333 | global $globalDBdriver; |
| 1334 | 1334 | if ($globalDBdriver == 'mysql') { |
| 1335 | 1335 | if ($reset) { |
@@ -1344,15 +1344,15 @@ discard block |
||
| 1344 | 1344 | $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);"; |
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1347 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1348 | 1348 | try { |
| 1349 | 1349 | $sth = $this->db->prepare($query); |
| 1350 | 1350 | $sth->execute($query_values); |
| 1351 | - } catch(PDOException $e) { |
|
| 1351 | + } catch (PDOException $e) { |
|
| 1352 | 1352 | return "error : ".$e->getMessage(); |
| 1353 | 1353 | } |
| 1354 | 1354 | } |
| 1355 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1355 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1356 | 1356 | global $globalDBdriver; |
| 1357 | 1357 | if ($globalDBdriver == 'mysql') { |
| 1358 | 1358 | if ($reset) { |
@@ -1367,15 +1367,15 @@ discard block |
||
| 1367 | 1367 | $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);"; |
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1370 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1371 | 1371 | try { |
| 1372 | 1372 | $sth = $this->db->prepare($query); |
| 1373 | 1373 | $sth->execute($query_values); |
| 1374 | - } catch(PDOException $e) { |
|
| 1374 | + } catch (PDOException $e) { |
|
| 1375 | 1375 | return "error : ".$e->getMessage(); |
| 1376 | 1376 | } |
| 1377 | 1377 | } |
| 1378 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1378 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1379 | 1379 | global $globalDBdriver; |
| 1380 | 1380 | if ($globalDBdriver == 'mysql') { |
| 1381 | 1381 | if ($reset) { |
@@ -1390,15 +1390,15 @@ discard block |
||
| 1390 | 1390 | $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);"; |
| 1391 | 1391 | } |
| 1392 | 1392 | } |
| 1393 | - $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); |
|
| 1393 | + $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); |
|
| 1394 | 1394 | try { |
| 1395 | 1395 | $sth = $this->db->prepare($query); |
| 1396 | 1396 | $sth->execute($query_values); |
| 1397 | - } catch(PDOException $e) { |
|
| 1397 | + } catch (PDOException $e) { |
|
| 1398 | 1398 | return "error : ".$e->getMessage(); |
| 1399 | 1399 | } |
| 1400 | 1400 | } |
| 1401 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1401 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1402 | 1402 | global $globalDBdriver; |
| 1403 | 1403 | if ($airport_icao != '') { |
| 1404 | 1404 | if ($globalDBdriver == 'mysql') { |
@@ -1414,16 +1414,16 @@ discard block |
||
| 1414 | 1414 | $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);"; |
| 1415 | 1415 | } |
| 1416 | 1416 | } |
| 1417 | - $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); |
|
| 1417 | + $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); |
|
| 1418 | 1418 | try { |
| 1419 | 1419 | $sth = $this->db->prepare($query); |
| 1420 | 1420 | $sth->execute($query_values); |
| 1421 | - } catch(PDOException $e) { |
|
| 1421 | + } catch (PDOException $e) { |
|
| 1422 | 1422 | return "error : ".$e->getMessage(); |
| 1423 | 1423 | } |
| 1424 | 1424 | } |
| 1425 | 1425 | } |
| 1426 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 1426 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 1427 | 1427 | global $globalDBdriver; |
| 1428 | 1428 | if ($airport_icao != '') { |
| 1429 | 1429 | if ($globalDBdriver == 'mysql') { |
@@ -1431,16 +1431,16 @@ discard block |
||
| 1431 | 1431 | } else { |
| 1432 | 1432 | $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);"; |
| 1433 | 1433 | } |
| 1434 | - $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); |
|
| 1434 | + $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); |
|
| 1435 | 1435 | try { |
| 1436 | 1436 | $sth = $this->db->prepare($query); |
| 1437 | 1437 | $sth->execute($query_values); |
| 1438 | - } catch(PDOException $e) { |
|
| 1438 | + } catch (PDOException $e) { |
|
| 1439 | 1439 | return "error : ".$e->getMessage(); |
| 1440 | 1440 | } |
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1443 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1444 | 1444 | global $globalDBdriver; |
| 1445 | 1445 | if ($airport_icao != '') { |
| 1446 | 1446 | if ($globalDBdriver == 'mysql') { |
@@ -1456,16 +1456,16 @@ discard block |
||
| 1456 | 1456 | $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);"; |
| 1457 | 1457 | } |
| 1458 | 1458 | } |
| 1459 | - $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); |
|
| 1459 | + $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); |
|
| 1460 | 1460 | try { |
| 1461 | 1461 | $sth = $this->db->prepare($query); |
| 1462 | 1462 | $sth->execute($query_values); |
| 1463 | - } catch(PDOException $e) { |
|
| 1463 | + } catch (PDOException $e) { |
|
| 1464 | 1464 | return "error : ".$e->getMessage(); |
| 1465 | 1465 | } |
| 1466 | 1466 | } |
| 1467 | 1467 | } |
| 1468 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 1468 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 1469 | 1469 | global $globalDBdriver; |
| 1470 | 1470 | if ($airport_icao != '') { |
| 1471 | 1471 | if ($globalDBdriver == 'mysql') { |
@@ -1473,11 +1473,11 @@ discard block |
||
| 1473 | 1473 | } else { |
| 1474 | 1474 | $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);"; |
| 1475 | 1475 | } |
| 1476 | - $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); |
|
| 1476 | + $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); |
|
| 1477 | 1477 | try { |
| 1478 | 1478 | $sth = $this->db->prepare($query); |
| 1479 | 1479 | $sth->execute($query_values); |
| 1480 | - } catch(PDOException $e) { |
|
| 1480 | + } catch (PDOException $e) { |
|
| 1481 | 1481 | return "error : ".$e->getMessage(); |
| 1482 | 1482 | } |
| 1483 | 1483 | } |
@@ -1489,7 +1489,7 @@ discard block |
||
| 1489 | 1489 | try { |
| 1490 | 1490 | $sth = $this->db->prepare($query); |
| 1491 | 1491 | $sth->execute($query_values); |
| 1492 | - } catch(PDOException $e) { |
|
| 1492 | + } catch (PDOException $e) { |
|
| 1493 | 1493 | return "error : ".$e->getMessage(); |
| 1494 | 1494 | } |
| 1495 | 1495 | } |
@@ -1499,7 +1499,7 @@ discard block |
||
| 1499 | 1499 | try { |
| 1500 | 1500 | $sth = $this->db->prepare($query); |
| 1501 | 1501 | $sth->execute($query_values); |
| 1502 | - } catch(PDOException $e) { |
|
| 1502 | + } catch (PDOException $e) { |
|
| 1503 | 1503 | return "error : ".$e->getMessage(); |
| 1504 | 1504 | } |
| 1505 | 1505 | } |
@@ -1509,13 +1509,13 @@ discard block |
||
| 1509 | 1509 | try { |
| 1510 | 1510 | $sth = $this->db->prepare($query); |
| 1511 | 1511 | $sth->execute($query_values); |
| 1512 | - } catch(PDOException $e) { |
|
| 1512 | + } catch (PDOException $e) { |
|
| 1513 | 1513 | return "error : ".$e->getMessage(); |
| 1514 | 1514 | } |
| 1515 | 1515 | } |
| 1516 | 1516 | |
| 1517 | 1517 | public function addOldStats() { |
| 1518 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1518 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear; |
|
| 1519 | 1519 | $Common = new Common(); |
| 1520 | 1520 | $Connection = new Connection(); |
| 1521 | 1521 | date_default_timezone_set('UTC'); |
@@ -1533,41 +1533,41 @@ discard block |
||
| 1533 | 1533 | $Spotter = new Spotter($this->db); |
| 1534 | 1534 | |
| 1535 | 1535 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 1536 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 1536 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 1537 | 1537 | foreach ($alldata as $number) { |
| 1538 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 1538 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 1539 | 1539 | } |
| 1540 | 1540 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 1541 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 1541 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 1542 | 1542 | foreach ($alldata as $number) { |
| 1543 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 1543 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 1544 | 1544 | } |
| 1545 | 1545 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 1546 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 1546 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 1547 | 1547 | foreach ($alldata as $number) { |
| 1548 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 1548 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 1549 | 1549 | } |
| 1550 | 1550 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 1551 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 1551 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 1552 | 1552 | foreach ($alldata as $number) { |
| 1553 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1553 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1554 | 1554 | } |
| 1555 | 1555 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 1556 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 1556 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 1557 | 1557 | foreach ($alldata as $number) { |
| 1558 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 1558 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 1559 | 1559 | } |
| 1560 | 1560 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 1561 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 1561 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 1562 | 1562 | foreach ($alldata as $number) { |
| 1563 | 1563 | if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
| 1564 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 1564 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 1565 | 1565 | } |
| 1566 | 1566 | |
| 1567 | 1567 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1568 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 1568 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 1569 | 1569 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1570 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1570 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 1571 | 1571 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1572 | 1572 | $alldata = array(); |
| 1573 | 1573 | |
@@ -1585,14 +1585,14 @@ discard block |
||
| 1585 | 1585 | foreach ($alldata as $key => $row) { |
| 1586 | 1586 | $count[$key] = $row['airport_departure_icao_count']; |
| 1587 | 1587 | } |
| 1588 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1588 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1589 | 1589 | foreach ($alldata as $number) { |
| 1590 | - 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); |
|
| 1590 | + 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); |
|
| 1591 | 1591 | } |
| 1592 | 1592 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1593 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 1593 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 1594 | 1594 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1595 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1595 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 1596 | 1596 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1597 | 1597 | $alldata = array(); |
| 1598 | 1598 | foreach ($pall as $value) { |
@@ -1609,18 +1609,18 @@ discard block |
||
| 1609 | 1609 | foreach ($alldata as $key => $row) { |
| 1610 | 1610 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1611 | 1611 | } |
| 1612 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1612 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1613 | 1613 | foreach ($alldata as $number) { |
| 1614 | - 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); |
|
| 1614 | + 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); |
|
| 1615 | 1615 | } |
| 1616 | 1616 | if ($Connection->tableExists('countries')) { |
| 1617 | 1617 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 1618 | 1618 | //$SpotterArchive = new SpotterArchive(); |
| 1619 | 1619 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 1620 | 1620 | $Spotter = new Spotter($this->db); |
| 1621 | - $alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 1621 | + $alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 1622 | 1622 | foreach ($alldata as $number) { |
| 1623 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 1623 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 1624 | 1624 | } |
| 1625 | 1625 | } |
| 1626 | 1626 | |
@@ -1629,12 +1629,12 @@ discard block |
||
| 1629 | 1629 | $this->deleteStatsByType('fatalities_byyear'); |
| 1630 | 1630 | $alldata = $Accident->countFatalitiesByYear(); |
| 1631 | 1631 | foreach ($alldata as $number) { |
| 1632 | - $this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year']))); |
|
| 1632 | + $this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year']))); |
|
| 1633 | 1633 | } |
| 1634 | 1634 | $this->deleteStatsByType('fatalities_bymonth'); |
| 1635 | 1635 | $alldata = $Accident->countFatalitiesLast12Months(); |
| 1636 | 1636 | foreach ($alldata as $number) { |
| 1637 | - $this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year']))); |
|
| 1637 | + $this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year']))); |
|
| 1638 | 1638 | } |
| 1639 | 1639 | |
| 1640 | 1640 | |
@@ -1647,37 +1647,37 @@ discard block |
||
| 1647 | 1647 | $lastyear = false; |
| 1648 | 1648 | foreach ($alldata as $number) { |
| 1649 | 1649 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1650 | - $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']))); |
|
| 1650 | + $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']))); |
|
| 1651 | 1651 | } |
| 1652 | 1652 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 1653 | 1653 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1654 | 1654 | foreach ($alldata as $number) { |
| 1655 | - $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']))); |
|
| 1655 | + $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']))); |
|
| 1656 | 1656 | } |
| 1657 | 1657 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 1658 | 1658 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1659 | 1659 | foreach ($alldata as $number) { |
| 1660 | - $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']))); |
|
| 1660 | + $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']))); |
|
| 1661 | 1661 | } |
| 1662 | 1662 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 1663 | 1663 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1664 | 1664 | foreach ($alldata as $number) { |
| 1665 | - $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']))); |
|
| 1665 | + $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']))); |
|
| 1666 | 1666 | } |
| 1667 | 1667 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 1668 | 1668 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1669 | 1669 | foreach ($alldata as $number) { |
| 1670 | - $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']))); |
|
| 1670 | + $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']))); |
|
| 1671 | 1671 | } |
| 1672 | 1672 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 1673 | 1673 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1674 | 1674 | foreach ($alldata as $number) { |
| 1675 | - $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']))); |
|
| 1675 | + $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']))); |
|
| 1676 | 1676 | } |
| 1677 | 1677 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 1678 | 1678 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1679 | 1679 | foreach ($alldata as $number) { |
| 1680 | - $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']))); |
|
| 1680 | + $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']))); |
|
| 1681 | 1681 | } |
| 1682 | 1682 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 1683 | 1683 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -1722,7 +1722,7 @@ discard block |
||
| 1722 | 1722 | } |
| 1723 | 1723 | $alldata = $pall; |
| 1724 | 1724 | foreach ($alldata as $number) { |
| 1725 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 1725 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 1726 | 1726 | } |
| 1727 | 1727 | echo '...Arrival'."\n"; |
| 1728 | 1728 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -1764,7 +1764,7 @@ discard block |
||
| 1764 | 1764 | } |
| 1765 | 1765 | $alldata = $pall; |
| 1766 | 1766 | foreach ($alldata as $number) { |
| 1767 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 1767 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 1768 | 1768 | } |
| 1769 | 1769 | |
| 1770 | 1770 | echo 'Flights data...'."\n"; |
@@ -1772,28 +1772,28 @@ discard block |
||
| 1772 | 1772 | echo '-> countAllDatesLastMonth...'."\n"; |
| 1773 | 1773 | $alldata = $Spotter->countAllDatesLastMonth(); |
| 1774 | 1774 | foreach ($alldata as $number) { |
| 1775 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 1775 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 1776 | 1776 | } |
| 1777 | 1777 | echo '-> countAllDates...'."\n"; |
| 1778 | 1778 | $previousdata = $this->countAllDates(); |
| 1779 | 1779 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 1780 | 1780 | $this->deleteStatFlight('date'); |
| 1781 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates()); |
|
| 1781 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates()); |
|
| 1782 | 1782 | $values = array(); |
| 1783 | 1783 | foreach ($alldata as $cnt) { |
| 1784 | 1784 | $values[] = $cnt['date_count']; |
| 1785 | 1785 | } |
| 1786 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1787 | - array_splice($alldata,11); |
|
| 1786 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1787 | + array_splice($alldata, 11); |
|
| 1788 | 1788 | foreach ($alldata as $number) { |
| 1789 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 1789 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 1790 | 1790 | } |
| 1791 | 1791 | |
| 1792 | 1792 | $this->deleteStatFlight('hour'); |
| 1793 | 1793 | echo '-> countAllHours...'."\n"; |
| 1794 | 1794 | $alldata = $Spotter->countAllHours('hour'); |
| 1795 | 1795 | foreach ($alldata as $number) { |
| 1796 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 1796 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 1797 | 1797 | } |
| 1798 | 1798 | |
| 1799 | 1799 | |
@@ -1804,42 +1804,42 @@ discard block |
||
| 1804 | 1804 | if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
| 1805 | 1805 | $SpotterArchive = new SpotterArchive(); |
| 1806 | 1806 | //$Spotter = new Spotter($this->db); |
| 1807 | - $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 1807 | + $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 1808 | 1808 | //$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 1809 | 1809 | foreach ($alldata as $number) { |
| 1810 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 1810 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 1811 | 1811 | } |
| 1812 | 1812 | } |
| 1813 | 1813 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 1814 | 1814 | $Spotter = new Spotter($this->db); |
| 1815 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 1815 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 1816 | 1816 | foreach ($alldata as $number) { |
| 1817 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 1817 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 1818 | 1818 | } |
| 1819 | 1819 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 1820 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 1820 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 1821 | 1821 | foreach ($alldata as $number) { |
| 1822 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 1822 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 1823 | 1823 | } |
| 1824 | 1824 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 1825 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 1825 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 1826 | 1826 | foreach ($alldata as $number) { |
| 1827 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1827 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1828 | 1828 | } |
| 1829 | 1829 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 1830 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 1830 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 1831 | 1831 | foreach ($alldata as $number) { |
| 1832 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 1832 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 1833 | 1833 | } |
| 1834 | 1834 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 1835 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 1835 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 1836 | 1836 | foreach ($alldata as $number) { |
| 1837 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 1837 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 1838 | 1838 | } |
| 1839 | 1839 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1840 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1840 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1841 | 1841 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1842 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1842 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1843 | 1843 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1844 | 1844 | //$alldata = array(); |
| 1845 | 1845 | foreach ($dall as $value) { |
@@ -1859,12 +1859,12 @@ discard block |
||
| 1859 | 1859 | } |
| 1860 | 1860 | $alldata = $pall; |
| 1861 | 1861 | foreach ($alldata as $number) { |
| 1862 | - 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); |
|
| 1862 | + 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); |
|
| 1863 | 1863 | } |
| 1864 | 1864 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1865 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1865 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1866 | 1866 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1867 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1867 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1868 | 1868 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1869 | 1869 | //$alldata = array(); |
| 1870 | 1870 | foreach ($dall as $value) { |
@@ -1884,7 +1884,7 @@ discard block |
||
| 1884 | 1884 | } |
| 1885 | 1885 | $alldata = $pall; |
| 1886 | 1886 | foreach ($alldata as $number) { |
| 1887 | - 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); |
|
| 1887 | + 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); |
|
| 1888 | 1888 | } |
| 1889 | 1889 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 1890 | 1890 | $Spotter = new Spotter($this->db); |
@@ -1892,27 +1892,27 @@ discard block |
||
| 1892 | 1892 | $lastyear = false; |
| 1893 | 1893 | foreach ($alldata as $number) { |
| 1894 | 1894 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1895 | - $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']); |
|
| 1895 | + $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']); |
|
| 1896 | 1896 | } |
| 1897 | 1897 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 1898 | 1898 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1899 | 1899 | foreach ($alldata as $number) { |
| 1900 | - $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']); |
|
| 1900 | + $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']); |
|
| 1901 | 1901 | } |
| 1902 | 1902 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 1903 | 1903 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1904 | 1904 | foreach ($alldata as $number) { |
| 1905 | - $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']); |
|
| 1905 | + $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']); |
|
| 1906 | 1906 | } |
| 1907 | 1907 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 1908 | 1908 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1909 | 1909 | foreach ($alldata as $number) { |
| 1910 | - $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']); |
|
| 1910 | + $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']); |
|
| 1911 | 1911 | } |
| 1912 | 1912 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 1913 | 1913 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1914 | 1914 | foreach ($alldata as $number) { |
| 1915 | - $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']); |
|
| 1915 | + $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']); |
|
| 1916 | 1916 | } |
| 1917 | 1917 | if ($globalDebug) echo '...Departure'."\n"; |
| 1918 | 1918 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -1935,7 +1935,7 @@ discard block |
||
| 1935 | 1935 | } |
| 1936 | 1936 | $alldata = $pall; |
| 1937 | 1937 | foreach ($alldata as $number) { |
| 1938 | - $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']); |
|
| 1938 | + $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']); |
|
| 1939 | 1939 | } |
| 1940 | 1940 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1941 | 1941 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -1958,32 +1958,32 @@ discard block |
||
| 1958 | 1958 | } |
| 1959 | 1959 | $alldata = $pall; |
| 1960 | 1960 | foreach ($alldata as $number) { |
| 1961 | - $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']); |
|
| 1961 | + $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']); |
|
| 1962 | 1962 | } |
| 1963 | 1963 | |
| 1964 | 1964 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 1965 | 1965 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 1966 | 1966 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1967 | 1967 | foreach ($alldata as $number) { |
| 1968 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 1968 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1969 | 1969 | } |
| 1970 | 1970 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 1971 | 1971 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1972 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
|
| 1972 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines()); |
|
| 1973 | 1973 | $values = array(); |
| 1974 | 1974 | foreach ($alldata as $cnt) { |
| 1975 | 1975 | $values[] = $cnt['date_count']; |
| 1976 | 1976 | } |
| 1977 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1978 | - array_splice($alldata,11); |
|
| 1977 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1978 | + array_splice($alldata, 11); |
|
| 1979 | 1979 | foreach ($alldata as $number) { |
| 1980 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 1980 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1981 | 1981 | } |
| 1982 | 1982 | |
| 1983 | 1983 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 1984 | 1984 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1985 | 1985 | foreach ($alldata as $number) { |
| 1986 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 1986 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 1987 | 1987 | } |
| 1988 | 1988 | |
| 1989 | 1989 | |
@@ -2007,7 +2007,7 @@ discard block |
||
| 2007 | 2007 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2008 | 2008 | } |
| 2009 | 2009 | } |
| 2010 | - if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2010 | + if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2011 | 2011 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2012 | 2012 | $reset = true; |
| 2013 | 2013 | } |
@@ -2016,32 +2016,32 @@ discard block |
||
| 2016 | 2016 | // Count by filter |
| 2017 | 2017 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 2018 | 2018 | $Spotter = new Spotter($this->db); |
| 2019 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 2019 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 2020 | 2020 | foreach ($alldata as $number) { |
| 2021 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 2021 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 2022 | 2022 | } |
| 2023 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 2023 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 2024 | 2024 | foreach ($alldata as $number) { |
| 2025 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 2025 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 2026 | 2026 | } |
| 2027 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 2027 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 2028 | 2028 | foreach ($alldata as $number) { |
| 2029 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 2029 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 2030 | 2030 | } |
| 2031 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 2031 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 2032 | 2032 | foreach ($alldata as $number) { |
| 2033 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 2033 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 2034 | 2034 | } |
| 2035 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 2035 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 2036 | 2036 | foreach ($alldata as $number) { |
| 2037 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 2037 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 2038 | 2038 | } |
| 2039 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 2039 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 2040 | 2040 | foreach ($alldata as $number) { |
| 2041 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 2041 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 2042 | 2042 | } |
| 2043 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2044 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2043 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2044 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2045 | 2045 | $alldata = array(); |
| 2046 | 2046 | foreach ($pall as $value) { |
| 2047 | 2047 | $icao = $value['airport_departure_icao']; |
@@ -2057,12 +2057,12 @@ discard block |
||
| 2057 | 2057 | foreach ($alldata as $key => $row) { |
| 2058 | 2058 | $count[$key] = $row['airport_departure_icao_count']; |
| 2059 | 2059 | } |
| 2060 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2060 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2061 | 2061 | foreach ($alldata as $number) { |
| 2062 | - 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); |
|
| 2062 | + 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); |
|
| 2063 | 2063 | } |
| 2064 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2065 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2064 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2065 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2066 | 2066 | $alldata = array(); |
| 2067 | 2067 | foreach ($pall as $value) { |
| 2068 | 2068 | $icao = $value['airport_arrival_icao']; |
@@ -2078,40 +2078,40 @@ discard block |
||
| 2078 | 2078 | foreach ($alldata as $key => $row) { |
| 2079 | 2079 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2080 | 2080 | } |
| 2081 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2081 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2082 | 2082 | foreach ($alldata as $number) { |
| 2083 | - 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); |
|
| 2083 | + 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); |
|
| 2084 | 2084 | } |
| 2085 | 2085 | $Spotter = new Spotter($this->db); |
| 2086 | 2086 | $alldata = $Spotter->countAllMonths($filter); |
| 2087 | 2087 | $lastyear = false; |
| 2088 | 2088 | foreach ($alldata as $number) { |
| 2089 | 2089 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2090 | - $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); |
|
| 2090 | + $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); |
|
| 2091 | 2091 | } |
| 2092 | 2092 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2093 | 2093 | foreach ($alldata as $number) { |
| 2094 | - $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); |
|
| 2094 | + $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); |
|
| 2095 | 2095 | } |
| 2096 | 2096 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2097 | 2097 | foreach ($alldata as $number) { |
| 2098 | - $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); |
|
| 2098 | + $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); |
|
| 2099 | 2099 | } |
| 2100 | 2100 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2101 | 2101 | foreach ($alldata as $number) { |
| 2102 | - $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); |
|
| 2102 | + $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); |
|
| 2103 | 2103 | } |
| 2104 | 2104 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2105 | 2105 | foreach ($alldata as $number) { |
| 2106 | - $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); |
|
| 2106 | + $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); |
|
| 2107 | 2107 | } |
| 2108 | 2108 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2109 | 2109 | foreach ($alldata as $number) { |
| 2110 | - $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); |
|
| 2110 | + $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); |
|
| 2111 | 2111 | } |
| 2112 | 2112 | echo '...Departure'."\n"; |
| 2113 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 2114 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2113 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 2114 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 2115 | 2115 | foreach ($dall as $value) { |
| 2116 | 2116 | $icao = $value['departure_airport_icao']; |
| 2117 | 2117 | $ddate = $value['date']; |
@@ -2129,11 +2129,11 @@ discard block |
||
| 2129 | 2129 | } |
| 2130 | 2130 | $alldata = $pall; |
| 2131 | 2131 | foreach ($alldata as $number) { |
| 2132 | - $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); |
|
| 2132 | + $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); |
|
| 2133 | 2133 | } |
| 2134 | 2134 | echo '...Arrival'."\n"; |
| 2135 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2136 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2135 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2136 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2137 | 2137 | foreach ($dall as $value) { |
| 2138 | 2138 | $icao = $value['arrival_airport_icao']; |
| 2139 | 2139 | $ddate = $value['date']; |
@@ -2151,40 +2151,40 @@ discard block |
||
| 2151 | 2151 | } |
| 2152 | 2152 | $alldata = $pall; |
| 2153 | 2153 | foreach ($alldata as $number) { |
| 2154 | - $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); |
|
| 2154 | + $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); |
|
| 2155 | 2155 | } |
| 2156 | 2156 | |
| 2157 | 2157 | echo 'Flights data...'."\n"; |
| 2158 | 2158 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2159 | 2159 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2160 | 2160 | foreach ($alldata as $number) { |
| 2161 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2161 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2162 | 2162 | } |
| 2163 | 2163 | echo '-> countAllDates...'."\n"; |
| 2164 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2165 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2164 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2165 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2166 | 2166 | $values = array(); |
| 2167 | 2167 | foreach ($alldata as $cnt) { |
| 2168 | 2168 | $values[] = $cnt['date_count']; |
| 2169 | 2169 | } |
| 2170 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2171 | - array_splice($alldata,11); |
|
| 2170 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2171 | + array_splice($alldata, 11); |
|
| 2172 | 2172 | foreach ($alldata as $number) { |
| 2173 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2173 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2174 | 2174 | } |
| 2175 | 2175 | |
| 2176 | 2176 | echo '-> countAllHours...'."\n"; |
| 2177 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2177 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2178 | 2178 | foreach ($alldata as $number) { |
| 2179 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2179 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2180 | 2180 | } |
| 2181 | 2181 | echo 'Insert last stats update date...'."\n"; |
| 2182 | 2182 | date_default_timezone_set('UTC'); |
| 2183 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2183 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2184 | 2184 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2185 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2185 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2186 | 2186 | $this->deleteOldStats($filter_name); |
| 2187 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2187 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2188 | 2188 | } |
| 2189 | 2189 | } |
| 2190 | 2190 | |
@@ -2197,16 +2197,16 @@ discard block |
||
| 2197 | 2197 | // SUM all previous month to put as year |
| 2198 | 2198 | $previous_year = date('Y'); |
| 2199 | 2199 | $previous_year--; |
| 2200 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2201 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2202 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2203 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2200 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2201 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2202 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2203 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2204 | 2204 | $allairlines = $this->getAllAirlineNames(); |
| 2205 | 2205 | foreach ($allairlines as $data) { |
| 2206 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2207 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2208 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2209 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2206 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2207 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2208 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2209 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2210 | 2210 | } |
| 2211 | 2211 | |
| 2212 | 2212 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2215,7 +2215,7 @@ discard block |
||
| 2215 | 2215 | try { |
| 2216 | 2216 | $sth = $this->db->prepare($query); |
| 2217 | 2217 | $sth->execute(); |
| 2218 | - } catch(PDOException $e) { |
|
| 2218 | + } catch (PDOException $e) { |
|
| 2219 | 2219 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2220 | 2220 | } |
| 2221 | 2221 | } |
@@ -2224,15 +2224,15 @@ discard block |
||
| 2224 | 2224 | try { |
| 2225 | 2225 | $sth = $this->db->prepare($query); |
| 2226 | 2226 | $sth->execute(); |
| 2227 | - } catch(PDOException $e) { |
|
| 2227 | + } catch (PDOException $e) { |
|
| 2228 | 2228 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2229 | 2229 | } |
| 2230 | 2230 | } |
| 2231 | 2231 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2232 | 2232 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2233 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2233 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2234 | 2234 | $this->deleteOldStats(); |
| 2235 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2235 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2236 | 2236 | $lastyearupdate = true; |
| 2237 | 2237 | } |
| 2238 | 2238 | } |
@@ -2254,7 +2254,7 @@ discard block |
||
| 2254 | 2254 | try { |
| 2255 | 2255 | $sth = $this->db->prepare($query); |
| 2256 | 2256 | $sth->execute(); |
| 2257 | - } catch(PDOException $e) { |
|
| 2257 | + } catch (PDOException $e) { |
|
| 2258 | 2258 | return "error : ".$e->getMessage(); |
| 2259 | 2259 | } |
| 2260 | 2260 | } |
@@ -2268,14 +2268,14 @@ discard block |
||
| 2268 | 2268 | try { |
| 2269 | 2269 | $sth = $this->db->prepare($query); |
| 2270 | 2270 | $sth->execute(); |
| 2271 | - } catch(PDOException $e) { |
|
| 2271 | + } catch (PDOException $e) { |
|
| 2272 | 2272 | return "error : ".$e->getMessage(); |
| 2273 | 2273 | } |
| 2274 | 2274 | } |
| 2275 | 2275 | if (!isset($lastyearupdate)) { |
| 2276 | 2276 | echo 'Insert last stats update date...'."\n"; |
| 2277 | 2277 | date_default_timezone_set('UTC'); |
| 2278 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 2278 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 2279 | 2279 | } |
| 2280 | 2280 | if ($globalStatsResetYear) { |
| 2281 | 2281 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -13,7 +13,9 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | public function __construct($dbc = null) { |
| 15 | 15 | global $globalFilterName; |
| 16 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 16 | + if (isset($globalFilterName)) { |
|
| 17 | + $this->filter_name = $globalFilterName; |
|
| 18 | + } |
|
| 17 | 19 | $Connection = new Connection($dbc); |
| 18 | 20 | $this->db = $Connection->db(); |
| 19 | 21 | } |
@@ -81,7 +83,9 @@ discard block |
||
| 81 | 83 | } |
| 82 | 84 | } |
| 83 | 85 | public function getAllAirlineNames($filter_name = '') { |
| 84 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 86 | + if ($filter_name == '') { |
|
| 87 | + $filter_name = $this->filter_name; |
|
| 88 | + } |
|
| 85 | 89 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 86 | 90 | try { |
| 87 | 91 | $sth = $this->db->prepare($query); |
@@ -93,7 +97,9 @@ discard block |
||
| 93 | 97 | return $all; |
| 94 | 98 | } |
| 95 | 99 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 96 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 100 | + if ($filter_name == '') { |
|
| 101 | + $filter_name = $this->filter_name; |
|
| 102 | + } |
|
| 97 | 103 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 98 | 104 | try { |
| 99 | 105 | $sth = $this->db->prepare($query); |
@@ -105,7 +111,9 @@ discard block |
||
| 105 | 111 | return $all; |
| 106 | 112 | } |
| 107 | 113 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 108 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 114 | + if ($filter_name == '') { |
|
| 115 | + $filter_name = $this->filter_name; |
|
| 116 | + } |
|
| 109 | 117 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 110 | 118 | try { |
| 111 | 119 | $sth = $this->db->prepare($query); |
@@ -117,7 +125,9 @@ discard block |
||
| 117 | 125 | return $all; |
| 118 | 126 | } |
| 119 | 127 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 120 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 128 | + if ($filter_name == '') { |
|
| 129 | + $filter_name = $this->filter_name; |
|
| 130 | + } |
|
| 121 | 131 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 122 | 132 | try { |
| 123 | 133 | $sth = $this->db->prepare($query); |
@@ -130,7 +140,9 @@ discard block |
||
| 130 | 140 | } |
| 131 | 141 | |
| 132 | 142 | public function getAllOwnerNames($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 owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name 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 getAllPilotNames($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 pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 148 | 162 | try { |
| 149 | 163 | $sth = $this->db->prepare($query); |
@@ -158,10 +172,15 @@ discard block |
||
| 158 | 172 | |
| 159 | 173 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 160 | 174 | global $globalStatsFilters; |
| 161 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 175 | + if ($filter_name == '') { |
|
| 176 | + $filter_name = $this->filter_name; |
|
| 177 | + } |
|
| 162 | 178 | if ($year == '' && $month == '') { |
| 163 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 164 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 179 | + if ($limit) { |
|
| 180 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 181 | + } else { |
|
| 182 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
|
| 183 | + } |
|
| 165 | 184 | try { |
| 166 | 185 | $sth = $this->db->prepare($query); |
| 167 | 186 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -169,7 +188,9 @@ discard block |
||
| 169 | 188 | echo "error : ".$e->getMessage(); |
| 170 | 189 | } |
| 171 | 190 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | - } else $all = array(); |
|
| 191 | + } else { |
|
| 192 | + $all = array(); |
|
| 193 | + } |
|
| 173 | 194 | if (empty($all)) { |
| 174 | 195 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 175 | 196 | if ($filter_name != '') { |
@@ -183,10 +204,15 @@ discard block |
||
| 183 | 204 | } |
| 184 | 205 | public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
| 185 | 206 | global $globalStatsFilters; |
| 186 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 207 | + if ($filter_name == '') { |
|
| 208 | + $filter_name = $this->filter_name; |
|
| 209 | + } |
|
| 187 | 210 | if ($year == '' && $month == '') { |
| 188 | - 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"; |
|
| 189 | - 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"; |
|
| 211 | + if ($limit) { |
|
| 212 | + $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"; |
|
| 213 | + } else { |
|
| 214 | + $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"; |
|
| 215 | + } |
|
| 190 | 216 | try { |
| 191 | 217 | $sth = $this->db->prepare($query); |
| 192 | 218 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -194,7 +220,9 @@ discard block |
||
| 194 | 220 | echo "error : ".$e->getMessage(); |
| 195 | 221 | } |
| 196 | 222 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 197 | - } else $all = array(); |
|
| 223 | + } else { |
|
| 224 | + $all = array(); |
|
| 225 | + } |
|
| 198 | 226 | if (empty($all)) { |
| 199 | 227 | $Spotter = new Spotter($this->db); |
| 200 | 228 | $filters = array(); |
@@ -209,10 +237,15 @@ discard block |
||
| 209 | 237 | } |
| 210 | 238 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 211 | 239 | global $globalStatsFilters; |
| 212 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 240 | + if ($filter_name == '') { |
|
| 241 | + $filter_name = $this->filter_name; |
|
| 242 | + } |
|
| 213 | 243 | if ($year == '' && $month == '') { |
| 214 | - 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"; |
|
| 215 | - 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"; |
|
| 244 | + if ($limit) { |
|
| 245 | + $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"; |
|
| 246 | + } else { |
|
| 247 | + $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"; |
|
| 248 | + } |
|
| 216 | 249 | try { |
| 217 | 250 | $sth = $this->db->prepare($query); |
| 218 | 251 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -220,7 +253,9 @@ discard block |
||
| 220 | 253 | echo "error : ".$e->getMessage(); |
| 221 | 254 | } |
| 222 | 255 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 223 | - } else $all = array(); |
|
| 256 | + } else { |
|
| 257 | + $all = array(); |
|
| 258 | + } |
|
| 224 | 259 | if (empty($all)) { |
| 225 | 260 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 226 | 261 | if ($filter_name != '') { |
@@ -235,10 +270,15 @@ discard block |
||
| 235 | 270 | |
| 236 | 271 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
| 237 | 272 | global $globalStatsFilters; |
| 238 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 273 | + if ($filter_name == '') { |
|
| 274 | + $filter_name = $this->filter_name; |
|
| 275 | + } |
|
| 239 | 276 | if ($year == '' && $month == '') { |
| 240 | - 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"; |
|
| 241 | - 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"; |
|
| 277 | + if ($limit) { |
|
| 278 | + $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"; |
|
| 279 | + } else { |
|
| 280 | + $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"; |
|
| 281 | + } |
|
| 242 | 282 | try { |
| 243 | 283 | $sth = $this->db->prepare($query); |
| 244 | 284 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -246,7 +286,9 @@ discard block |
||
| 246 | 286 | echo "error : ".$e->getMessage(); |
| 247 | 287 | } |
| 248 | 288 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | - } else $all = array(); |
|
| 289 | + } else { |
|
| 290 | + $all = array(); |
|
| 291 | + } |
|
| 250 | 292 | if (empty($all)) { |
| 251 | 293 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 252 | 294 | if ($filter_name != '') { |
@@ -260,9 +302,14 @@ discard block |
||
| 260 | 302 | } |
| 261 | 303 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
| 262 | 304 | global $globalStatsFilters; |
| 263 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 264 | - 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"; |
|
| 265 | - 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"; |
|
| 305 | + if ($filter_name == '') { |
|
| 306 | + $filter_name = $this->filter_name; |
|
| 307 | + } |
|
| 308 | + if ($limit) { |
|
| 309 | + $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"; |
|
| 310 | + } else { |
|
| 311 | + $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"; |
|
| 312 | + } |
|
| 266 | 313 | try { |
| 267 | 314 | $sth = $this->db->prepare($query); |
| 268 | 315 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -284,17 +331,29 @@ discard block |
||
| 284 | 331 | |
| 285 | 332 | public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
| 286 | 333 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 287 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 334 | + if ($filter_name == '') { |
|
| 335 | + $filter_name = $this->filter_name; |
|
| 336 | + } |
|
| 288 | 337 | if ($year == '' && $month == '') { |
| 289 | - if ($globalVATSIM) $forsource = 'vatsim'; |
|
| 290 | - if ($globalIVAO) $forsource = 'ivao'; |
|
| 338 | + if ($globalVATSIM) { |
|
| 339 | + $forsource = 'vatsim'; |
|
| 340 | + } |
|
| 341 | + if ($globalIVAO) { |
|
| 342 | + $forsource = 'ivao'; |
|
| 343 | + } |
|
| 291 | 344 | if (isset($forsource)) { |
| 292 | - 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"; |
|
| 293 | - 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"; |
|
| 345 | + if ($limit) { |
|
| 346 | + $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"; |
|
| 347 | + } else { |
|
| 348 | + $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"; |
|
| 349 | + } |
|
| 294 | 350 | $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
| 295 | 351 | } else { |
| 296 | - 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"; |
|
| 297 | - 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"; |
|
| 352 | + if ($limit) { |
|
| 353 | + $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"; |
|
| 354 | + } else { |
|
| 355 | + $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"; |
|
| 356 | + } |
|
| 298 | 357 | $query_values = array(':filter_name' => $filter_name); |
| 299 | 358 | } |
| 300 | 359 | try { |
@@ -304,7 +363,9 @@ discard block |
||
| 304 | 363 | echo "error : ".$e->getMessage(); |
| 305 | 364 | } |
| 306 | 365 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 307 | - } else $all = array(); |
|
| 366 | + } else { |
|
| 367 | + $all = array(); |
|
| 368 | + } |
|
| 308 | 369 | if (empty($all)) { |
| 309 | 370 | $Spotter = new Spotter($this->db); |
| 310 | 371 | $filters = array(); |
@@ -319,10 +380,15 @@ discard block |
||
| 319 | 380 | } |
| 320 | 381 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 321 | 382 | global $globalStatsFilters; |
| 322 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 383 | + if ($filter_name == '') { |
|
| 384 | + $filter_name = $this->filter_name; |
|
| 385 | + } |
|
| 323 | 386 | if ($year == '' && $month == '') { |
| 324 | - 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"; |
|
| 325 | - 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"; |
|
| 387 | + if ($limit) { |
|
| 388 | + $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"; |
|
| 389 | + } else { |
|
| 390 | + $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"; |
|
| 391 | + } |
|
| 326 | 392 | try { |
| 327 | 393 | $sth = $this->db->prepare($query); |
| 328 | 394 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -330,7 +396,9 @@ discard block |
||
| 330 | 396 | echo "error : ".$e->getMessage(); |
| 331 | 397 | } |
| 332 | 398 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | - } else $all = array(); |
|
| 399 | + } else { |
|
| 400 | + $all = array(); |
|
| 401 | + } |
|
| 334 | 402 | if (empty($all)) { |
| 335 | 403 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 336 | 404 | if ($filter_name != '') { |
@@ -344,10 +412,15 @@ discard block |
||
| 344 | 412 | } |
| 345 | 413 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 346 | 414 | global $globalStatsFilters; |
| 347 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 415 | + if ($filter_name == '') { |
|
| 416 | + $filter_name = $this->filter_name; |
|
| 417 | + } |
|
| 348 | 418 | if ($year == '' && $month == '') { |
| 349 | - 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"; |
|
| 350 | - 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"; |
|
| 419 | + if ($limit) { |
|
| 420 | + $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"; |
|
| 421 | + } else { |
|
| 422 | + $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"; |
|
| 423 | + } |
|
| 351 | 424 | try { |
| 352 | 425 | $sth = $this->db->prepare($query); |
| 353 | 426 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -355,7 +428,9 @@ discard block |
||
| 355 | 428 | echo "error : ".$e->getMessage(); |
| 356 | 429 | } |
| 357 | 430 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 358 | - } else $all = array(); |
|
| 431 | + } else { |
|
| 432 | + $all = array(); |
|
| 433 | + } |
|
| 359 | 434 | if (empty($all)) { |
| 360 | 435 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 361 | 436 | if ($filter_name != '') { |
@@ -369,11 +444,16 @@ discard block |
||
| 369 | 444 | } |
| 370 | 445 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 371 | 446 | $Connection = new Connection(); |
| 372 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 447 | + if ($filter_name == '') { |
|
| 448 | + $filter_name = $this->filter_name; |
|
| 449 | + } |
|
| 373 | 450 | if ($Connection->tableExists('countries')) { |
| 374 | 451 | if ($year == '' && $month == '') { |
| 375 | - 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"; |
|
| 376 | - 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"; |
|
| 452 | + if ($limit) { |
|
| 453 | + $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"; |
|
| 454 | + } else { |
|
| 455 | + $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"; |
|
| 456 | + } |
|
| 377 | 457 | try { |
| 378 | 458 | $sth = $this->db->prepare($query); |
| 379 | 459 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -388,17 +468,24 @@ discard block |
||
| 388 | 468 | } |
| 389 | 469 | */ |
| 390 | 470 | return $all; |
| 391 | - } else return array(); |
|
| 471 | + } else { |
|
| 472 | + return array(); |
|
| 473 | + } |
|
| 392 | 474 | } else { |
| 393 | 475 | return array(); |
| 394 | 476 | } |
| 395 | 477 | } |
| 396 | 478 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
| 397 | 479 | global $globalStatsFilters; |
| 398 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 480 | + if ($filter_name == '') { |
|
| 481 | + $filter_name = $this->filter_name; |
|
| 482 | + } |
|
| 399 | 483 | if ($year == '' && $month == '') { |
| 400 | - 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"; |
|
| 401 | - 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"; |
|
| 484 | + if ($limit) { |
|
| 485 | + $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"; |
|
| 486 | + } else { |
|
| 487 | + $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"; |
|
| 488 | + } |
|
| 402 | 489 | try { |
| 403 | 490 | $sth = $this->db->prepare($query); |
| 404 | 491 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -406,7 +493,9 @@ discard block |
||
| 406 | 493 | echo "error : ".$e->getMessage(); |
| 407 | 494 | } |
| 408 | 495 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 409 | - } else $all = array(); |
|
| 496 | + } else { |
|
| 497 | + $all = array(); |
|
| 498 | + } |
|
| 410 | 499 | if (empty($all)) { |
| 411 | 500 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 412 | 501 | if ($filter_name != '') { |
@@ -421,10 +510,15 @@ discard block |
||
| 421 | 510 | |
| 422 | 511 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 423 | 512 | global $globalStatsFilters; |
| 424 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 513 | + if ($filter_name == '') { |
|
| 514 | + $filter_name = $this->filter_name; |
|
| 515 | + } |
|
| 425 | 516 | if ($year == '' && $month == '') { |
| 426 | - 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"; |
|
| 427 | - 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"; |
|
| 517 | + if ($limit) { |
|
| 518 | + $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"; |
|
| 519 | + } else { |
|
| 520 | + $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"; |
|
| 521 | + } |
|
| 428 | 522 | try { |
| 429 | 523 | $sth = $this->db->prepare($query); |
| 430 | 524 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -432,7 +526,9 @@ discard block |
||
| 432 | 526 | echo "error : ".$e->getMessage(); |
| 433 | 527 | } |
| 434 | 528 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | - } else $all = array(); |
|
| 529 | + } else { |
|
| 530 | + $all = array(); |
|
| 531 | + } |
|
| 436 | 532 | if (empty($all)) { |
| 437 | 533 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 438 | 534 | if ($filter_name != '') { |
@@ -446,10 +542,15 @@ discard block |
||
| 446 | 542 | } |
| 447 | 543 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 448 | 544 | global $globalStatsFilters; |
| 449 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 545 | + if ($filter_name == '') { |
|
| 546 | + $filter_name = $this->filter_name; |
|
| 547 | + } |
|
| 450 | 548 | if ($year == '' && $month == '') { |
| 451 | - 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"; |
|
| 452 | - 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"; |
|
| 549 | + if ($limit) { |
|
| 550 | + $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"; |
|
| 551 | + } else { |
|
| 552 | + $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"; |
|
| 553 | + } |
|
| 453 | 554 | try { |
| 454 | 555 | $sth = $this->db->prepare($query); |
| 455 | 556 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -457,7 +558,9 @@ discard block |
||
| 457 | 558 | echo "error : ".$e->getMessage(); |
| 458 | 559 | } |
| 459 | 560 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | - } else $all = array(); |
|
| 561 | + } else { |
|
| 562 | + $all = array(); |
|
| 563 | + } |
|
| 461 | 564 | if (empty($all)) { |
| 462 | 565 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 463 | 566 | if ($filter_name != '') { |
@@ -478,7 +581,9 @@ discard block |
||
| 478 | 581 | $icao = $value['airport_departure_icao']; |
| 479 | 582 | if (isset($all[$icao])) { |
| 480 | 583 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 481 | - } else $all[$icao] = $value; |
|
| 584 | + } else { |
|
| 585 | + $all[$icao] = $value; |
|
| 586 | + } |
|
| 482 | 587 | } |
| 483 | 588 | $count = array(); |
| 484 | 589 | foreach ($all as $key => $row) { |
@@ -490,10 +595,15 @@ discard block |
||
| 490 | 595 | } |
| 491 | 596 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 492 | 597 | global $globalStatsFilters; |
| 493 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 598 | + if ($filter_name == '') { |
|
| 599 | + $filter_name = $this->filter_name; |
|
| 600 | + } |
|
| 494 | 601 | if ($year == '' && $month == '') { |
| 495 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 496 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 602 | + if ($limit) { |
|
| 603 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 604 | + } else { |
|
| 605 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 606 | + } |
|
| 497 | 607 | try { |
| 498 | 608 | $sth = $this->db->prepare($query); |
| 499 | 609 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -501,7 +611,9 @@ discard block |
||
| 501 | 611 | echo "error : ".$e->getMessage(); |
| 502 | 612 | } |
| 503 | 613 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 504 | - } else $all = array(); |
|
| 614 | + } else { |
|
| 615 | + $all = array(); |
|
| 616 | + } |
|
| 505 | 617 | if (empty($all)) { |
| 506 | 618 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 507 | 619 | if ($filter_name != '') { |
@@ -522,7 +634,9 @@ discard block |
||
| 522 | 634 | $icao = $value['airport_arrival_icao']; |
| 523 | 635 | if (isset($all[$icao])) { |
| 524 | 636 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 525 | - } else $all[$icao] = $value; |
|
| 637 | + } else { |
|
| 638 | + $all[$icao] = $value; |
|
| 639 | + } |
|
| 526 | 640 | } |
| 527 | 641 | $count = array(); |
| 528 | 642 | foreach ($all as $key => $row) { |
@@ -535,13 +649,21 @@ discard block |
||
| 535 | 649 | } |
| 536 | 650 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 537 | 651 | global $globalDBdriver, $globalStatsFilters; |
| 538 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 652 | + if ($filter_name == '') { |
|
| 653 | + $filter_name = $this->filter_name; |
|
| 654 | + } |
|
| 539 | 655 | if ($globalDBdriver == 'mysql') { |
| 540 | - 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"; |
|
| 541 | - 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"; |
|
| 656 | + if ($limit) { |
|
| 657 | + $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"; |
|
| 658 | + } else { |
|
| 659 | + $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"; |
|
| 660 | + } |
|
| 542 | 661 | } else { |
| 543 | - 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"; |
|
| 544 | - else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
|
| 662 | + if ($limit) { |
|
| 663 | + $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"; |
|
| 664 | + } else { |
|
| 665 | + $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"; |
|
| 666 | + } |
|
| 545 | 667 | } |
| 546 | 668 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 547 | 669 | try { |
@@ -565,7 +687,9 @@ discard block |
||
| 565 | 687 | |
| 566 | 688 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 567 | 689 | global $globalStatsFilters; |
| 568 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 690 | + if ($filter_name == '') { |
|
| 691 | + $filter_name = $this->filter_name; |
|
| 692 | + } |
|
| 569 | 693 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 570 | 694 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 571 | 695 | try { |
@@ -587,7 +711,9 @@ discard block |
||
| 587 | 711 | } |
| 588 | 712 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 589 | 713 | global $globalDBdriver, $globalStatsFilters; |
| 590 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 714 | + if ($filter_name == '') { |
|
| 715 | + $filter_name = $this->filter_name; |
|
| 716 | + } |
|
| 591 | 717 | if ($globalDBdriver == 'mysql') { |
| 592 | 718 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 593 | 719 | } else { |
@@ -613,7 +739,9 @@ discard block |
||
| 613 | 739 | } |
| 614 | 740 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 615 | 741 | global $globalStatsFilters; |
| 616 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 742 | + if ($filter_name == '') { |
|
| 743 | + $filter_name = $this->filter_name; |
|
| 744 | + } |
|
| 617 | 745 | $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"; |
| 618 | 746 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 619 | 747 | try { |
@@ -635,7 +763,9 @@ discard block |
||
| 635 | 763 | } |
| 636 | 764 | public function countAllDatesByAirlines($filter_name = '') { |
| 637 | 765 | global $globalStatsFilters; |
| 638 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 766 | + if ($filter_name == '') { |
|
| 767 | + $filter_name = $this->filter_name; |
|
| 768 | + } |
|
| 639 | 769 | $query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name"; |
| 640 | 770 | $query_data = array('filter_name' => $filter_name); |
| 641 | 771 | try { |
@@ -657,7 +787,9 @@ discard block |
||
| 657 | 787 | } |
| 658 | 788 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 659 | 789 | global $globalStatsFilters, $globalDBdriver; |
| 660 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 790 | + if ($filter_name == '') { |
|
| 791 | + $filter_name = $this->filter_name; |
|
| 792 | + } |
|
| 661 | 793 | if ($globalDBdriver == 'mysql') { |
| 662 | 794 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 663 | 795 | } else { |
@@ -726,7 +858,9 @@ discard block |
||
| 726 | 858 | } |
| 727 | 859 | public function countAllMilitaryMonths($filter_name = '') { |
| 728 | 860 | global $globalStatsFilters; |
| 729 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 861 | + if ($filter_name == '') { |
|
| 862 | + $filter_name = $this->filter_name; |
|
| 863 | + } |
|
| 730 | 864 | $query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name"; |
| 731 | 865 | try { |
| 732 | 866 | $sth = $this->db->prepare($query); |
@@ -747,9 +881,14 @@ discard block |
||
| 747 | 881 | } |
| 748 | 882 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 749 | 883 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 750 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 751 | - 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"; |
|
| 752 | - 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"; |
|
| 884 | + if ($filter_name == '') { |
|
| 885 | + $filter_name = $this->filter_name; |
|
| 886 | + } |
|
| 887 | + if ($limit) { |
|
| 888 | + $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"; |
|
| 889 | + } else { |
|
| 890 | + $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"; |
|
| 891 | + } |
|
| 753 | 892 | if ($orderby == 'hour') { |
| 754 | 893 | if ($globalDBdriver == 'mysql') { |
| 755 | 894 | //$query .= " ORDER BY flight_date ASC"; |
@@ -758,7 +897,9 @@ discard block |
||
| 758 | 897 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 759 | 898 | } |
| 760 | 899 | } |
| 761 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 900 | + if ($orderby == 'count') { |
|
| 901 | + $query .= " ORDER BY hour_count DESC"; |
|
| 902 | + } |
|
| 762 | 903 | try { |
| 763 | 904 | $sth = $this->db->prepare($query); |
| 764 | 905 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
@@ -779,8 +920,12 @@ discard block |
||
| 779 | 920 | |
| 780 | 921 | public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
| 781 | 922 | global $globalStatsFilters; |
| 782 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 783 | - if ($year == '') $year = date('Y'); |
|
| 923 | + if ($filter_name == '') { |
|
| 924 | + $filter_name = $this->filter_name; |
|
| 925 | + } |
|
| 926 | + if ($year == '') { |
|
| 927 | + $year = date('Y'); |
|
| 928 | + } |
|
| 784 | 929 | $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
| 785 | 930 | if (empty($all)) { |
| 786 | 931 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
@@ -795,8 +940,12 @@ discard block |
||
| 795 | 940 | } |
| 796 | 941 | public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
| 797 | 942 | global $globalStatsFilters; |
| 798 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 799 | - if ($year == '') $year = date('Y'); |
|
| 943 | + if ($filter_name == '') { |
|
| 944 | + $filter_name = $this->filter_name; |
|
| 945 | + } |
|
| 946 | + if ($year == '') { |
|
| 947 | + $year = date('Y'); |
|
| 948 | + } |
|
| 800 | 949 | $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
| 801 | 950 | if (empty($all)) { |
| 802 | 951 | $filters = array(); |
@@ -812,8 +961,12 @@ discard block |
||
| 812 | 961 | } |
| 813 | 962 | public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
| 814 | 963 | global $globalStatsFilters; |
| 815 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 816 | - if ($year == '') $year = date('Y'); |
|
| 964 | + if ($filter_name == '') { |
|
| 965 | + $filter_name = $this->filter_name; |
|
| 966 | + } |
|
| 967 | + if ($year == '') { |
|
| 968 | + $year = date('Y'); |
|
| 969 | + } |
|
| 817 | 970 | $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
| 818 | 971 | if (empty($all)) { |
| 819 | 972 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
@@ -828,7 +981,9 @@ discard block |
||
| 828 | 981 | } |
| 829 | 982 | public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 830 | 983 | global $globalStatsFilters; |
| 831 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 984 | + if ($filter_name == '') { |
|
| 985 | + $filter_name = $this->filter_name; |
|
| 986 | + } |
|
| 832 | 987 | if ($year == '' && $month == '') { |
| 833 | 988 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 834 | 989 | try { |
@@ -839,7 +994,9 @@ discard block |
||
| 839 | 994 | } |
| 840 | 995 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 841 | 996 | $all = $result[0]['nb']; |
| 842 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 997 | + } else { |
|
| 998 | + $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 999 | + } |
|
| 843 | 1000 | if (empty($all)) { |
| 844 | 1001 | $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
| 845 | 1002 | if ($filter_name != '') { |
@@ -853,7 +1010,9 @@ discard block |
||
| 853 | 1010 | } |
| 854 | 1011 | public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
| 855 | 1012 | global $globalStatsFilters; |
| 856 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1013 | + if ($filter_name == '') { |
|
| 1014 | + $filter_name = $this->filter_name; |
|
| 1015 | + } |
|
| 857 | 1016 | if ($year == '' && $month == '') { |
| 858 | 1017 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 859 | 1018 | try { |
@@ -864,7 +1023,9 @@ discard block |
||
| 864 | 1023 | } |
| 865 | 1024 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 866 | 1025 | $all = $result[0]['nb_airline']; |
| 867 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1026 | + } else { |
|
| 1027 | + $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 1028 | + } |
|
| 868 | 1029 | if (empty($all)) { |
| 869 | 1030 | $filters = array(); |
| 870 | 1031 | $filters = array('year' => $year,'month' => $month); |
@@ -879,7 +1040,9 @@ discard block |
||
| 879 | 1040 | } |
| 880 | 1041 | public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
| 881 | 1042 | global $globalStatsFilters; |
| 882 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1043 | + if ($filter_name == '') { |
|
| 1044 | + $filter_name = $this->filter_name; |
|
| 1045 | + } |
|
| 883 | 1046 | if ($year == '' && $month == '') { |
| 884 | 1047 | $query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 885 | 1048 | $query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
@@ -907,7 +1070,9 @@ discard block |
||
| 907 | 1070 | } |
| 908 | 1071 | public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
| 909 | 1072 | global $globalStatsFilters; |
| 910 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1073 | + if ($filter_name == '') { |
|
| 1074 | + $filter_name = $this->filter_name; |
|
| 1075 | + } |
|
| 911 | 1076 | //if ($year == '') $year = date('Y'); |
| 912 | 1077 | if ($year == '' && $month == '') { |
| 913 | 1078 | $query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -936,7 +1101,9 @@ discard block |
||
| 936 | 1101 | } |
| 937 | 1102 | |
| 938 | 1103 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 939 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1104 | + if ($filter_name == '') { |
|
| 1105 | + $filter_name = $this->filter_name; |
|
| 1106 | + } |
|
| 940 | 1107 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 941 | 1108 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 942 | 1109 | try { |
@@ -949,7 +1116,9 @@ discard block |
||
| 949 | 1116 | return $all; |
| 950 | 1117 | } |
| 951 | 1118 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 952 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1119 | + if ($filter_name == '') { |
|
| 1120 | + $filter_name = $this->filter_name; |
|
| 1121 | + } |
|
| 953 | 1122 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 954 | 1123 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 955 | 1124 | try { |
@@ -962,7 +1131,9 @@ discard block |
||
| 962 | 1131 | return $all; |
| 963 | 1132 | } |
| 964 | 1133 | public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
| 965 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1134 | + if ($filter_name == '') { |
|
| 1135 | + $filter_name = $this->filter_name; |
|
| 1136 | + } |
|
| 966 | 1137 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 967 | 1138 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 968 | 1139 | try { |
@@ -973,7 +1144,9 @@ discard block |
||
| 973 | 1144 | } |
| 974 | 1145 | } |
| 975 | 1146 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
| 976 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1147 | + if ($filter_name == '') { |
|
| 1148 | + $filter_name = $this->filter_name; |
|
| 1149 | + } |
|
| 977 | 1150 | global $globalArchiveMonths, $globalDBdriver; |
| 978 | 1151 | if ($globalDBdriver == 'mysql') { |
| 979 | 1152 | if ($month == '') { |
@@ -1003,7 +1176,9 @@ discard block |
||
| 1003 | 1176 | } |
| 1004 | 1177 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 1005 | 1178 | global $globalArchiveMonths, $globalDBdriver; |
| 1006 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1179 | + if ($filter_name == '') { |
|
| 1180 | + $filter_name = $this->filter_name; |
|
| 1181 | + } |
|
| 1007 | 1182 | if ($globalDBdriver == 'mysql') { |
| 1008 | 1183 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1009 | 1184 | } else { |
@@ -1021,7 +1196,9 @@ discard block |
||
| 1021 | 1196 | } |
| 1022 | 1197 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 1023 | 1198 | global $globalArchiveMonths, $globalDBdriver; |
| 1024 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1199 | + if ($filter_name == '') { |
|
| 1200 | + $filter_name = $this->filter_name; |
|
| 1201 | + } |
|
| 1025 | 1202 | if ($globalDBdriver == 'mysql') { |
| 1026 | 1203 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 1027 | 1204 | } else { |
@@ -1038,7 +1215,9 @@ discard block |
||
| 1038 | 1215 | } |
| 1039 | 1216 | public function getStatsAirlineTotal($filter_name = '') { |
| 1040 | 1217 | global $globalArchiveMonths, $globalDBdriver; |
| 1041 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1218 | + if ($filter_name == '') { |
|
| 1219 | + $filter_name = $this->filter_name; |
|
| 1220 | + } |
|
| 1042 | 1221 | if ($globalDBdriver == 'mysql') { |
| 1043 | 1222 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 1044 | 1223 | } else { |
@@ -1055,7 +1234,9 @@ discard block |
||
| 1055 | 1234 | } |
| 1056 | 1235 | public function getStatsOwnerTotal($filter_name = '') { |
| 1057 | 1236 | global $globalArchiveMonths, $globalDBdriver; |
| 1058 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1237 | + if ($filter_name == '') { |
|
| 1238 | + $filter_name = $this->filter_name; |
|
| 1239 | + } |
|
| 1059 | 1240 | if ($globalDBdriver == 'mysql') { |
| 1060 | 1241 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 1061 | 1242 | } else { |
@@ -1072,7 +1253,9 @@ discard block |
||
| 1072 | 1253 | } |
| 1073 | 1254 | public function getStatsOwner($owner_name,$filter_name = '') { |
| 1074 | 1255 | global $globalArchiveMonths, $globalDBdriver; |
| 1075 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1256 | + if ($filter_name == '') { |
|
| 1257 | + $filter_name = $this->filter_name; |
|
| 1258 | + } |
|
| 1076 | 1259 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1077 | 1260 | try { |
| 1078 | 1261 | $sth = $this->db->prepare($query); |
@@ -1081,12 +1264,17 @@ discard block |
||
| 1081 | 1264 | echo "error : ".$e->getMessage(); |
| 1082 | 1265 | } |
| 1083 | 1266 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1084 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1085 | - else return 0; |
|
| 1267 | + if (isset($all[0]['cnt'])) { |
|
| 1268 | + return $all[0]['cnt']; |
|
| 1269 | + } else { |
|
| 1270 | + return 0; |
|
| 1271 | + } |
|
| 1086 | 1272 | } |
| 1087 | 1273 | public function getStatsPilotTotal($filter_name = '') { |
| 1088 | 1274 | global $globalArchiveMonths, $globalDBdriver; |
| 1089 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1275 | + if ($filter_name == '') { |
|
| 1276 | + $filter_name = $this->filter_name; |
|
| 1277 | + } |
|
| 1090 | 1278 | if ($globalDBdriver == 'mysql') { |
| 1091 | 1279 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 1092 | 1280 | } else { |
@@ -1103,7 +1291,9 @@ discard block |
||
| 1103 | 1291 | } |
| 1104 | 1292 | public function getStatsPilot($pilot,$filter_name = '') { |
| 1105 | 1293 | global $globalArchiveMonths, $globalDBdriver; |
| 1106 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1294 | + if ($filter_name == '') { |
|
| 1295 | + $filter_name = $this->filter_name; |
|
| 1296 | + } |
|
| 1107 | 1297 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1108 | 1298 | try { |
| 1109 | 1299 | $sth = $this->db->prepare($query); |
@@ -1112,13 +1302,18 @@ discard block |
||
| 1112 | 1302 | echo "error : ".$e->getMessage(); |
| 1113 | 1303 | } |
| 1114 | 1304 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1115 | - if (isset($all[0]['cnt'])) return $all[0]['cnt']; |
|
| 1116 | - else return 0; |
|
| 1305 | + if (isset($all[0]['cnt'])) { |
|
| 1306 | + return $all[0]['cnt']; |
|
| 1307 | + } else { |
|
| 1308 | + return 0; |
|
| 1309 | + } |
|
| 1117 | 1310 | } |
| 1118 | 1311 | |
| 1119 | 1312 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1120 | 1313 | global $globalDBdriver; |
| 1121 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1314 | + if ($filter_name == '') { |
|
| 1315 | + $filter_name = $this->filter_name; |
|
| 1316 | + } |
|
| 1122 | 1317 | if ($globalDBdriver == 'mysql') { |
| 1123 | 1318 | $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"; |
| 1124 | 1319 | } else { |
@@ -1134,7 +1329,9 @@ discard block |
||
| 1134 | 1329 | } |
| 1135 | 1330 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 1136 | 1331 | global $globalDBdriver; |
| 1137 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1332 | + if ($filter_name == '') { |
|
| 1333 | + $filter_name = $this->filter_name; |
|
| 1334 | + } |
|
| 1138 | 1335 | if ($globalDBdriver == 'mysql') { |
| 1139 | 1336 | $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"; |
| 1140 | 1337 | } else { |
@@ -1520,10 +1717,14 @@ discard block |
||
| 1520 | 1717 | $Connection = new Connection(); |
| 1521 | 1718 | date_default_timezone_set('UTC'); |
| 1522 | 1719 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 1523 | - if ($globalDebug) echo 'Update stats !'."\n"; |
|
| 1720 | + if ($globalDebug) { |
|
| 1721 | + echo 'Update stats !'."\n"; |
|
| 1722 | + } |
|
| 1524 | 1723 | if (isset($last_update[0]['value'])) { |
| 1525 | 1724 | $last_update_day = $last_update[0]['value']; |
| 1526 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 1725 | + } else { |
|
| 1726 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 1727 | + } |
|
| 1527 | 1728 | $reset = false; |
| 1528 | 1729 | //if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) { |
| 1529 | 1730 | if ($globalStatsResetYear) { |
@@ -1532,43 +1733,63 @@ discard block |
||
| 1532 | 1733 | } |
| 1533 | 1734 | $Spotter = new Spotter($this->db); |
| 1534 | 1735 | |
| 1535 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 1736 | + if ($globalDebug) { |
|
| 1737 | + echo 'Count all aircraft types...'."\n"; |
|
| 1738 | + } |
|
| 1536 | 1739 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 1537 | 1740 | foreach ($alldata as $number) { |
| 1538 | 1741 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 1539 | 1742 | } |
| 1540 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 1743 | + if ($globalDebug) { |
|
| 1744 | + echo 'Count all airlines...'."\n"; |
|
| 1745 | + } |
|
| 1541 | 1746 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 1542 | 1747 | foreach ($alldata as $number) { |
| 1543 | 1748 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 1544 | 1749 | } |
| 1545 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 1750 | + if ($globalDebug) { |
|
| 1751 | + echo 'Count all registrations...'."\n"; |
|
| 1752 | + } |
|
| 1546 | 1753 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 1547 | 1754 | foreach ($alldata as $number) { |
| 1548 | 1755 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 1549 | 1756 | } |
| 1550 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 1757 | + if ($globalDebug) { |
|
| 1758 | + echo 'Count all callsigns...'."\n"; |
|
| 1759 | + } |
|
| 1551 | 1760 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 1552 | 1761 | foreach ($alldata as $number) { |
| 1553 | 1762 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1554 | 1763 | } |
| 1555 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 1764 | + if ($globalDebug) { |
|
| 1765 | + echo 'Count all owners...'."\n"; |
|
| 1766 | + } |
|
| 1556 | 1767 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 1557 | 1768 | foreach ($alldata as $number) { |
| 1558 | 1769 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 1559 | 1770 | } |
| 1560 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 1771 | + if ($globalDebug) { |
|
| 1772 | + echo 'Count all pilots...'."\n"; |
|
| 1773 | + } |
|
| 1561 | 1774 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 1562 | 1775 | foreach ($alldata as $number) { |
| 1563 | - if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name']; |
|
| 1776 | + if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') { |
|
| 1777 | + $number['pilot_id'] = $number['pilot_name']; |
|
| 1778 | + } |
|
| 1564 | 1779 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 1565 | 1780 | } |
| 1566 | 1781 | |
| 1567 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 1782 | + if ($globalDebug) { |
|
| 1783 | + echo 'Count all departure airports...'."\n"; |
|
| 1784 | + } |
|
| 1568 | 1785 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1569 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 1786 | + if ($globalDebug) { |
|
| 1787 | + echo 'Count all detected departure airports...'."\n"; |
|
| 1788 | + } |
|
| 1570 | 1789 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 1571 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 1790 | + if ($globalDebug) { |
|
| 1791 | + echo 'Order departure airports...'."\n"; |
|
| 1792 | + } |
|
| 1572 | 1793 | $alldata = array(); |
| 1573 | 1794 | |
| 1574 | 1795 | foreach ($pall as $value) { |
@@ -1579,7 +1800,9 @@ discard block |
||
| 1579 | 1800 | $icao = $value['airport_departure_icao']; |
| 1580 | 1801 | if (isset($alldata[$icao])) { |
| 1581 | 1802 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 1582 | - } else $alldata[$icao] = $value; |
|
| 1803 | + } else { |
|
| 1804 | + $alldata[$icao] = $value; |
|
| 1805 | + } |
|
| 1583 | 1806 | } |
| 1584 | 1807 | $count = array(); |
| 1585 | 1808 | foreach ($alldata as $key => $row) { |
@@ -1589,11 +1812,17 @@ discard block |
||
| 1589 | 1812 | foreach ($alldata as $number) { |
| 1590 | 1813 | 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); |
| 1591 | 1814 | } |
| 1592 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 1815 | + if ($globalDebug) { |
|
| 1816 | + echo 'Count all arrival airports...'."\n"; |
|
| 1817 | + } |
|
| 1593 | 1818 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1594 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 1819 | + if ($globalDebug) { |
|
| 1820 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 1821 | + } |
|
| 1595 | 1822 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 1596 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 1823 | + if ($globalDebug) { |
|
| 1824 | + echo 'Order arrival airports...'."\n"; |
|
| 1825 | + } |
|
| 1597 | 1826 | $alldata = array(); |
| 1598 | 1827 | foreach ($pall as $value) { |
| 1599 | 1828 | $icao = $value['airport_arrival_icao']; |
@@ -1603,7 +1832,9 @@ discard block |
||
| 1603 | 1832 | $icao = $value['airport_arrival_icao']; |
| 1604 | 1833 | if (isset($alldata[$icao])) { |
| 1605 | 1834 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 1606 | - } else $alldata[$icao] = $value; |
|
| 1835 | + } else { |
|
| 1836 | + $alldata[$icao] = $value; |
|
| 1837 | + } |
|
| 1607 | 1838 | } |
| 1608 | 1839 | $count = array(); |
| 1609 | 1840 | foreach ($alldata as $key => $row) { |
@@ -1614,7 +1845,9 @@ discard block |
||
| 1614 | 1845 | 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); |
| 1615 | 1846 | } |
| 1616 | 1847 | if ($Connection->tableExists('countries')) { |
| 1617 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 1848 | + if ($globalDebug) { |
|
| 1849 | + echo 'Count all flights by countries...'."\n"; |
|
| 1850 | + } |
|
| 1618 | 1851 | //$SpotterArchive = new SpotterArchive(); |
| 1619 | 1852 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 1620 | 1853 | $Spotter = new Spotter($this->db); |
@@ -1624,7 +1857,9 @@ discard block |
||
| 1624 | 1857 | } |
| 1625 | 1858 | } |
| 1626 | 1859 | |
| 1627 | - if ($globalDebug) echo 'Count fatalities stats...'."\n"; |
|
| 1860 | + if ($globalDebug) { |
|
| 1861 | + echo 'Count fatalities stats...'."\n"; |
|
| 1862 | + } |
|
| 1628 | 1863 | $Accident = new Accident(); |
| 1629 | 1864 | $this->deleteStatsByType('fatalities_byyear'); |
| 1630 | 1865 | $alldata = $Accident->countFatalitiesByYear(); |
@@ -1641,46 +1876,66 @@ discard block |
||
| 1641 | 1876 | // Add by month using getstat if month finish... |
| 1642 | 1877 | |
| 1643 | 1878 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 1644 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 1879 | + if ($globalDebug) { |
|
| 1880 | + echo 'Count all flights by months...'."\n"; |
|
| 1881 | + } |
|
| 1645 | 1882 | $Spotter = new Spotter($this->db); |
| 1646 | 1883 | $alldata = $Spotter->countAllMonths(); |
| 1647 | 1884 | $lastyear = false; |
| 1648 | 1885 | foreach ($alldata as $number) { |
| 1649 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 1886 | + if ($number['year_name'] != date('Y')) { |
|
| 1887 | + $lastyear = true; |
|
| 1888 | + } |
|
| 1650 | 1889 | $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']))); |
| 1651 | 1890 | } |
| 1652 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 1891 | + if ($globalDebug) { |
|
| 1892 | + echo 'Count all military flights by months...'."\n"; |
|
| 1893 | + } |
|
| 1653 | 1894 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1654 | 1895 | foreach ($alldata as $number) { |
| 1655 | 1896 | $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']))); |
| 1656 | 1897 | } |
| 1657 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 1898 | + if ($globalDebug) { |
|
| 1899 | + echo 'Count all owners by months...'."\n"; |
|
| 1900 | + } |
|
| 1658 | 1901 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1659 | 1902 | foreach ($alldata as $number) { |
| 1660 | 1903 | $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']))); |
| 1661 | 1904 | } |
| 1662 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 1905 | + if ($globalDebug) { |
|
| 1906 | + echo 'Count all pilots by months...'."\n"; |
|
| 1907 | + } |
|
| 1663 | 1908 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1664 | 1909 | foreach ($alldata as $number) { |
| 1665 | 1910 | $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']))); |
| 1666 | 1911 | } |
| 1667 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 1912 | + if ($globalDebug) { |
|
| 1913 | + echo 'Count all airlines by months...'."\n"; |
|
| 1914 | + } |
|
| 1668 | 1915 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1669 | 1916 | foreach ($alldata as $number) { |
| 1670 | 1917 | $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']))); |
| 1671 | 1918 | } |
| 1672 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 1919 | + if ($globalDebug) { |
|
| 1920 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 1921 | + } |
|
| 1673 | 1922 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1674 | 1923 | foreach ($alldata as $number) { |
| 1675 | 1924 | $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']))); |
| 1676 | 1925 | } |
| 1677 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 1926 | + if ($globalDebug) { |
|
| 1927 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 1928 | + } |
|
| 1678 | 1929 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1679 | 1930 | foreach ($alldata as $number) { |
| 1680 | 1931 | $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']))); |
| 1681 | 1932 | } |
| 1682 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 1683 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 1933 | + if ($globalDebug) { |
|
| 1934 | + echo 'Airports data...'."\n"; |
|
| 1935 | + } |
|
| 1936 | + if ($globalDebug) { |
|
| 1937 | + echo '...Departure'."\n"; |
|
| 1938 | + } |
|
| 1684 | 1939 | $this->deleteStatAirport('daily'); |
| 1685 | 1940 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1686 | 1941 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -1801,7 +2056,9 @@ discard block |
||
| 1801 | 2056 | // Count by airlines |
| 1802 | 2057 | echo '--- Stats by airlines ---'."\n"; |
| 1803 | 2058 | if ($Connection->tableExists('countries')) { |
| 1804 | - if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2059 | + if ($globalDebug) { |
|
| 2060 | + echo 'Count all flights by countries by airlines...'."\n"; |
|
| 2061 | + } |
|
| 1805 | 2062 | $SpotterArchive = new SpotterArchive(); |
| 1806 | 2063 | //$Spotter = new Spotter($this->db); |
| 1807 | 2064 | $alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
@@ -1810,37 +2067,53 @@ discard block |
||
| 1810 | 2067 | $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
| 1811 | 2068 | } |
| 1812 | 2069 | } |
| 1813 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2070 | + if ($globalDebug) { |
|
| 2071 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 2072 | + } |
|
| 1814 | 2073 | $Spotter = new Spotter($this->db); |
| 1815 | 2074 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 1816 | 2075 | foreach ($alldata as $number) { |
| 1817 | 2076 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 1818 | 2077 | } |
| 1819 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2078 | + if ($globalDebug) { |
|
| 2079 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 2080 | + } |
|
| 1820 | 2081 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 1821 | 2082 | foreach ($alldata as $number) { |
| 1822 | 2083 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 1823 | 2084 | } |
| 1824 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 2085 | + if ($globalDebug) { |
|
| 2086 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 2087 | + } |
|
| 1825 | 2088 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 1826 | 2089 | foreach ($alldata as $number) { |
| 1827 | 2090 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1828 | 2091 | } |
| 1829 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 2092 | + if ($globalDebug) { |
|
| 2093 | + echo 'Count all owners by airlines...'."\n"; |
|
| 2094 | + } |
|
| 1830 | 2095 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 1831 | 2096 | foreach ($alldata as $number) { |
| 1832 | 2097 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 1833 | 2098 | } |
| 1834 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 2099 | + if ($globalDebug) { |
|
| 2100 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 2101 | + } |
|
| 1835 | 2102 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 1836 | 2103 | foreach ($alldata as $number) { |
| 1837 | 2104 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 1838 | 2105 | } |
| 1839 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 2106 | + if ($globalDebug) { |
|
| 2107 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 2108 | + } |
|
| 1840 | 2109 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1841 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2110 | + if ($globalDebug) { |
|
| 2111 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 2112 | + } |
|
| 1842 | 2113 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1843 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2114 | + if ($globalDebug) { |
|
| 2115 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 2116 | + } |
|
| 1844 | 2117 | //$alldata = array(); |
| 1845 | 2118 | foreach ($dall as $value) { |
| 1846 | 2119 | $icao = $value['airport_departure_icao']; |
@@ -1861,11 +2134,17 @@ discard block |
||
| 1861 | 2134 | foreach ($alldata as $number) { |
| 1862 | 2135 | 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); |
| 1863 | 2136 | } |
| 1864 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2137 | + if ($globalDebug) { |
|
| 2138 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 2139 | + } |
|
| 1865 | 2140 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1866 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2141 | + if ($globalDebug) { |
|
| 2142 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 2143 | + } |
|
| 1867 | 2144 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1868 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 2145 | + if ($globalDebug) { |
|
| 2146 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 2147 | + } |
|
| 1869 | 2148 | //$alldata = array(); |
| 1870 | 2149 | foreach ($dall as $value) { |
| 1871 | 2150 | $icao = $value['airport_arrival_icao']; |
@@ -1884,37 +2163,53 @@ discard block |
||
| 1884 | 2163 | } |
| 1885 | 2164 | $alldata = $pall; |
| 1886 | 2165 | foreach ($alldata as $number) { |
| 1887 | - 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); |
|
| 2166 | + if ($number['airline_icao'] != '') { |
|
| 2167 | + 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); |
|
| 2168 | + } |
|
| 2169 | + } |
|
| 2170 | + if ($globalDebug) { |
|
| 2171 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 1888 | 2172 | } |
| 1889 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 1890 | 2173 | $Spotter = new Spotter($this->db); |
| 1891 | 2174 | $alldata = $Spotter->countAllMonthsByAirlines(); |
| 1892 | 2175 | $lastyear = false; |
| 1893 | 2176 | foreach ($alldata as $number) { |
| 1894 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2177 | + if ($number['year_name'] != date('Y')) { |
|
| 2178 | + $lastyear = true; |
|
| 2179 | + } |
|
| 1895 | 2180 | $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']); |
| 1896 | 2181 | } |
| 1897 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 2182 | + if ($globalDebug) { |
|
| 2183 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 2184 | + } |
|
| 1898 | 2185 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1899 | 2186 | foreach ($alldata as $number) { |
| 1900 | 2187 | $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']); |
| 1901 | 2188 | } |
| 1902 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2189 | + if ($globalDebug) { |
|
| 2190 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 2191 | + } |
|
| 1903 | 2192 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1904 | 2193 | foreach ($alldata as $number) { |
| 1905 | 2194 | $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']); |
| 1906 | 2195 | } |
| 1907 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2196 | + if ($globalDebug) { |
|
| 2197 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 2198 | + } |
|
| 1908 | 2199 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1909 | 2200 | foreach ($alldata as $number) { |
| 1910 | 2201 | $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']); |
| 1911 | 2202 | } |
| 1912 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2203 | + if ($globalDebug) { |
|
| 2204 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 2205 | + } |
|
| 1913 | 2206 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1914 | 2207 | foreach ($alldata as $number) { |
| 1915 | 2208 | $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']); |
| 1916 | 2209 | } |
| 1917 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 2210 | + if ($globalDebug) { |
|
| 2211 | + echo '...Departure'."\n"; |
|
| 2212 | + } |
|
| 1918 | 2213 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1919 | 2214 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 1920 | 2215 | foreach ($dall as $value) { |
@@ -1937,7 +2232,9 @@ discard block |
||
| 1937 | 2232 | foreach ($alldata as $number) { |
| 1938 | 2233 | $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']); |
| 1939 | 2234 | } |
| 1940 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 2235 | + if ($globalDebug) { |
|
| 2236 | + echo '...Arrival'."\n"; |
|
| 2237 | + } |
|
| 1941 | 2238 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1942 | 2239 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 1943 | 2240 | foreach ($dall as $value) { |
@@ -1961,13 +2258,19 @@ discard block |
||
| 1961 | 2258 | $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']); |
| 1962 | 2259 | } |
| 1963 | 2260 | |
| 1964 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 1965 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2261 | + if ($globalDebug) { |
|
| 2262 | + echo 'Flights data...'."\n"; |
|
| 2263 | + } |
|
| 2264 | + if ($globalDebug) { |
|
| 2265 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 2266 | + } |
|
| 1966 | 2267 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1967 | 2268 | foreach ($alldata as $number) { |
| 1968 | 2269 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 1969 | 2270 | } |
| 1970 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 2271 | + if ($globalDebug) { |
|
| 2272 | + echo '-> countAllDates...'."\n"; |
|
| 2273 | + } |
|
| 1971 | 2274 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1972 | 2275 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
| 1973 | 2276 | $values = array(); |
@@ -1980,7 +2283,9 @@ discard block |
||
| 1980 | 2283 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 1981 | 2284 | } |
| 1982 | 2285 | |
| 1983 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 2286 | + if ($globalDebug) { |
|
| 2287 | + echo '-> countAllHours...'."\n"; |
|
| 2288 | + } |
|
| 1984 | 2289 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1985 | 2290 | foreach ($alldata as $number) { |
| 1986 | 2291 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
@@ -1988,14 +2293,18 @@ discard block |
||
| 1988 | 2293 | |
| 1989 | 2294 | |
| 1990 | 2295 | // Stats by filters |
| 1991 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 2296 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 2297 | + $globalStatsFilters = array(); |
|
| 2298 | + } |
|
| 1992 | 2299 | foreach ($globalStatsFilters as $name => $filter) { |
| 1993 | 2300 | //$filter_name = $filter['name']; |
| 1994 | 2301 | $filter_name = $name; |
| 1995 | 2302 | $reset = false; |
| 1996 | 2303 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 1997 | 2304 | if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) { |
| 1998 | - if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 2305 | + if ($globalDebug) { |
|
| 2306 | + echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n"; |
|
| 2307 | + } |
|
| 1999 | 2308 | $this->deleteOldStats($filter_name); |
| 2000 | 2309 | unset($last_update); |
| 2001 | 2310 | } |
@@ -2014,7 +2323,9 @@ discard block |
||
| 2014 | 2323 | |
| 2015 | 2324 | |
| 2016 | 2325 | // Count by filter |
| 2017 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2326 | + if ($globalDebug) { |
|
| 2327 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 2328 | + } |
|
| 2018 | 2329 | $Spotter = new Spotter($this->db); |
| 2019 | 2330 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 2020 | 2331 | foreach ($alldata as $number) { |
@@ -2051,7 +2362,9 @@ discard block |
||
| 2051 | 2362 | $icao = $value['airport_departure_icao']; |
| 2052 | 2363 | if (isset($alldata[$icao])) { |
| 2053 | 2364 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 2054 | - } else $alldata[$icao] = $value; |
|
| 2365 | + } else { |
|
| 2366 | + $alldata[$icao] = $value; |
|
| 2367 | + } |
|
| 2055 | 2368 | } |
| 2056 | 2369 | $count = array(); |
| 2057 | 2370 | foreach ($alldata as $key => $row) { |
@@ -2072,7 +2385,9 @@ discard block |
||
| 2072 | 2385 | $icao = $value['airport_arrival_icao']; |
| 2073 | 2386 | if (isset($alldata[$icao])) { |
| 2074 | 2387 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 2075 | - } else $alldata[$icao] = $value; |
|
| 2388 | + } else { |
|
| 2389 | + $alldata[$icao] = $value; |
|
| 2390 | + } |
|
| 2076 | 2391 | } |
| 2077 | 2392 | $count = array(); |
| 2078 | 2393 | foreach ($alldata as $key => $row) { |
@@ -2086,7 +2401,9 @@ discard block |
||
| 2086 | 2401 | $alldata = $Spotter->countAllMonths($filter); |
| 2087 | 2402 | $lastyear = false; |
| 2088 | 2403 | foreach ($alldata as $number) { |
| 2089 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2404 | + if ($number['year_name'] != date('Y')) { |
|
| 2405 | + $lastyear = true; |
|
| 2406 | + } |
|
| 2090 | 2407 | $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); |
| 2091 | 2408 | } |
| 2092 | 2409 | $alldata = $Spotter->countAllMonthsOwners($filter); |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * Get SQL query part for filter used |
| 17 | 17 | * @param Array $filter the filter |
| 18 | - * @return Array the SQL part |
|
| 18 | + * @return string the SQL part |
|
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | 21 | public function getFilter($filter = array(),$where = false,$and = false) { |
@@ -486,9 +486,6 @@ discard block |
||
| 486 | 486 | /** |
| 487 | 487 | * Update ident spotter data |
| 488 | 488 | * |
| 489 | - * @param String $flightaware_id the ID from flightaware |
|
| 490 | - * @param String $ident the flight ident |
|
| 491 | - * @return String success or false |
|
| 492 | 489 | * |
| 493 | 490 | */ |
| 494 | 491 | public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
@@ -510,10 +507,6 @@ discard block |
||
| 510 | 507 | /** |
| 511 | 508 | * Update latest spotter data |
| 512 | 509 | * |
| 513 | - * @param String $flightaware_id the ID from flightaware |
|
| 514 | - * @param String $ident the flight ident |
|
| 515 | - * @param String $arrival_airport_icao the arrival airport |
|
| 516 | - * @return String success or false |
|
| 517 | 510 | * |
| 518 | 511 | */ |
| 519 | 512 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
@@ -535,29 +528,6 @@ discard block |
||
| 535 | 528 | /** |
| 536 | 529 | * Adds a new spotter data |
| 537 | 530 | * |
| 538 | - * @param String $flightaware_id the ID from flightaware |
|
| 539 | - * @param String $ident the flight ident |
|
| 540 | - * @param String $aircraft_icao the aircraft type |
|
| 541 | - * @param String $departure_airport_icao the departure airport |
|
| 542 | - * @param String $arrival_airport_icao the arrival airport |
|
| 543 | - * @param String $latitude latitude of flight |
|
| 544 | - * @param String $longitude latitude of flight |
|
| 545 | - * @param String $waypoints waypoints of flight |
|
| 546 | - * @param String $altitude altitude of flight |
|
| 547 | - * @param String $heading heading of flight |
|
| 548 | - * @param String $groundspeed speed of flight |
|
| 549 | - * @param String $date date of flight |
|
| 550 | - * @param String $departure_airport_time departure time of flight |
|
| 551 | - * @param String $arrival_airport_time arrival time of flight |
|
| 552 | - * @param String $squawk squawk code of flight |
|
| 553 | - * @param String $route_stop route stop of flight |
|
| 554 | - * @param String $highlight highlight or not |
|
| 555 | - * @param String $ModeS ModesS code of flight |
|
| 556 | - * @param String $registration registration code of flight |
|
| 557 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 558 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 559 | - * @param String $verticalrate vertival rate of flight |
|
| 560 | - * @return String success or false |
|
| 561 | 531 | */ |
| 562 | 532 | public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
| 563 | 533 | { |
@@ -1428,7 +1398,7 @@ discard block |
||
| 1428 | 1398 | /** |
| 1429 | 1399 | * Parses the direction degrees to working |
| 1430 | 1400 | * |
| 1431 | - * @param Float $direction the direction in degrees |
|
| 1401 | + * @param integer $direction the direction in degrees |
|
| 1432 | 1402 | * @return Array the direction information |
| 1433 | 1403 | * |
| 1434 | 1404 | */ |
@@ -13,10 +13,10 @@ discard block |
||
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | - * Get SQL query part for filter used |
|
| 17 | - * @param Array $filter the filter |
|
| 18 | - * @return Array the SQL part |
|
| 19 | - */ |
|
| 16 | + * Get SQL query part for filter used |
|
| 17 | + * @param Array $filter the filter |
|
| 18 | + * @return Array the SQL part |
|
| 19 | + */ |
|
| 20 | 20 | |
| 21 | 21 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 22 | 22 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -80,14 +80,14 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
| 83 | - * Executes the SQL statements to get the spotter information |
|
| 84 | - * |
|
| 85 | - * @param String $query the SQL query |
|
| 86 | - * @param Array $params parameter of the query |
|
| 87 | - * @param String $limitQuery the limit query |
|
| 88 | - * @return Array the spotter information |
|
| 89 | - * |
|
| 90 | - */ |
|
| 83 | + * Executes the SQL statements to get the spotter information |
|
| 84 | + * |
|
| 85 | + * @param String $query the SQL query |
|
| 86 | + * @param Array $params parameter of the query |
|
| 87 | + * @param String $limitQuery the limit query |
|
| 88 | + * @return Array the spotter information |
|
| 89 | + * |
|
| 90 | + */ |
|
| 91 | 91 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
| 92 | 92 | { |
| 93 | 93 | date_default_timezone_set('UTC'); |
@@ -200,11 +200,11 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | |
| 202 | 202 | /** |
| 203 | - * Gets all the spotter information based on the latest data entry |
|
| 204 | - * |
|
| 205 | - * @return Array the spotter information |
|
| 206 | - * |
|
| 207 | - */ |
|
| 203 | + * Gets all the spotter information based on the latest data entry |
|
| 204 | + * |
|
| 205 | + * @return Array the spotter information |
|
| 206 | + * |
|
| 207 | + */ |
|
| 208 | 208 | public function getLatestTrackerData($limit = '', $sort = '', $filter = array()) |
| 209 | 209 | { |
| 210 | 210 | global $global_query; |
@@ -262,11 +262,11 @@ discard block |
||
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | /** |
| 265 | - * Gets all the spotter information based on the callsign |
|
| 266 | - * |
|
| 267 | - * @return Array the spotter information |
|
| 268 | - * |
|
| 269 | - */ |
|
| 265 | + * Gets all the spotter information based on the callsign |
|
| 266 | + * |
|
| 267 | + * @return Array the spotter information |
|
| 268 | + * |
|
| 269 | + */ |
|
| 270 | 270 | public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
| 271 | 271 | { |
| 272 | 272 | global $global_query; |
@@ -377,12 +377,12 @@ discard block |
||
| 377 | 377 | |
| 378 | 378 | |
| 379 | 379 | /** |
| 380 | - * Gets all source name |
|
| 381 | - * |
|
| 382 | - * @param String type format of source |
|
| 383 | - * @return Array list of source name |
|
| 384 | - * |
|
| 385 | - */ |
|
| 380 | + * Gets all source name |
|
| 381 | + * |
|
| 382 | + * @param String type format of source |
|
| 383 | + * @return Array list of source name |
|
| 384 | + * |
|
| 385 | + */ |
|
| 386 | 386 | public function getAllSourceName($type = '',$filters = array()) |
| 387 | 387 | { |
| 388 | 388 | $filter_query = $this->getFilter($filters,true,true); |
@@ -412,11 +412,11 @@ discard block |
||
| 412 | 412 | |
| 413 | 413 | |
| 414 | 414 | /** |
| 415 | - * Gets a list of all idents/callsigns |
|
| 416 | - * |
|
| 417 | - * @return Array list of ident/callsign names |
|
| 418 | - * |
|
| 419 | - */ |
|
| 415 | + * Gets a list of all idents/callsigns |
|
| 416 | + * |
|
| 417 | + * @return Array list of ident/callsign names |
|
| 418 | + * |
|
| 419 | + */ |
|
| 420 | 420 | public function getAllIdents($filters = array()) |
| 421 | 421 | { |
| 422 | 422 | $filter_query = $this->getFilter($filters,true,true); |
@@ -484,18 +484,18 @@ discard block |
||
| 484 | 484 | |
| 485 | 485 | |
| 486 | 486 | /** |
| 487 | - * Update ident spotter data |
|
| 488 | - * |
|
| 489 | - * @param String $flightaware_id the ID from flightaware |
|
| 490 | - * @param String $ident the flight ident |
|
| 491 | - * @return String success or false |
|
| 492 | - * |
|
| 493 | - */ |
|
| 487 | + * Update ident spotter data |
|
| 488 | + * |
|
| 489 | + * @param String $flightaware_id the ID from flightaware |
|
| 490 | + * @param String $ident the flight ident |
|
| 491 | + * @return String success or false |
|
| 492 | + * |
|
| 493 | + */ |
|
| 494 | 494 | public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
| 495 | 495 | { |
| 496 | 496 | |
| 497 | 497 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 498 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 498 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 499 | 499 | |
| 500 | 500 | try { |
| 501 | 501 | $sth = $this->db->prepare($query); |
@@ -508,18 +508,18 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | } |
| 510 | 510 | /** |
| 511 | - * Update latest spotter data |
|
| 512 | - * |
|
| 513 | - * @param String $flightaware_id the ID from flightaware |
|
| 514 | - * @param String $ident the flight ident |
|
| 515 | - * @param String $arrival_airport_icao the arrival airport |
|
| 516 | - * @return String success or false |
|
| 517 | - * |
|
| 518 | - */ |
|
| 511 | + * Update latest spotter data |
|
| 512 | + * |
|
| 513 | + * @param String $flightaware_id the ID from flightaware |
|
| 514 | + * @param String $ident the flight ident |
|
| 515 | + * @param String $arrival_airport_icao the arrival airport |
|
| 516 | + * @return String success or false |
|
| 517 | + * |
|
| 518 | + */ |
|
| 519 | 519 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 520 | 520 | { |
| 521 | 521 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 522 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 522 | + $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 523 | 523 | |
| 524 | 524 | try { |
| 525 | 525 | $sth = $this->db->prepare($query); |
@@ -533,32 +533,32 @@ discard block |
||
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | /** |
| 536 | - * Adds a new spotter data |
|
| 537 | - * |
|
| 538 | - * @param String $flightaware_id the ID from flightaware |
|
| 539 | - * @param String $ident the flight ident |
|
| 540 | - * @param String $aircraft_icao the aircraft type |
|
| 541 | - * @param String $departure_airport_icao the departure airport |
|
| 542 | - * @param String $arrival_airport_icao the arrival airport |
|
| 543 | - * @param String $latitude latitude of flight |
|
| 544 | - * @param String $longitude latitude of flight |
|
| 545 | - * @param String $waypoints waypoints of flight |
|
| 546 | - * @param String $altitude altitude of flight |
|
| 547 | - * @param String $heading heading of flight |
|
| 548 | - * @param String $groundspeed speed of flight |
|
| 549 | - * @param String $date date of flight |
|
| 550 | - * @param String $departure_airport_time departure time of flight |
|
| 551 | - * @param String $arrival_airport_time arrival time of flight |
|
| 552 | - * @param String $squawk squawk code of flight |
|
| 553 | - * @param String $route_stop route stop of flight |
|
| 554 | - * @param String $highlight highlight or not |
|
| 555 | - * @param String $ModeS ModesS code of flight |
|
| 556 | - * @param String $registration registration code of flight |
|
| 557 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 558 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 559 | - * @param String $verticalrate vertival rate of flight |
|
| 560 | - * @return String success or false |
|
| 561 | - */ |
|
| 536 | + * Adds a new spotter data |
|
| 537 | + * |
|
| 538 | + * @param String $flightaware_id the ID from flightaware |
|
| 539 | + * @param String $ident the flight ident |
|
| 540 | + * @param String $aircraft_icao the aircraft type |
|
| 541 | + * @param String $departure_airport_icao the departure airport |
|
| 542 | + * @param String $arrival_airport_icao the arrival airport |
|
| 543 | + * @param String $latitude latitude of flight |
|
| 544 | + * @param String $longitude latitude of flight |
|
| 545 | + * @param String $waypoints waypoints of flight |
|
| 546 | + * @param String $altitude altitude of flight |
|
| 547 | + * @param String $heading heading of flight |
|
| 548 | + * @param String $groundspeed speed of flight |
|
| 549 | + * @param String $date date of flight |
|
| 550 | + * @param String $departure_airport_time departure time of flight |
|
| 551 | + * @param String $arrival_airport_time arrival time of flight |
|
| 552 | + * @param String $squawk squawk code of flight |
|
| 553 | + * @param String $route_stop route stop of flight |
|
| 554 | + * @param String $highlight highlight or not |
|
| 555 | + * @param String $ModeS ModesS code of flight |
|
| 556 | + * @param String $registration registration code of flight |
|
| 557 | + * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
| 558 | + * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
| 559 | + * @param String $verticalrate vertival rate of flight |
|
| 560 | + * @return String success or false |
|
| 561 | + */ |
|
| 562 | 562 | public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
| 563 | 563 | { |
| 564 | 564 | global $globalURL; |
@@ -643,16 +643,16 @@ discard block |
||
| 643 | 643 | $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
| 644 | 644 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
| 645 | 645 | |
| 646 | - if ($latitude == '' && $longitude == '') { |
|
| 647 | - $latitude = 0; |
|
| 648 | - $longitude = 0; |
|
| 649 | - } |
|
| 650 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 651 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 652 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 646 | + if ($latitude == '' && $longitude == '') { |
|
| 647 | + $latitude = 0; |
|
| 648 | + $longitude = 0; |
|
| 649 | + } |
|
| 650 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 651 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 652 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 653 | 653 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 654 | 654 | |
| 655 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 655 | + $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 656 | 656 | |
| 657 | 657 | try { |
| 658 | 658 | |
@@ -660,7 +660,7 @@ discard block |
||
| 660 | 660 | $sth->execute($query_values); |
| 661 | 661 | $this->db = null; |
| 662 | 662 | } catch (PDOException $e) { |
| 663 | - return "error : ".$e->getMessage(); |
|
| 663 | + return "error : ".$e->getMessage(); |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | return "success"; |
@@ -669,11 +669,11 @@ discard block |
||
| 669 | 669 | |
| 670 | 670 | |
| 671 | 671 | /** |
| 672 | - * Gets the aircraft ident within the last hour |
|
| 673 | - * |
|
| 674 | - * @return String the ident |
|
| 675 | - * |
|
| 676 | - */ |
|
| 672 | + * Gets the aircraft ident within the last hour |
|
| 673 | + * |
|
| 674 | + * @return String the ident |
|
| 675 | + * |
|
| 676 | + */ |
|
| 677 | 677 | public function getIdentFromLastHour($ident) |
| 678 | 678 | { |
| 679 | 679 | global $globalDBdriver, $globalTimezone; |
@@ -689,11 +689,11 @@ discard block |
||
| 689 | 689 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 690 | 690 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
| 691 | 691 | $query_data = array(':ident' => $ident); |
| 692 | - } |
|
| 692 | + } |
|
| 693 | 693 | |
| 694 | 694 | $sth = $this->db->prepare($query); |
| 695 | 695 | $sth->execute($query_data); |
| 696 | - $ident_result=''; |
|
| 696 | + $ident_result=''; |
|
| 697 | 697 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 698 | 698 | { |
| 699 | 699 | $ident_result = $row['ident']; |
@@ -704,11 +704,11 @@ discard block |
||
| 704 | 704 | |
| 705 | 705 | |
| 706 | 706 | /** |
| 707 | - * Gets the aircraft data from the last 20 seconds |
|
| 708 | - * |
|
| 709 | - * @return Array the spotter data |
|
| 710 | - * |
|
| 711 | - */ |
|
| 707 | + * Gets the aircraft data from the last 20 seconds |
|
| 708 | + * |
|
| 709 | + * @return Array the spotter data |
|
| 710 | + * |
|
| 711 | + */ |
|
| 712 | 712 | public function getRealTimeData($q = '') |
| 713 | 713 | { |
| 714 | 714 | global $globalDBdriver; |
@@ -746,11 +746,11 @@ discard block |
||
| 746 | 746 | |
| 747 | 747 | |
| 748 | 748 | /** |
| 749 | - * Gets all number of flight over countries |
|
| 750 | - * |
|
| 751 | - * @return Array the airline country list |
|
| 752 | - * |
|
| 753 | - */ |
|
| 749 | + * Gets all number of flight over countries |
|
| 750 | + * |
|
| 751 | + * @return Array the airline country list |
|
| 752 | + * |
|
| 753 | + */ |
|
| 754 | 754 | |
| 755 | 755 | public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
| 756 | 756 | { |
@@ -821,11 +821,11 @@ discard block |
||
| 821 | 821 | } |
| 822 | 822 | |
| 823 | 823 | /** |
| 824 | - * Gets all callsigns that have flown over |
|
| 825 | - * |
|
| 826 | - * @return Array the callsign list |
|
| 827 | - * |
|
| 828 | - */ |
|
| 824 | + * Gets all callsigns that have flown over |
|
| 825 | + * |
|
| 826 | + * @return Array the callsign list |
|
| 827 | + * |
|
| 828 | + */ |
|
| 829 | 829 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
| 830 | 830 | { |
| 831 | 831 | global $globalDBdriver; |
@@ -892,11 +892,11 @@ discard block |
||
| 892 | 892 | |
| 893 | 893 | |
| 894 | 894 | /** |
| 895 | - * Counts all dates |
|
| 896 | - * |
|
| 897 | - * @return Array the date list |
|
| 898 | - * |
|
| 899 | - */ |
|
| 895 | + * Counts all dates |
|
| 896 | + * |
|
| 897 | + * @return Array the date list |
|
| 898 | + * |
|
| 899 | + */ |
|
| 900 | 900 | public function countAllDates($filters = array()) |
| 901 | 901 | { |
| 902 | 902 | global $globalTimezone, $globalDBdriver; |
@@ -942,11 +942,11 @@ discard block |
||
| 942 | 942 | |
| 943 | 943 | |
| 944 | 944 | /** |
| 945 | - * Counts all dates during the last 7 days |
|
| 946 | - * |
|
| 947 | - * @return Array the date list |
|
| 948 | - * |
|
| 949 | - */ |
|
| 945 | + * Counts all dates during the last 7 days |
|
| 946 | + * |
|
| 947 | + * @return Array the date list |
|
| 948 | + * |
|
| 949 | + */ |
|
| 950 | 950 | public function countAllDatesLast7Days($filters = array()) |
| 951 | 951 | { |
| 952 | 952 | global $globalTimezone, $globalDBdriver; |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $query .= " GROUP BY date_name |
| 969 | 969 | ORDER BY date_name ASC"; |
| 970 | 970 | $query_data = array(':offset' => $offset); |
| 971 | - } |
|
| 971 | + } |
|
| 972 | 972 | |
| 973 | 973 | $sth = $this->db->prepare($query); |
| 974 | 974 | $sth->execute($query_data); |
@@ -988,11 +988,11 @@ discard block |
||
| 988 | 988 | } |
| 989 | 989 | |
| 990 | 990 | /** |
| 991 | - * Counts all dates during the last month |
|
| 992 | - * |
|
| 993 | - * @return Array the date list |
|
| 994 | - * |
|
| 995 | - */ |
|
| 991 | + * Counts all dates during the last month |
|
| 992 | + * |
|
| 993 | + * @return Array the date list |
|
| 994 | + * |
|
| 995 | + */ |
|
| 996 | 996 | public function countAllDatesLastMonth($filters = array()) |
| 997 | 997 | { |
| 998 | 998 | global $globalTimezone, $globalDBdriver; |
@@ -1014,7 +1014,7 @@ discard block |
||
| 1014 | 1014 | $query .= " GROUP BY date_name |
| 1015 | 1015 | ORDER BY date_name ASC"; |
| 1016 | 1016 | $query_data = array(':offset' => $offset); |
| 1017 | - } |
|
| 1017 | + } |
|
| 1018 | 1018 | |
| 1019 | 1019 | $sth = $this->db->prepare($query); |
| 1020 | 1020 | $sth->execute($query_data); |
@@ -1036,11 +1036,11 @@ discard block |
||
| 1036 | 1036 | |
| 1037 | 1037 | |
| 1038 | 1038 | /** |
| 1039 | - * Counts all month |
|
| 1040 | - * |
|
| 1041 | - * @return Array the month list |
|
| 1042 | - * |
|
| 1043 | - */ |
|
| 1039 | + * Counts all month |
|
| 1040 | + * |
|
| 1041 | + * @return Array the month list |
|
| 1042 | + * |
|
| 1043 | + */ |
|
| 1044 | 1044 | public function countAllMonths($filters = array()) |
| 1045 | 1045 | { |
| 1046 | 1046 | global $globalTimezone, $globalDBdriver; |
@@ -1085,11 +1085,11 @@ discard block |
||
| 1085 | 1085 | |
| 1086 | 1086 | |
| 1087 | 1087 | /** |
| 1088 | - * Counts all dates during the last year |
|
| 1089 | - * |
|
| 1090 | - * @return Array the date list |
|
| 1091 | - * |
|
| 1092 | - */ |
|
| 1088 | + * Counts all dates during the last year |
|
| 1089 | + * |
|
| 1090 | + * @return Array the date list |
|
| 1091 | + * |
|
| 1092 | + */ |
|
| 1093 | 1093 | public function countAllMonthsLastYear($filters) |
| 1094 | 1094 | { |
| 1095 | 1095 | global $globalTimezone, $globalDBdriver; |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | $query .= " GROUP BY year_name, month_name |
| 1112 | 1112 | ORDER BY year_name, month_name ASC"; |
| 1113 | 1113 | $query_data = array(':offset' => $offset); |
| 1114 | - } |
|
| 1114 | + } |
|
| 1115 | 1115 | |
| 1116 | 1116 | $sth = $this->db->prepare($query); |
| 1117 | 1117 | $sth->execute($query_data); |
@@ -1134,11 +1134,11 @@ discard block |
||
| 1134 | 1134 | |
| 1135 | 1135 | |
| 1136 | 1136 | /** |
| 1137 | - * Counts all hours |
|
| 1138 | - * |
|
| 1139 | - * @return Array the hour list |
|
| 1140 | - * |
|
| 1141 | - */ |
|
| 1137 | + * Counts all hours |
|
| 1138 | + * |
|
| 1139 | + * @return Array the hour list |
|
| 1140 | + * |
|
| 1141 | + */ |
|
| 1142 | 1142 | public function countAllHours($orderby,$filters = array()) |
| 1143 | 1143 | { |
| 1144 | 1144 | global $globalTimezone, $globalDBdriver; |
@@ -1201,11 +1201,11 @@ discard block |
||
| 1201 | 1201 | |
| 1202 | 1202 | |
| 1203 | 1203 | /** |
| 1204 | - * Counts all hours by date |
|
| 1205 | - * |
|
| 1206 | - * @return Array the hour list |
|
| 1207 | - * |
|
| 1208 | - */ |
|
| 1204 | + * Counts all hours by date |
|
| 1205 | + * |
|
| 1206 | + * @return Array the hour list |
|
| 1207 | + * |
|
| 1208 | + */ |
|
| 1209 | 1209 | public function countAllHoursByDate($date, $filters = array()) |
| 1210 | 1210 | { |
| 1211 | 1211 | global $globalTimezone, $globalDBdriver; |
@@ -1249,11 +1249,11 @@ discard block |
||
| 1249 | 1249 | |
| 1250 | 1250 | |
| 1251 | 1251 | /** |
| 1252 | - * Counts all hours by a ident/callsign |
|
| 1253 | - * |
|
| 1254 | - * @return Array the hour list |
|
| 1255 | - * |
|
| 1256 | - */ |
|
| 1252 | + * Counts all hours by a ident/callsign |
|
| 1253 | + * |
|
| 1254 | + * @return Array the hour list |
|
| 1255 | + * |
|
| 1256 | + */ |
|
| 1257 | 1257 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1258 | 1258 | { |
| 1259 | 1259 | global $globalTimezone, $globalDBdriver; |
@@ -1298,11 +1298,11 @@ discard block |
||
| 1298 | 1298 | |
| 1299 | 1299 | |
| 1300 | 1300 | /** |
| 1301 | - * Counts all trackers that have flown over |
|
| 1302 | - * |
|
| 1303 | - * @return Integer the number of trackers |
|
| 1304 | - * |
|
| 1305 | - */ |
|
| 1301 | + * Counts all trackers that have flown over |
|
| 1302 | + * |
|
| 1303 | + * @return Integer the number of trackers |
|
| 1304 | + * |
|
| 1305 | + */ |
|
| 1306 | 1306 | public function countOverallTracker($filters = array(),$year = '',$month = '') |
| 1307 | 1307 | { |
| 1308 | 1308 | global $globalDBdriver; |
@@ -1337,11 +1337,11 @@ discard block |
||
| 1337 | 1337 | } |
| 1338 | 1338 | |
| 1339 | 1339 | /** |
| 1340 | - * Counts all trackers type that have flown over |
|
| 1341 | - * |
|
| 1342 | - * @return Integer the number of flights |
|
| 1343 | - * |
|
| 1344 | - */ |
|
| 1340 | + * Counts all trackers type that have flown over |
|
| 1341 | + * |
|
| 1342 | + * @return Integer the number of flights |
|
| 1343 | + * |
|
| 1344 | + */ |
|
| 1345 | 1345 | public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
| 1346 | 1346 | { |
| 1347 | 1347 | global $globalDBdriver; |
@@ -1376,11 +1376,11 @@ discard block |
||
| 1376 | 1376 | |
| 1377 | 1377 | |
| 1378 | 1378 | /** |
| 1379 | - * Counts all hours of today |
|
| 1380 | - * |
|
| 1381 | - * @return Array the hour list |
|
| 1382 | - * |
|
| 1383 | - */ |
|
| 1379 | + * Counts all hours of today |
|
| 1380 | + * |
|
| 1381 | + * @return Array the hour list |
|
| 1382 | + * |
|
| 1383 | + */ |
|
| 1384 | 1384 | public function countAllHoursFromToday($filters = array()) |
| 1385 | 1385 | { |
| 1386 | 1386 | global $globalTimezone, $globalDBdriver; |
@@ -1420,12 +1420,12 @@ discard block |
||
| 1420 | 1420 | } |
| 1421 | 1421 | |
| 1422 | 1422 | |
| 1423 | - /** |
|
| 1424 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1425 | - * |
|
| 1426 | - * @return Integer the Barrie Spotter ID |
|
| 1423 | + /** |
|
| 1424 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
| 1425 | + * |
|
| 1426 | + * @return Integer the Barrie Spotter ID |
|
| 1427 | 1427 | q * |
| 1428 | - */ |
|
| 1428 | + */ |
|
| 1429 | 1429 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1430 | 1430 | { |
| 1431 | 1431 | $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
@@ -1446,13 +1446,13 @@ discard block |
||
| 1446 | 1446 | |
| 1447 | 1447 | |
| 1448 | 1448 | /** |
| 1449 | - * Parses a date string |
|
| 1450 | - * |
|
| 1451 | - * @param String $dateString the date string |
|
| 1452 | - * @param String $timezone the timezone of a user |
|
| 1453 | - * @return Array the time information |
|
| 1454 | - * |
|
| 1455 | - */ |
|
| 1449 | + * Parses a date string |
|
| 1450 | + * |
|
| 1451 | + * @param String $dateString the date string |
|
| 1452 | + * @param String $timezone the timezone of a user |
|
| 1453 | + * @return Array the time information |
|
| 1454 | + * |
|
| 1455 | + */ |
|
| 1456 | 1456 | public function parseDateString($dateString, $timezone = '') |
| 1457 | 1457 | { |
| 1458 | 1458 | $time_array = array(); |
@@ -1485,12 +1485,12 @@ discard block |
||
| 1485 | 1485 | } |
| 1486 | 1486 | |
| 1487 | 1487 | /** |
| 1488 | - * Parses the direction degrees to working |
|
| 1489 | - * |
|
| 1490 | - * @param Float $direction the direction in degrees |
|
| 1491 | - * @return Array the direction information |
|
| 1492 | - * |
|
| 1493 | - */ |
|
| 1488 | + * Parses the direction degrees to working |
|
| 1489 | + * |
|
| 1490 | + * @param Float $direction the direction in degrees |
|
| 1491 | + * @return Array the direction information |
|
| 1492 | + * |
|
| 1493 | + */ |
|
| 1494 | 1494 | public function parseDirection($direction = 0) |
| 1495 | 1495 | { |
| 1496 | 1496 | if ($direction == '') $direction = 0; |
@@ -1569,12 +1569,12 @@ discard block |
||
| 1569 | 1569 | |
| 1570 | 1570 | |
| 1571 | 1571 | /** |
| 1572 | - * Gets Country from latitude/longitude |
|
| 1573 | - * |
|
| 1574 | - * @param Float $latitude latitute of the flight |
|
| 1575 | - * @param Float $longitude longitute of the flight |
|
| 1576 | - * @return String the countrie |
|
| 1577 | - */ |
|
| 1572 | + * Gets Country from latitude/longitude |
|
| 1573 | + * |
|
| 1574 | + * @param Float $latitude latitute of the flight |
|
| 1575 | + * @param Float $longitude longitute of the flight |
|
| 1576 | + * @return String the countrie |
|
| 1577 | + */ |
|
| 1578 | 1578 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
| 1579 | 1579 | { |
| 1580 | 1580 | global $globalDBdriver, $globalDebug; |
@@ -1611,11 +1611,11 @@ discard block |
||
| 1611 | 1611 | } |
| 1612 | 1612 | |
| 1613 | 1613 | /** |
| 1614 | - * Gets Country from iso2 |
|
| 1615 | - * |
|
| 1616 | - * @param String $iso2 ISO2 country code |
|
| 1617 | - * @return String the countrie |
|
| 1618 | - */ |
|
| 1614 | + * Gets Country from iso2 |
|
| 1615 | + * |
|
| 1616 | + * @param String $iso2 ISO2 country code |
|
| 1617 | + * @return String the countrie |
|
| 1618 | + */ |
|
| 1619 | 1619 | public function getCountryFromISO2($iso2) |
| 1620 | 1620 | { |
| 1621 | 1621 | global $globalDBdriver, $globalDebug; |
@@ -1643,11 +1643,11 @@ discard block |
||
| 1643 | 1643 | } |
| 1644 | 1644 | |
| 1645 | 1645 | /** |
| 1646 | - * Gets all vessels types that have flown over |
|
| 1647 | - * |
|
| 1648 | - * @return Array the vessel type list |
|
| 1649 | - * |
|
| 1650 | - */ |
|
| 1646 | + * Gets all vessels types that have flown over |
|
| 1647 | + * |
|
| 1648 | + * @return Array the vessel type list |
|
| 1649 | + * |
|
| 1650 | + */ |
|
| 1651 | 1651 | public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
| 1652 | 1652 | { |
| 1653 | 1653 | global $globalDBdriver; |
@@ -1714,12 +1714,12 @@ discard block |
||
| 1714 | 1714 | |
| 1715 | 1715 | |
| 1716 | 1716 | /** |
| 1717 | - * Gets the short url from bit.ly |
|
| 1718 | - * |
|
| 1719 | - * @param String $url the full url |
|
| 1720 | - * @return String the bit.ly url |
|
| 1721 | - * |
|
| 1722 | - */ |
|
| 1717 | + * Gets the short url from bit.ly |
|
| 1718 | + * |
|
| 1719 | + * @param String $url the full url |
|
| 1720 | + * @return String the bit.ly url |
|
| 1721 | + * |
|
| 1722 | + */ |
|
| 1723 | 1723 | public function getBitlyURL($url) |
| 1724 | 1724 | { |
| 1725 | 1725 | global $globalBitlyAccessToken; |
@@ -31,7 +31,9 @@ discard block |
||
| 31 | 31 | if (isset($filter[0]['source'])) { |
| 32 | 32 | $filters = array_merge($filters,$filter); |
| 33 | 33 | } |
| 34 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 34 | + if (is_array($globalFilter)) { |
|
| 35 | + $filter = array_merge($filter,$globalFilter); |
|
| 36 | + } |
|
| 35 | 37 | $filter_query_join = ''; |
| 36 | 38 | $filter_query_where = ''; |
| 37 | 39 | foreach($filters as $flt) { |
@@ -70,8 +72,11 @@ discard block |
||
| 70 | 72 | $filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'"; |
| 71 | 73 | } |
| 72 | 74 | } |
| 73 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 74 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 75 | + if ($filter_query_where == '' && $where) { |
|
| 76 | + $filter_query_where = ' WHERE'; |
|
| 77 | + } elseif ($filter_query_where != '' && $and) { |
|
| 78 | + $filter_query_where .= ' AND'; |
|
| 79 | + } |
|
| 75 | 80 | if ($filter_query_where != '') { |
| 76 | 81 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 77 | 82 | } |
@@ -125,26 +130,43 @@ discard block |
||
| 125 | 130 | $temp_array['spotter_id'] = $row['spotter_archive_id']; |
| 126 | 131 | } elseif (isset($row['spotter_archive_output_id'])) { |
| 127 | 132 | $temp_array['spotter_id'] = $row['spotter_archive_output_id']; |
| 128 | - */} |
|
| 129 | - elseif (isset($row['trackerid'])) { |
|
| 133 | + */} elseif (isset($row['trackerid'])) { |
|
| 130 | 134 | $temp_array['trackerid'] = $row['trackerid']; |
| 131 | 135 | } else { |
| 132 | 136 | $temp_array['trackerid'] = ''; |
| 133 | 137 | } |
| 134 | - if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 135 | - if (isset($row['type'])) $temp_array['type'] = $row['type']; |
|
| 136 | - if (isset($row['comment'])) $temp_array['comment'] = $row['comment']; |
|
| 138 | + if (isset($row['famtrackid'])) { |
|
| 139 | + $temp_array['famtrackid'] = $row['famtrackid']; |
|
| 140 | + } |
|
| 141 | + if (isset($row['type'])) { |
|
| 142 | + $temp_array['type'] = $row['type']; |
|
| 143 | + } |
|
| 144 | + if (isset($row['comment'])) { |
|
| 145 | + $temp_array['comment'] = $row['comment']; |
|
| 146 | + } |
|
| 137 | 147 | $temp_array['ident'] = $row['ident']; |
| 138 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
| 139 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
| 140 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
| 141 | - if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude']; |
|
| 148 | + if (isset($row['latitude'])) { |
|
| 149 | + $temp_array['latitude'] = $row['latitude']; |
|
| 150 | + } |
|
| 151 | + if (isset($row['longitude'])) { |
|
| 152 | + $temp_array['longitude'] = $row['longitude']; |
|
| 153 | + } |
|
| 154 | + if (isset($row['format_source'])) { |
|
| 155 | + $temp_array['format_source'] = $row['format_source']; |
|
| 156 | + } |
|
| 157 | + if (isset($row['altitude'])) { |
|
| 158 | + $temp_array['altitude'] = $row['altitude']; |
|
| 159 | + } |
|
| 142 | 160 | if (isset($row['heading'])) { |
| 143 | 161 | $temp_array['heading'] = $row['heading']; |
| 144 | 162 | $heading_direction = $this->parseDirection($row['heading']); |
| 145 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 163 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
| 164 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
| 165 | + } |
|
| 166 | + } |
|
| 167 | + if (isset($row['ground_speed'])) { |
|
| 168 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 146 | 169 | } |
| 147 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
| 148 | 170 | |
| 149 | 171 | if (isset($row['date'])) { |
| 150 | 172 | $dateArray = $this->parseDateString($row['date']); |
@@ -187,13 +209,21 @@ discard block |
||
| 187 | 209 | } |
| 188 | 210 | |
| 189 | 211 | $fromsource = NULL; |
| 190 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
| 191 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
| 192 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
| 212 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
| 213 | + $temp_array['source_name'] = $row['source_name']; |
|
| 214 | + } |
|
| 215 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
| 216 | + $temp_array['over_country'] = $row['over_country']; |
|
| 217 | + } |
|
| 218 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
| 219 | + $temp_array['distance'] = $row['distance']; |
|
| 220 | + } |
|
| 193 | 221 | $temp_array['query_number_rows'] = $num_rows; |
| 194 | 222 | $spotter_array[] = $temp_array; |
| 195 | 223 | } |
| 196 | - if ($num_rows == 0) return array(); |
|
| 224 | + if ($num_rows == 0) { |
|
| 225 | + return array(); |
|
| 226 | + } |
|
| 197 | 227 | $spotter_array[0]['query_number_rows'] = $num_rows; |
| 198 | 228 | return $spotter_array; |
| 199 | 229 | } |
@@ -224,8 +254,12 @@ discard block |
||
| 224 | 254 | { |
| 225 | 255 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 226 | 256 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 227 | - } else $limit_query = ""; |
|
| 228 | - } else $limit_query = ""; |
|
| 257 | + } else { |
|
| 258 | + $limit_query = ""; |
|
| 259 | + } |
|
| 260 | + } else { |
|
| 261 | + $limit_query = ""; |
|
| 262 | + } |
|
| 229 | 263 | |
| 230 | 264 | if ($sort != "") |
| 231 | 265 | { |
@@ -253,7 +287,9 @@ discard block |
||
| 253 | 287 | global $global_query; |
| 254 | 288 | |
| 255 | 289 | date_default_timezone_set('UTC'); |
| 256 | - if ($id == '') return array(); |
|
| 290 | + if ($id == '') { |
|
| 291 | + return array(); |
|
| 292 | + } |
|
| 257 | 293 | $additional_query = "tracker_output.famtrackid = :id"; |
| 258 | 294 | $query_values = array(':id' => $id); |
| 259 | 295 | $query = $global_query." WHERE ".$additional_query." "; |
@@ -396,8 +432,11 @@ discard block |
||
| 396 | 432 | $query .= " ORDER BY tracker_output.source_name ASC"; |
| 397 | 433 | |
| 398 | 434 | $sth = $this->db->prepare($query); |
| 399 | - if (!empty($query_values)) $sth->execute($query_values); |
|
| 400 | - else $sth->execute(); |
|
| 435 | + if (!empty($query_values)) { |
|
| 436 | + $sth->execute($query_values); |
|
| 437 | + } else { |
|
| 438 | + $sth->execute(); |
|
| 439 | + } |
|
| 401 | 440 | |
| 402 | 441 | $source_array = array(); |
| 403 | 442 | $temp_array = array(); |
@@ -452,7 +491,9 @@ discard block |
||
| 452 | 491 | date_default_timezone_set($globalTimezone); |
| 453 | 492 | $datetime = new DateTime(); |
| 454 | 493 | $offset = $datetime->format('P'); |
| 455 | - } else $offset = '+00:00'; |
|
| 494 | + } else { |
|
| 495 | + $offset = '+00:00'; |
|
| 496 | + } |
|
| 456 | 497 | |
| 457 | 498 | if ($globalDBdriver == 'mysql') { |
| 458 | 499 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
@@ -608,7 +649,9 @@ discard block |
||
| 608 | 649 | { |
| 609 | 650 | return false; |
| 610 | 651 | } |
| 611 | - } else $altitude = 0; |
|
| 652 | + } else { |
|
| 653 | + $altitude = 0; |
|
| 654 | + } |
|
| 612 | 655 | |
| 613 | 656 | if ($heading != "") |
| 614 | 657 | { |
@@ -647,8 +690,12 @@ discard block |
||
| 647 | 690 | $latitude = 0; |
| 648 | 691 | $longitude = 0; |
| 649 | 692 | } |
| 650 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 651 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 693 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
| 694 | + $heading = 0; |
|
| 695 | + } |
|
| 696 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
| 697 | + $groundspeed = 0; |
|
| 698 | + } |
|
| 652 | 699 | $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
| 653 | 700 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 654 | 701 | |
@@ -757,7 +804,9 @@ discard block |
||
| 757 | 804 | global $globalDBdriver, $globalArchive; |
| 758 | 805 | //$filter_query = $this->getFilter($filters,true,true); |
| 759 | 806 | $Connection= new Connection($this->db); |
| 760 | - if (!$Connection->tableExists('countries')) return array(); |
|
| 807 | + if (!$Connection->tableExists('countries')) { |
|
| 808 | + return array(); |
|
| 809 | + } |
|
| 761 | 810 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 762 | 811 | require_once('class.TrackerLive.php'); |
| 763 | 812 | $TrackerLive = new TrackerLive(); |
@@ -800,7 +849,9 @@ discard block |
||
| 800 | 849 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
| 801 | 850 | } |
| 802 | 851 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
| 803 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 852 | + if ($limit) { |
|
| 853 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 854 | + } |
|
| 804 | 855 | |
| 805 | 856 | |
| 806 | 857 | $sth = $this->db->prepare($query); |
@@ -833,12 +884,18 @@ discard block |
||
| 833 | 884 | $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
| 834 | 885 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 835 | 886 | if ($olderthanmonths > 0) { |
| 836 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 837 | - else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 887 | + if ($globalDBdriver == 'mysql') { |
|
| 888 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
| 889 | + } else { |
|
| 890 | + $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
| 891 | + } |
|
| 838 | 892 | } |
| 839 | 893 | if ($sincedate != '') { |
| 840 | - if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 841 | - else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 894 | + if ($globalDBdriver == 'mysql') { |
|
| 895 | + $query .= " AND tracker_output.date > '".$sincedate."'"; |
|
| 896 | + } else { |
|
| 897 | + $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
| 898 | + } |
|
| 842 | 899 | } |
| 843 | 900 | $query_values = array(); |
| 844 | 901 | if ($year != '') { |
@@ -869,7 +926,9 @@ discard block |
||
| 869 | 926 | } |
| 870 | 927 | } |
| 871 | 928 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
| 872 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 929 | + if ($limit) { |
|
| 930 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 931 | + } |
|
| 873 | 932 | |
| 874 | 933 | $sth = $this->db->prepare($query); |
| 875 | 934 | $sth->execute($query_values); |
@@ -904,7 +963,9 @@ discard block |
||
| 904 | 963 | date_default_timezone_set($globalTimezone); |
| 905 | 964 | $datetime = new DateTime(); |
| 906 | 965 | $offset = $datetime->format('P'); |
| 907 | - } else $offset = '+00:00'; |
|
| 966 | + } else { |
|
| 967 | + $offset = '+00:00'; |
|
| 968 | + } |
|
| 908 | 969 | |
| 909 | 970 | if ($globalDBdriver == 'mysql') { |
| 910 | 971 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -954,7 +1015,9 @@ discard block |
||
| 954 | 1015 | date_default_timezone_set($globalTimezone); |
| 955 | 1016 | $datetime = new DateTime(); |
| 956 | 1017 | $offset = $datetime->format('P'); |
| 957 | - } else $offset = '+00:00'; |
|
| 1018 | + } else { |
|
| 1019 | + $offset = '+00:00'; |
|
| 1020 | + } |
|
| 958 | 1021 | $filter_query = $this->getFilter($filters,true,true); |
| 959 | 1022 | if ($globalDBdriver == 'mysql') { |
| 960 | 1023 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1000,7 +1063,9 @@ discard block |
||
| 1000 | 1063 | date_default_timezone_set($globalTimezone); |
| 1001 | 1064 | $datetime = new DateTime(); |
| 1002 | 1065 | $offset = $datetime->format('P'); |
| 1003 | - } else $offset = '+00:00'; |
|
| 1066 | + } else { |
|
| 1067 | + $offset = '+00:00'; |
|
| 1068 | + } |
|
| 1004 | 1069 | $filter_query = $this->getFilter($filters,true,true); |
| 1005 | 1070 | if ($globalDBdriver == 'mysql') { |
| 1006 | 1071 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1048,7 +1113,9 @@ discard block |
||
| 1048 | 1113 | date_default_timezone_set($globalTimezone); |
| 1049 | 1114 | $datetime = new DateTime(); |
| 1050 | 1115 | $offset = $datetime->format('P'); |
| 1051 | - } else $offset = '+00:00'; |
|
| 1116 | + } else { |
|
| 1117 | + $offset = '+00:00'; |
|
| 1118 | + } |
|
| 1052 | 1119 | |
| 1053 | 1120 | if ($globalDBdriver == 'mysql') { |
| 1054 | 1121 | $query = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1097,7 +1164,9 @@ discard block |
||
| 1097 | 1164 | date_default_timezone_set($globalTimezone); |
| 1098 | 1165 | $datetime = new DateTime(); |
| 1099 | 1166 | $offset = $datetime->format('P'); |
| 1100 | - } else $offset = '+00:00'; |
|
| 1167 | + } else { |
|
| 1168 | + $offset = '+00:00'; |
|
| 1169 | + } |
|
| 1101 | 1170 | $filter_query = $this->getFilter($filters,true,true); |
| 1102 | 1171 | if ($globalDBdriver == 'mysql') { |
| 1103 | 1172 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
@@ -1146,7 +1215,9 @@ discard block |
||
| 1146 | 1215 | date_default_timezone_set($globalTimezone); |
| 1147 | 1216 | $datetime = new DateTime(); |
| 1148 | 1217 | $offset = $datetime->format('P'); |
| 1149 | - } else $offset = '+00:00'; |
|
| 1218 | + } else { |
|
| 1219 | + $offset = '+00:00'; |
|
| 1220 | + } |
|
| 1150 | 1221 | |
| 1151 | 1222 | $orderby_sql = ''; |
| 1152 | 1223 | if ($orderby == "hour") |
@@ -1215,7 +1286,9 @@ discard block |
||
| 1215 | 1286 | date_default_timezone_set($globalTimezone); |
| 1216 | 1287 | $datetime = new DateTime($date); |
| 1217 | 1288 | $offset = $datetime->format('P'); |
| 1218 | - } else $offset = '+00:00'; |
|
| 1289 | + } else { |
|
| 1290 | + $offset = '+00:00'; |
|
| 1291 | + } |
|
| 1219 | 1292 | |
| 1220 | 1293 | if ($globalDBdriver == 'mysql') { |
| 1221 | 1294 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1263,7 +1336,9 @@ discard block |
||
| 1263 | 1336 | date_default_timezone_set($globalTimezone); |
| 1264 | 1337 | $datetime = new DateTime(); |
| 1265 | 1338 | $offset = $datetime->format('P'); |
| 1266 | - } else $offset = '+00:00'; |
|
| 1339 | + } else { |
|
| 1340 | + $offset = '+00:00'; |
|
| 1341 | + } |
|
| 1267 | 1342 | |
| 1268 | 1343 | if ($globalDBdriver == 'mysql') { |
| 1269 | 1344 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1328,8 +1403,11 @@ discard block |
||
| 1328 | 1403 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1329 | 1404 | } |
| 1330 | 1405 | } |
| 1331 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1332 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1406 | + if (empty($query_values)) { |
|
| 1407 | + $queryi .= $this->getFilter($filters); |
|
| 1408 | + } else { |
|
| 1409 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1410 | + } |
|
| 1333 | 1411 | |
| 1334 | 1412 | $sth = $this->db->prepare($queryi); |
| 1335 | 1413 | $sth->execute($query_values); |
@@ -1366,8 +1444,11 @@ discard block |
||
| 1366 | 1444 | $query_values = array_merge($query_values,array(':month' => $month)); |
| 1367 | 1445 | } |
| 1368 | 1446 | } |
| 1369 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
| 1370 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1447 | + if (empty($query_values)) { |
|
| 1448 | + $queryi .= $this->getFilter($filters); |
|
| 1449 | + } else { |
|
| 1450 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1451 | + } |
|
| 1371 | 1452 | |
| 1372 | 1453 | $sth = $this->db->prepare($queryi); |
| 1373 | 1454 | $sth->execute($query_values); |
@@ -1389,7 +1470,9 @@ discard block |
||
| 1389 | 1470 | date_default_timezone_set($globalTimezone); |
| 1390 | 1471 | $datetime = new DateTime(); |
| 1391 | 1472 | $offset = $datetime->format('P'); |
| 1392 | - } else $offset = '+00:00'; |
|
| 1473 | + } else { |
|
| 1474 | + $offset = '+00:00'; |
|
| 1475 | + } |
|
| 1393 | 1476 | |
| 1394 | 1477 | if ($globalDBdriver == 'mysql') { |
| 1395 | 1478 | $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1493,7 +1576,9 @@ discard block |
||
| 1493 | 1576 | */ |
| 1494 | 1577 | public function parseDirection($direction = 0) |
| 1495 | 1578 | { |
| 1496 | - if ($direction == '') $direction = 0; |
|
| 1579 | + if ($direction == '') { |
|
| 1580 | + $direction = 0; |
|
| 1581 | + } |
|
| 1497 | 1582 | $direction_array = array(); |
| 1498 | 1583 | $temp_array = array(); |
| 1499 | 1584 | |
@@ -1582,7 +1667,9 @@ discard block |
||
| 1582 | 1667 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 1583 | 1668 | |
| 1584 | 1669 | $Connection = new Connection($this->db); |
| 1585 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1670 | + if (!$Connection->tableExists('countries')) { |
|
| 1671 | + return ''; |
|
| 1672 | + } |
|
| 1586 | 1673 | |
| 1587 | 1674 | try { |
| 1588 | 1675 | /* |
@@ -1602,9 +1689,13 @@ discard block |
||
| 1602 | 1689 | $sth->closeCursor(); |
| 1603 | 1690 | if (count($row) > 0) { |
| 1604 | 1691 | return $row; |
| 1605 | - } else return ''; |
|
| 1692 | + } else { |
|
| 1693 | + return ''; |
|
| 1694 | + } |
|
| 1606 | 1695 | } catch (PDOException $e) { |
| 1607 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1696 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1697 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1698 | + } |
|
| 1608 | 1699 | return ''; |
| 1609 | 1700 | } |
| 1610 | 1701 | |
@@ -1622,7 +1713,9 @@ discard block |
||
| 1622 | 1713 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
| 1623 | 1714 | |
| 1624 | 1715 | $Connection = new Connection($this->db); |
| 1625 | - if (!$Connection->tableExists('countries')) return ''; |
|
| 1716 | + if (!$Connection->tableExists('countries')) { |
|
| 1717 | + return ''; |
|
| 1718 | + } |
|
| 1626 | 1719 | |
| 1627 | 1720 | try { |
| 1628 | 1721 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -1634,9 +1727,13 @@ discard block |
||
| 1634 | 1727 | $sth->closeCursor(); |
| 1635 | 1728 | if (count($row) > 0) { |
| 1636 | 1729 | return $row; |
| 1637 | - } else return ''; |
|
| 1730 | + } else { |
|
| 1731 | + return ''; |
|
| 1732 | + } |
|
| 1638 | 1733 | } catch (PDOException $e) { |
| 1639 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
| 1734 | + if (isset($globalDebug) && $globalDebug) { |
|
| 1735 | + echo 'Error : '.$e->getMessage()."\n"; |
|
| 1736 | + } |
|
| 1640 | 1737 | return ''; |
| 1641 | 1738 | } |
| 1642 | 1739 | |
@@ -1697,7 +1794,9 @@ discard block |
||
| 1697 | 1794 | } |
| 1698 | 1795 | } |
| 1699 | 1796 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
| 1700 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
| 1797 | + if ($limit) { |
|
| 1798 | + $query .= " LIMIT 10 OFFSET 0"; |
|
| 1799 | + } |
|
| 1701 | 1800 | $sth = $this->db->prepare($query); |
| 1702 | 1801 | $sth->execute($query_values); |
| 1703 | 1802 | $tracker_array = array(); |
@@ -1724,7 +1823,9 @@ discard block |
||
| 1724 | 1823 | { |
| 1725 | 1824 | global $globalBitlyAccessToken; |
| 1726 | 1825 | |
| 1727 | - if ($globalBitlyAccessToken == '') return $url; |
|
| 1826 | + if ($globalBitlyAccessToken == '') { |
|
| 1827 | + return $url; |
|
| 1828 | + } |
|
| 1728 | 1829 | |
| 1729 | 1830 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
| 1730 | 1831 | |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT tracker_output.* FROM tracker_output"; |
| 6 | 6 | |
| 7 | -class Tracker{ |
|
| 7 | +class Tracker { |
|
| 8 | 8 | public $db; |
| 9 | 9 | |
| 10 | 10 | public function __construct($dbc = null) { |
@@ -18,33 +18,33 @@ discard block |
||
| 18 | 18 | * @return Array the SQL part |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 21 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 22 | 22 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 23 | 23 | $filters = array(); |
| 24 | 24 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 25 | 25 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 26 | 26 | $filters = $globalStatsFilters[$globalFilterName]; |
| 27 | 27 | } else { |
| 28 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 28 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | if (isset($filter[0]['source'])) { |
| 32 | - $filters = array_merge($filters,$filter); |
|
| 32 | + $filters = array_merge($filters, $filter); |
|
| 33 | 33 | } |
| 34 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 34 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 35 | 35 | $filter_query_join = ''; |
| 36 | 36 | $filter_query_where = ''; |
| 37 | - foreach($filters as $flt) { |
|
| 37 | + foreach ($filters as $flt) { |
|
| 38 | 38 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 47 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 47 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 48 | 48 | } |
| 49 | 49 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 50 | 50 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 74 | 74 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 75 | 75 | if ($filter_query_where != '') { |
| 76 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 76 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 77 | 77 | } |
| 78 | 78 | $filter_query = $filter_query_join.$filter_query_where; |
| 79 | 79 | return $filter_query; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @return Array the spotter information |
| 89 | 89 | * |
| 90 | 90 | */ |
| 91 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 91 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 92 | 92 | { |
| 93 | 93 | date_default_timezone_set('UTC'); |
| 94 | 94 | if (!is_string($query)) |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | $sth = $this->db->prepare($query.$limitQuery); |
| 109 | 109 | $sth->execute($params); |
| 110 | 110 | } catch (PDOException $e) { |
| 111 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 111 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 112 | 112 | exit(); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $num_rows = 0; |
| 116 | 116 | $spotter_array = array(); |
| 117 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 117 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 118 | 118 | { |
| 119 | 119 | $num_rows++; |
| 120 | 120 | $temp_array = array(); |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | { |
| 171 | 171 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 172 | 172 | } else { |
| 173 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 173 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 174 | 174 | } |
| 175 | 175 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 176 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 177 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 176 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 177 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 178 | 178 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 179 | 179 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 180 | 180 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 181 | 181 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 182 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 183 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 182 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 183 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 184 | 184 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -217,8 +217,8 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | $limit_array = explode(",", $limit); |
| 219 | 219 | |
| 220 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 220 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 222 | 222 | |
| 223 | 223 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 224 | 224 | { |
@@ -235,9 +235,9 @@ discard block |
||
| 235 | 235 | $orderby_query = " ORDER BY tracker_output.date DESC"; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 238 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 239 | 239 | |
| 240 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 240 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 241 | 241 | |
| 242 | 242 | return $spotter_array; |
| 243 | 243 | } |
@@ -256,8 +256,8 @@ discard block |
||
| 256 | 256 | if ($id == '') return array(); |
| 257 | 257 | $additional_query = "tracker_output.famtrackid = :id"; |
| 258 | 258 | $query_values = array(':id' => $id); |
| 259 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 260 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 259 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 260 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 261 | 261 | return $spotter_array; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $query_values = array(); |
| 277 | 277 | $limit_query = ''; |
| 278 | 278 | $additional_query = ''; |
| 279 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 279 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 280 | 280 | if ($ident != "") |
| 281 | 281 | { |
| 282 | 282 | if (!is_string($ident)) |
@@ -292,8 +292,8 @@ discard block |
||
| 292 | 292 | { |
| 293 | 293 | $limit_array = explode(",", $limit); |
| 294 | 294 | |
| 295 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 295 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 297 | 297 | |
| 298 | 298 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 299 | 299 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | return $spotter_array; |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | - public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 320 | + public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 321 | 321 | { |
| 322 | 322 | global $global_query, $globalTimezone, $globalDBdriver; |
| 323 | 323 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | $limit_query = ''; |
| 326 | 326 | $additional_query = ''; |
| 327 | 327 | |
| 328 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 328 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 329 | 329 | |
| 330 | 330 | if ($date != "") |
| 331 | 331 | { |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | { |
| 352 | 352 | $limit_array = explode(",", $limit); |
| 353 | 353 | |
| 354 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 354 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 356 | 356 | |
| 357 | 357 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 358 | 358 | { |
@@ -383,11 +383,11 @@ discard block |
||
| 383 | 383 | * @return Array list of source name |
| 384 | 384 | * |
| 385 | 385 | */ |
| 386 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 386 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 387 | 387 | { |
| 388 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 388 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 389 | 389 | $query_values = array(); |
| 390 | - $query = "SELECT DISTINCT tracker_output.source_name |
|
| 390 | + $query = "SELECT DISTINCT tracker_output.source_name |
|
| 391 | 391 | FROM tracker_output".$filter_query." tracker_output.source_name <> ''"; |
| 392 | 392 | if ($type != '') { |
| 393 | 393 | $query_values = array(':type' => $type); |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | $source_array = array(); |
| 403 | 403 | $temp_array = array(); |
| 404 | 404 | |
| 405 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 405 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 406 | 406 | { |
| 407 | 407 | $temp_array['source_name'] = $row['source_name']; |
| 408 | 408 | $source_array[] = $temp_array; |
@@ -419,8 +419,8 @@ discard block |
||
| 419 | 419 | */ |
| 420 | 420 | public function getAllIdents($filters = array()) |
| 421 | 421 | { |
| 422 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 423 | - $query = "SELECT DISTINCT tracker_output.ident |
|
| 422 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 423 | + $query = "SELECT DISTINCT tracker_output.ident |
|
| 424 | 424 | FROM tracker_output".$filter_query." tracker_output.ident <> '' |
| 425 | 425 | ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0"; |
| 426 | 426 | |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | $ident_array = array(); |
| 431 | 431 | $temp_array = array(); |
| 432 | 432 | |
| 433 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 433 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 434 | 434 | { |
| 435 | 435 | $temp_array['ident'] = $row['ident']; |
| 436 | 436 | $ident_array[] = $temp_array; |
@@ -455,12 +455,12 @@ discard block |
||
| 455 | 455 | } else $offset = '+00:00'; |
| 456 | 456 | |
| 457 | 457 | if ($globalDBdriver == 'mysql') { |
| 458 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 458 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 459 | 459 | FROM tracker_output |
| 460 | 460 | WHERE tracker_output.date <> '' |
| 461 | 461 | ORDER BY tracker_output.date ASC LIMIT 0,200"; |
| 462 | 462 | } else { |
| 463 | - $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 463 | + $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 464 | 464 | FROM tracker_output |
| 465 | 465 | WHERE tracker_output.date <> '' |
| 466 | 466 | ORDER BY tracker_output.date ASC LIMIT 0,200"; |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | $date_array = array(); |
| 473 | 473 | $temp_array = array(); |
| 474 | 474 | |
| 475 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 475 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 476 | 476 | { |
| 477 | 477 | $temp_array['date'] = $row['date']; |
| 478 | 478 | |
@@ -491,11 +491,11 @@ discard block |
||
| 491 | 491 | * @return String success or false |
| 492 | 492 | * |
| 493 | 493 | */ |
| 494 | - public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
|
| 494 | + public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL) |
|
| 495 | 495 | { |
| 496 | 496 | |
| 497 | 497 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 498 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 498 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident); |
|
| 499 | 499 | |
| 500 | 500 | try { |
| 501 | 501 | $sth = $this->db->prepare($query); |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 520 | 520 | { |
| 521 | 521 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 522 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 522 | + $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 523 | 523 | |
| 524 | 524 | try { |
| 525 | 525 | $sth = $this->db->prepare($query); |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | * @param String $verticalrate vertival rate of flight |
| 560 | 560 | * @return String success or false |
| 561 | 561 | */ |
| 562 | - public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
|
| 562 | + public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '') |
|
| 563 | 563 | { |
| 564 | 564 | global $globalURL; |
| 565 | 565 | |
@@ -627,21 +627,21 @@ discard block |
||
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | |
| 630 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 630 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 631 | 631 | { |
| 632 | 632 | $date = date("Y-m-d H:i:s", time()); |
| 633 | 633 | } |
| 634 | 634 | |
| 635 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 636 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 637 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 638 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 641 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 642 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 643 | - $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
|
| 644 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 635 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 636 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 637 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 638 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 641 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 642 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 643 | + $comment = filter_var($comment, FILTER_SANITIZE_STRING); |
|
| 644 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 645 | 645 | |
| 646 | 646 | if ($latitude == '' && $longitude == '') { |
| 647 | 647 | $latitude = 0; |
@@ -649,10 +649,10 @@ discard block |
||
| 649 | 649 | } |
| 650 | 650 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 651 | 651 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 652 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 652 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 653 | 653 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 654 | 654 | |
| 655 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 655 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type); |
|
| 656 | 656 | |
| 657 | 657 | try { |
| 658 | 658 | |
@@ -678,13 +678,13 @@ discard block |
||
| 678 | 678 | { |
| 679 | 679 | global $globalDBdriver, $globalTimezone; |
| 680 | 680 | if ($globalDBdriver == 'mysql') { |
| 681 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 681 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 682 | 682 | WHERE tracker_output.ident = :ident |
| 683 | 683 | AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 684 | 684 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 685 | 685 | $query_data = array(':ident' => $ident); |
| 686 | 686 | } else { |
| 687 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 687 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 688 | 688 | WHERE tracker_output.ident = :ident |
| 689 | 689 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 690 | 690 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -693,8 +693,8 @@ discard block |
||
| 693 | 693 | |
| 694 | 694 | $sth = $this->db->prepare($query); |
| 695 | 695 | $sth->execute($query_data); |
| 696 | - $ident_result=''; |
|
| 697 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 696 | + $ident_result = ''; |
|
| 697 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 698 | 698 | { |
| 699 | 699 | $ident_result = $row['ident']; |
| 700 | 700 | } |
@@ -720,8 +720,8 @@ discard block |
||
| 720 | 720 | return false; |
| 721 | 721 | } else { |
| 722 | 722 | $q_array = explode(" ", $q); |
| 723 | - foreach ($q_array as $q_item){ |
|
| 724 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 723 | + foreach ($q_array as $q_item) { |
|
| 724 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 725 | 725 | $additional_query .= " AND ("; |
| 726 | 726 | $additional_query .= "(tracker_output.ident like '%".$q_item."%')"; |
| 727 | 727 | $additional_query .= ")"; |
@@ -729,11 +729,11 @@ discard block |
||
| 729 | 729 | } |
| 730 | 730 | } |
| 731 | 731 | if ($globalDBdriver == 'mysql') { |
| 732 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 732 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 733 | 733 | WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 734 | 734 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 735 | 735 | } else { |
| 736 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 736 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 737 | 737 | WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 738 | 738 | AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 739 | 739 | } |
@@ -752,16 +752,16 @@ discard block |
||
| 752 | 752 | * |
| 753 | 753 | */ |
| 754 | 754 | |
| 755 | - public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 755 | + public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 756 | 756 | { |
| 757 | 757 | global $globalDBdriver, $globalArchive; |
| 758 | 758 | //$filter_query = $this->getFilter($filters,true,true); |
| 759 | - $Connection= new Connection($this->db); |
|
| 759 | + $Connection = new Connection($this->db); |
|
| 760 | 760 | if (!$Connection->tableExists('countries')) return array(); |
| 761 | 761 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 762 | 762 | require_once('class.TrackerLive.php'); |
| 763 | 763 | $TrackerLive = new TrackerLive(); |
| 764 | - $filter_query = $TrackerLive->getFilter($filters,true,true); |
|
| 764 | + $filter_query = $TrackerLive->getFilter($filters, true, true); |
|
| 765 | 765 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 766 | 766 | if ($olderthanmonths > 0) { |
| 767 | 767 | if ($globalDBdriver == 'mysql') { |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | } else { |
| 782 | 782 | require_once('class.TrackerArchive.php'); |
| 783 | 783 | $TrackerArchive = new TrackerArchive(); |
| 784 | - $filter_query = $TrackerArchive->getFilter($filters,true,true); |
|
| 784 | + $filter_query = $TrackerArchive->getFilter($filters, true, true); |
|
| 785 | 785 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 786 | 786 | if ($olderthanmonths > 0) { |
| 787 | 787 | if ($globalDBdriver == 'mysql') { |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | $flight_array = array(); |
| 810 | 810 | $temp_array = array(); |
| 811 | 811 | |
| 812 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 812 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 813 | 813 | { |
| 814 | 814 | $temp_array['flight_count'] = $row['nb']; |
| 815 | 815 | $temp_array['flight_country'] = $row['name']; |
@@ -826,11 +826,11 @@ discard block |
||
| 826 | 826 | * @return Array the callsign list |
| 827 | 827 | * |
| 828 | 828 | */ |
| 829 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 829 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 830 | 830 | { |
| 831 | 831 | global $globalDBdriver; |
| 832 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 833 | - $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 832 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 833 | + $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 834 | 834 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 835 | 835 | if ($olderthanmonths > 0) { |
| 836 | 836 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -844,28 +844,28 @@ discard block |
||
| 844 | 844 | if ($year != '') { |
| 845 | 845 | if ($globalDBdriver == 'mysql') { |
| 846 | 846 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 847 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 847 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 848 | 848 | } else { |
| 849 | 849 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 850 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 850 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | if ($month != '') { |
| 854 | 854 | if ($globalDBdriver == 'mysql') { |
| 855 | 855 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 856 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 856 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 857 | 857 | } else { |
| 858 | 858 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 859 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 859 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | 862 | if ($day != '') { |
| 863 | 863 | if ($globalDBdriver == 'mysql') { |
| 864 | 864 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 865 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 865 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 866 | 866 | } else { |
| 867 | 867 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 868 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 868 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 869 | 869 | } |
| 870 | 870 | } |
| 871 | 871 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | $callsign_array = array(); |
| 878 | 878 | $temp_array = array(); |
| 879 | 879 | |
| 880 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 880 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 881 | 881 | { |
| 882 | 882 | $temp_array['callsign_icao'] = $row['ident']; |
| 883 | 883 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | $date_array = array(); |
| 930 | 930 | $temp_array = array(); |
| 931 | 931 | |
| 932 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 932 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 933 | 933 | { |
| 934 | 934 | $temp_array['date_name'] = $row['date_name']; |
| 935 | 935 | $temp_array['date_count'] = $row['date_count']; |
@@ -955,7 +955,7 @@ discard block |
||
| 955 | 955 | $datetime = new DateTime(); |
| 956 | 956 | $offset = $datetime->format('P'); |
| 957 | 957 | } else $offset = '+00:00'; |
| 958 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 958 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 959 | 959 | if ($globalDBdriver == 'mysql') { |
| 960 | 960 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 961 | 961 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -976,7 +976,7 @@ discard block |
||
| 976 | 976 | $date_array = array(); |
| 977 | 977 | $temp_array = array(); |
| 978 | 978 | |
| 979 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 979 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 980 | 980 | { |
| 981 | 981 | $temp_array['date_name'] = $row['date_name']; |
| 982 | 982 | $temp_array['date_count'] = $row['date_count']; |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | $datetime = new DateTime(); |
| 1002 | 1002 | $offset = $datetime->format('P'); |
| 1003 | 1003 | } else $offset = '+00:00'; |
| 1004 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1004 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1005 | 1005 | if ($globalDBdriver == 'mysql') { |
| 1006 | 1006 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1007 | 1007 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | $date_array = array(); |
| 1023 | 1023 | $temp_array = array(); |
| 1024 | 1024 | |
| 1025 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1025 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1026 | 1026 | { |
| 1027 | 1027 | $temp_array['date_name'] = $row['date_name']; |
| 1028 | 1028 | $temp_array['date_count'] = $row['date_count']; |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | $date_array = array(); |
| 1070 | 1070 | $temp_array = array(); |
| 1071 | 1071 | |
| 1072 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1072 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1073 | 1073 | { |
| 1074 | 1074 | $temp_array['month_name'] = $row['month_name']; |
| 1075 | 1075 | $temp_array['year_name'] = $row['year_name']; |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $datetime = new DateTime(); |
| 1099 | 1099 | $offset = $datetime->format('P'); |
| 1100 | 1100 | } else $offset = '+00:00'; |
| 1101 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1101 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1102 | 1102 | if ($globalDBdriver == 'mysql') { |
| 1103 | 1103 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1104 | 1104 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | $date_array = array(); |
| 1120 | 1120 | $temp_array = array(); |
| 1121 | 1121 | |
| 1122 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1122 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1123 | 1123 | { |
| 1124 | 1124 | $temp_array['year_name'] = $row['year_name']; |
| 1125 | 1125 | $temp_array['month_name'] = $row['month_name']; |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | * @return Array the hour list |
| 1140 | 1140 | * |
| 1141 | 1141 | */ |
| 1142 | - public function countAllHours($orderby,$filters = array()) |
|
| 1142 | + public function countAllHours($orderby, $filters = array()) |
|
| 1143 | 1143 | { |
| 1144 | 1144 | global $globalTimezone, $globalDBdriver; |
| 1145 | 1145 | if ($globalTimezone != '') { |
@@ -1187,7 +1187,7 @@ discard block |
||
| 1187 | 1187 | $hour_array = array(); |
| 1188 | 1188 | $temp_array = array(); |
| 1189 | 1189 | |
| 1190 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1190 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $temp_array['hour_name'] = $row['hour_name']; |
| 1193 | 1193 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1209,8 +1209,8 @@ discard block |
||
| 1209 | 1209 | public function countAllHoursByDate($date, $filters = array()) |
| 1210 | 1210 | { |
| 1211 | 1211 | global $globalTimezone, $globalDBdriver; |
| 1212 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1213 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1212 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1213 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1214 | 1214 | if ($globalTimezone != '') { |
| 1215 | 1215 | date_default_timezone_set($globalTimezone); |
| 1216 | 1216 | $datetime = new DateTime($date); |
@@ -1218,12 +1218,12 @@ discard block |
||
| 1218 | 1218 | } else $offset = '+00:00'; |
| 1219 | 1219 | |
| 1220 | 1220 | if ($globalDBdriver == 'mysql') { |
| 1221 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1221 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1222 | 1222 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date |
| 1223 | 1223 | GROUP BY hour_name |
| 1224 | 1224 | ORDER BY hour_name ASC"; |
| 1225 | 1225 | } else { |
| 1226 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1226 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1227 | 1227 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1228 | 1228 | GROUP BY hour_name |
| 1229 | 1229 | ORDER BY hour_name ASC"; |
@@ -1235,7 +1235,7 @@ discard block |
||
| 1235 | 1235 | $hour_array = array(); |
| 1236 | 1236 | $temp_array = array(); |
| 1237 | 1237 | |
| 1238 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1238 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1239 | 1239 | { |
| 1240 | 1240 | $temp_array['hour_name'] = $row['hour_name']; |
| 1241 | 1241 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1257,8 +1257,8 @@ discard block |
||
| 1257 | 1257 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1258 | 1258 | { |
| 1259 | 1259 | global $globalTimezone, $globalDBdriver; |
| 1260 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1261 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1260 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1261 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1262 | 1262 | if ($globalTimezone != '') { |
| 1263 | 1263 | date_default_timezone_set($globalTimezone); |
| 1264 | 1264 | $datetime = new DateTime(); |
@@ -1266,12 +1266,12 @@ discard block |
||
| 1266 | 1266 | } else $offset = '+00:00'; |
| 1267 | 1267 | |
| 1268 | 1268 | if ($globalDBdriver == 'mysql') { |
| 1269 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1269 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1270 | 1270 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1271 | 1271 | GROUP BY hour_name |
| 1272 | 1272 | ORDER BY hour_name ASC"; |
| 1273 | 1273 | } else { |
| 1274 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1274 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1275 | 1275 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1276 | 1276 | GROUP BY hour_name |
| 1277 | 1277 | ORDER BY hour_name ASC"; |
@@ -1279,12 +1279,12 @@ discard block |
||
| 1279 | 1279 | |
| 1280 | 1280 | |
| 1281 | 1281 | $sth = $this->db->prepare($query); |
| 1282 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1282 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1283 | 1283 | |
| 1284 | 1284 | $hour_array = array(); |
| 1285 | 1285 | $temp_array = array(); |
| 1286 | 1286 | |
| 1287 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1287 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1288 | 1288 | { |
| 1289 | 1289 | $temp_array['hour_name'] = $row['hour_name']; |
| 1290 | 1290 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1303,33 +1303,33 @@ discard block |
||
| 1303 | 1303 | * @return Integer the number of trackers |
| 1304 | 1304 | * |
| 1305 | 1305 | */ |
| 1306 | - public function countOverallTracker($filters = array(),$year = '',$month = '') |
|
| 1306 | + public function countOverallTracker($filters = array(), $year = '', $month = '') |
|
| 1307 | 1307 | { |
| 1308 | 1308 | global $globalDBdriver; |
| 1309 | 1309 | //$queryi = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output"; |
| 1310 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1310 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1311 | 1311 | $query_values = array(); |
| 1312 | 1312 | $query = ''; |
| 1313 | 1313 | if ($year != '') { |
| 1314 | 1314 | if ($globalDBdriver == 'mysql') { |
| 1315 | 1315 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1316 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1316 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1317 | 1317 | } else { |
| 1318 | 1318 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1319 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1319 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1320 | 1320 | } |
| 1321 | 1321 | } |
| 1322 | 1322 | if ($month != '') { |
| 1323 | 1323 | if ($globalDBdriver == 'mysql') { |
| 1324 | 1324 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1325 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1325 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1326 | 1326 | } else { |
| 1327 | 1327 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1328 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1328 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1329 | 1329 | } |
| 1330 | 1330 | } |
| 1331 | 1331 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1332 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1332 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1333 | 1333 | |
| 1334 | 1334 | $sth = $this->db->prepare($queryi); |
| 1335 | 1335 | $sth->execute($query_values); |
@@ -1342,32 +1342,32 @@ discard block |
||
| 1342 | 1342 | * @return Integer the number of flights |
| 1343 | 1343 | * |
| 1344 | 1344 | */ |
| 1345 | - public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
|
| 1345 | + public function countOverallTrackerTypes($filters = array(), $year = '', $month = '') |
|
| 1346 | 1346 | { |
| 1347 | 1347 | global $globalDBdriver; |
| 1348 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1348 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1349 | 1349 | $query_values = array(); |
| 1350 | 1350 | $query = ''; |
| 1351 | 1351 | if ($year != '') { |
| 1352 | 1352 | if ($globalDBdriver == 'mysql') { |
| 1353 | 1353 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1354 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1354 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1355 | 1355 | } else { |
| 1356 | 1356 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1357 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1357 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1358 | 1358 | } |
| 1359 | 1359 | } |
| 1360 | 1360 | if ($month != '') { |
| 1361 | 1361 | if ($globalDBdriver == 'mysql') { |
| 1362 | 1362 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1363 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1363 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1364 | 1364 | } else { |
| 1365 | 1365 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1366 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1366 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1367 | 1367 | } |
| 1368 | 1368 | } |
| 1369 | 1369 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1370 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1370 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1371 | 1371 | |
| 1372 | 1372 | $sth = $this->db->prepare($queryi); |
| 1373 | 1373 | $sth->execute($query_values); |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | public function countAllHoursFromToday($filters = array()) |
| 1385 | 1385 | { |
| 1386 | 1386 | global $globalTimezone, $globalDBdriver; |
| 1387 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1387 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1388 | 1388 | if ($globalTimezone != '') { |
| 1389 | 1389 | date_default_timezone_set($globalTimezone); |
| 1390 | 1390 | $datetime = new DateTime(); |
@@ -1392,12 +1392,12 @@ discard block |
||
| 1392 | 1392 | } else $offset = '+00:00'; |
| 1393 | 1393 | |
| 1394 | 1394 | if ($globalDBdriver == 'mysql') { |
| 1395 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1395 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1396 | 1396 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE() |
| 1397 | 1397 | GROUP BY hour_name |
| 1398 | 1398 | ORDER BY hour_name ASC"; |
| 1399 | 1399 | } else { |
| 1400 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1400 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1401 | 1401 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1402 | 1402 | GROUP BY hour_name |
| 1403 | 1403 | ORDER BY hour_name ASC"; |
@@ -1409,7 +1409,7 @@ discard block |
||
| 1409 | 1409 | $hour_array = array(); |
| 1410 | 1410 | $temp_array = array(); |
| 1411 | 1411 | |
| 1412 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1412 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1413 | 1413 | { |
| 1414 | 1414 | $temp_array['hour_name'] = $row['hour_name']; |
| 1415 | 1415 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1428,9 +1428,9 @@ discard block |
||
| 1428 | 1428 | */ |
| 1429 | 1429 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1430 | 1430 | { |
| 1431 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 1431 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 1432 | 1432 | |
| 1433 | - $query = "SELECT tracker_output.tracker_id |
|
| 1433 | + $query = "SELECT tracker_output.tracker_id |
|
| 1434 | 1434 | FROM tracker_output |
| 1435 | 1435 | WHERE tracker_output.famtrackid = '".$famtrackid."'"; |
| 1436 | 1436 | |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | $sth = $this->db->prepare($query); |
| 1439 | 1439 | $sth->execute(); |
| 1440 | 1440 | |
| 1441 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1441 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1442 | 1442 | { |
| 1443 | 1443 | return $row['tracker_id']; |
| 1444 | 1444 | } |
@@ -1463,23 +1463,23 @@ discard block |
||
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | $current_date = date("Y-m-d H:i:s"); |
| 1466 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1466 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1467 | 1467 | |
| 1468 | 1468 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1469 | 1469 | |
| 1470 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1470 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1471 | 1471 | $years = $time_array['years']; |
| 1472 | 1472 | |
| 1473 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1473 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1474 | 1474 | $months = $time_array['months']; |
| 1475 | 1475 | |
| 1476 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1476 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1477 | 1477 | $days = $time_array['days']; |
| 1478 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1478 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1479 | 1479 | $hours = $time_array['hours']; |
| 1480 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1480 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1481 | 1481 | $minutes = $time_array['minutes']; |
| 1482 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1482 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1483 | 1483 | |
| 1484 | 1484 | return $time_array; |
| 1485 | 1485 | } |
@@ -1502,63 +1502,63 @@ discard block |
||
| 1502 | 1502 | $temp_array['direction_degree'] = $direction; |
| 1503 | 1503 | $temp_array['direction_shortname'] = "N"; |
| 1504 | 1504 | $temp_array['direction_fullname'] = "North"; |
| 1505 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1505 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1506 | 1506 | $temp_array['direction_degree'] = $direction; |
| 1507 | 1507 | $temp_array['direction_shortname'] = "NNE"; |
| 1508 | 1508 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1509 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1509 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1510 | 1510 | $temp_array['direction_degree'] = $direction; |
| 1511 | 1511 | $temp_array['direction_shortname'] = "NE"; |
| 1512 | 1512 | $temp_array['direction_fullname'] = "Northeast"; |
| 1513 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1513 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1514 | 1514 | $temp_array['direction_degree'] = $direction; |
| 1515 | 1515 | $temp_array['direction_shortname'] = "ENE"; |
| 1516 | 1516 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1517 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1517 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1518 | 1518 | $temp_array['direction_degree'] = $direction; |
| 1519 | 1519 | $temp_array['direction_shortname'] = "E"; |
| 1520 | 1520 | $temp_array['direction_fullname'] = "East"; |
| 1521 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1521 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1522 | 1522 | $temp_array['direction_degree'] = $direction; |
| 1523 | 1523 | $temp_array['direction_shortname'] = "ESE"; |
| 1524 | 1524 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1525 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1525 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1526 | 1526 | $temp_array['direction_degree'] = $direction; |
| 1527 | 1527 | $temp_array['direction_shortname'] = "SE"; |
| 1528 | 1528 | $temp_array['direction_fullname'] = "Southeast"; |
| 1529 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1529 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1530 | 1530 | $temp_array['direction_degree'] = $direction; |
| 1531 | 1531 | $temp_array['direction_shortname'] = "SSE"; |
| 1532 | 1532 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1533 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1533 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1534 | 1534 | $temp_array['direction_degree'] = $direction; |
| 1535 | 1535 | $temp_array['direction_shortname'] = "S"; |
| 1536 | 1536 | $temp_array['direction_fullname'] = "South"; |
| 1537 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1537 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1538 | 1538 | $temp_array['direction_degree'] = $direction; |
| 1539 | 1539 | $temp_array['direction_shortname'] = "SSW"; |
| 1540 | 1540 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1541 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1541 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1542 | 1542 | $temp_array['direction_degree'] = $direction; |
| 1543 | 1543 | $temp_array['direction_shortname'] = "SW"; |
| 1544 | 1544 | $temp_array['direction_fullname'] = "Southwest"; |
| 1545 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1545 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1546 | 1546 | $temp_array['direction_degree'] = $direction; |
| 1547 | 1547 | $temp_array['direction_shortname'] = "WSW"; |
| 1548 | 1548 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1549 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1549 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1550 | 1550 | $temp_array['direction_degree'] = $direction; |
| 1551 | 1551 | $temp_array['direction_shortname'] = "W"; |
| 1552 | 1552 | $temp_array['direction_fullname'] = "West"; |
| 1553 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1553 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1554 | 1554 | $temp_array['direction_degree'] = $direction; |
| 1555 | 1555 | $temp_array['direction_shortname'] = "WNW"; |
| 1556 | 1556 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1557 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1557 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1558 | 1558 | $temp_array['direction_degree'] = $direction; |
| 1559 | 1559 | $temp_array['direction_shortname'] = "NW"; |
| 1560 | 1560 | $temp_array['direction_fullname'] = "Northwest"; |
| 1561 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1561 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1562 | 1562 | $temp_array['direction_degree'] = $direction; |
| 1563 | 1563 | $temp_array['direction_shortname'] = "NNW"; |
| 1564 | 1564 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1575,11 +1575,11 @@ discard block |
||
| 1575 | 1575 | * @param Float $longitude longitute of the flight |
| 1576 | 1576 | * @return String the countrie |
| 1577 | 1577 | */ |
| 1578 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1578 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1579 | 1579 | { |
| 1580 | 1580 | global $globalDBdriver, $globalDebug; |
| 1581 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1582 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1581 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1582 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1583 | 1583 | |
| 1584 | 1584 | $Connection = new Connection($this->db); |
| 1585 | 1585 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | public function getCountryFromISO2($iso2) |
| 1620 | 1620 | { |
| 1621 | 1621 | global $globalDBdriver, $globalDebug; |
| 1622 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1622 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1623 | 1623 | |
| 1624 | 1624 | $Connection = new Connection($this->db); |
| 1625 | 1625 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1648,11 +1648,11 @@ discard block |
||
| 1648 | 1648 | * @return Array the vessel type list |
| 1649 | 1649 | * |
| 1650 | 1650 | */ |
| 1651 | - public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 1651 | + public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1652 | 1652 | { |
| 1653 | 1653 | global $globalDBdriver; |
| 1654 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1655 | - $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1654 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1655 | + $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1656 | 1656 | FROM tracker_output ".$filter_query." tracker_output.type <> ''"; |
| 1657 | 1657 | if ($olderthanmonths > 0) { |
| 1658 | 1658 | if ($globalDBdriver == 'mysql') { |
@@ -1672,28 +1672,28 @@ discard block |
||
| 1672 | 1672 | if ($year != '') { |
| 1673 | 1673 | if ($globalDBdriver == 'mysql') { |
| 1674 | 1674 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1675 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1675 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1676 | 1676 | } else { |
| 1677 | 1677 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1678 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1678 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1679 | 1679 | } |
| 1680 | 1680 | } |
| 1681 | 1681 | if ($month != '') { |
| 1682 | 1682 | if ($globalDBdriver == 'mysql') { |
| 1683 | 1683 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1684 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1684 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1685 | 1685 | } else { |
| 1686 | 1686 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1687 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1687 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1688 | 1688 | } |
| 1689 | 1689 | } |
| 1690 | 1690 | if ($day != '') { |
| 1691 | 1691 | if ($globalDBdriver == 'mysql') { |
| 1692 | 1692 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 1693 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1693 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1694 | 1694 | } else { |
| 1695 | 1695 | $query .= " AND EXTRACT(DAY FROM tracker_output.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 | } |
| 1699 | 1699 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
@@ -1702,7 +1702,7 @@ discard block |
||
| 1702 | 1702 | $sth->execute($query_values); |
| 1703 | 1703 | $tracker_array = array(); |
| 1704 | 1704 | $temp_array = array(); |
| 1705 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1705 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1706 | 1706 | { |
| 1707 | 1707 | $temp_array['tracker_type'] = $row['tracker_type']; |
| 1708 | 1708 | $temp_array['tracker_type_count'] = $row['tracker_type_count']; |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | |
| 1738 | 1738 | $bitly_data = json_decode($bitly_data); |
| 1739 | 1739 | $bitly_url = ''; |
| 1740 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1740 | + if ($bitly_data->status_txt = "OK") { |
|
| 1741 | 1741 | $bitly_url = $bitly_data->data->url; |
| 1742 | 1742 | } |
| 1743 | 1743 | |
@@ -1747,7 +1747,7 @@ discard block |
||
| 1747 | 1747 | |
| 1748 | 1748 | public function getOrderBy() |
| 1749 | 1749 | { |
| 1750 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1750 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1751 | 1751 | |
| 1752 | 1752 | return $orderby; |
| 1753 | 1753 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | /** |
| 15 | 15 | * Get SQL query part for filter used |
| 16 | 16 | * @param Array $filter the filter |
| 17 | - * @return Array the SQL part |
|
| 17 | + * @return string the SQL part |
|
| 18 | 18 | */ |
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -759,10 +759,6 @@ discard block |
||
| 759 | 759 | * |
| 760 | 760 | * @param String $famtrackid the ID from flightaware |
| 761 | 761 | * @param String $ident the flight ident |
| 762 | - * @param String $aircraft_icao the aircraft type |
|
| 763 | - * @param String $departure_airport_icao the departure airport |
|
| 764 | - * @param String $arrival_airport_icao the arrival airport |
|
| 765 | - * @return String success or false |
|
| 766 | 762 | * |
| 767 | 763 | */ |
| 768 | 764 | public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Get SQL query part for filter used |
|
| 16 | - * @param Array $filter the filter |
|
| 17 | - * @return Array the SQL part |
|
| 18 | - */ |
|
| 15 | + * Get SQL query part for filter used |
|
| 16 | + * @param Array $filter the filter |
|
| 17 | + * @return Array the SQL part |
|
| 18 | + */ |
|
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | - * Gets all the spotter information based on the latest data entry |
|
| 90 | - * |
|
| 91 | - * @return Array the spotter information |
|
| 92 | - * |
|
| 93 | - */ |
|
| 89 | + * Gets all the spotter information based on the latest data entry |
|
| 90 | + * |
|
| 91 | + * @return Array the spotter information |
|
| 92 | + * |
|
| 93 | + */ |
|
| 94 | 94 | public function getLiveTrackerData($limit = '', $sort = '', $filter = array()) |
| 95 | 95 | { |
| 96 | 96 | global $globalDBdriver, $globalLiveInterval; |
@@ -132,11 +132,11 @@ discard block |
||
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | /** |
| 135 | - * Gets Minimal Live Spotter data |
|
| 136 | - * |
|
| 137 | - * @return Array the spotter information |
|
| 138 | - * |
|
| 139 | - */ |
|
| 135 | + * Gets Minimal Live Spotter data |
|
| 136 | + * |
|
| 137 | + * @return Array the spotter information |
|
| 138 | + * |
|
| 139 | + */ |
|
| 140 | 140 | public function getMinLiveTrackerData($filter = array()) |
| 141 | 141 | { |
| 142 | 142 | global $globalDBdriver, $globalLiveInterval; |
@@ -170,11 +170,11 @@ discard block |
||
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | /** |
| 173 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 174 | - * |
|
| 175 | - * @return Array the spotter information |
|
| 176 | - * |
|
| 177 | - */ |
|
| 173 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 174 | + * |
|
| 175 | + * @return Array the spotter information |
|
| 176 | + * |
|
| 177 | + */ |
|
| 178 | 178 | public function getMinLastLiveTrackerData($filter = array()) |
| 179 | 179 | { |
| 180 | 180 | global $globalDBdriver, $globalLiveInterval; |
@@ -187,13 +187,13 @@ discard block |
||
| 187 | 187 | $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 188 | 188 | FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' |
| 189 | 189 | ORDER BY tracker_live.famtrackid, tracker_live.date"; |
| 190 | - } else { |
|
| 190 | + } else { |
|
| 191 | 191 | $query = "SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 192 | 192 | FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' |
| 193 | 193 | ORDER BY tracker_live.famtrackid, tracker_live.date"; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - try { |
|
| 196 | + try { |
|
| 197 | 197 | $sth = $this->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | 199 | } catch(PDOException $e) { |
@@ -205,11 +205,11 @@ discard block |
||
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | /** |
| 208 | - * Gets number of latest data entry |
|
| 209 | - * |
|
| 210 | - * @return String number of entry |
|
| 211 | - * |
|
| 212 | - */ |
|
| 208 | + * Gets number of latest data entry |
|
| 209 | + * |
|
| 210 | + * @return String number of entry |
|
| 211 | + * |
|
| 212 | + */ |
|
| 213 | 213 | public function getLiveTrackerCount($filter = array()) |
| 214 | 214 | { |
| 215 | 215 | global $globalDBdriver, $globalLiveInterval; |
@@ -234,11 +234,11 @@ discard block |
||
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | /** |
| 237 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 238 | - * |
|
| 239 | - * @return Array the spotter information |
|
| 240 | - * |
|
| 241 | - */ |
|
| 237 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 238 | + * |
|
| 239 | + * @return Array the spotter information |
|
| 240 | + * |
|
| 241 | + */ |
|
| 242 | 242 | public function getLiveTrackerDatabyCoord($coord, $filter = array()) |
| 243 | 243 | { |
| 244 | 244 | global $globalDBdriver, $globalLiveInterval; |
@@ -262,11 +262,11 @@ discard block |
||
| 262 | 262 | } |
| 263 | 263 | |
| 264 | 264 | /** |
| 265 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 266 | - * |
|
| 267 | - * @return Array the spotter information |
|
| 268 | - * |
|
| 269 | - */ |
|
| 265 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 266 | + * |
|
| 267 | + * @return Array the spotter information |
|
| 268 | + * |
|
| 269 | + */ |
|
| 270 | 270 | public function getMinLiveTrackerDatabyCoord($coord, $filter = array()) |
| 271 | 271 | { |
| 272 | 272 | global $globalDBdriver, $globalLiveInterval; |
@@ -293,11 +293,11 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | /** |
| 296 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 297 | - * |
|
| 298 | - * @return Array the spotter information |
|
| 299 | - * |
|
| 300 | - */ |
|
| 296 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 297 | + * |
|
| 298 | + * @return Array the spotter information |
|
| 299 | + * |
|
| 300 | + */ |
|
| 301 | 301 | public function getLatestTrackerForLayar($lat, $lng, $radius, $interval) |
| 302 | 302 | { |
| 303 | 303 | $Tracker = new Tracker($this->db); |
@@ -310,142 +310,142 @@ discard block |
||
| 310 | 310 | if ($lng != '') |
| 311 | 311 | { |
| 312 | 312 | if (!is_numeric($lng)) |
| 313 | - { |
|
| 314 | - return false; |
|
| 315 | - } |
|
| 316 | - } |
|
| 317 | - |
|
| 318 | - if ($radius != '') |
|
| 319 | - { |
|
| 320 | - if (!is_numeric($radius)) |
|
| 321 | - { |
|
| 322 | - return false; |
|
| 323 | - } |
|
| 324 | - } |
|
| 313 | + { |
|
| 314 | + return false; |
|
| 315 | + } |
|
| 316 | + } |
|
| 317 | + |
|
| 318 | + if ($radius != '') |
|
| 319 | + { |
|
| 320 | + if (!is_numeric($radius)) |
|
| 321 | + { |
|
| 322 | + return false; |
|
| 323 | + } |
|
| 324 | + } |
|
| 325 | 325 | $additional_query = ''; |
| 326 | 326 | if ($interval != '') |
| 327 | - { |
|
| 328 | - if (!is_string($interval)) |
|
| 329 | - { |
|
| 330 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 331 | - return false; |
|
| 332 | - } else { |
|
| 333 | - if ($interval == '1m') |
|
| 334 | - { |
|
| 335 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 336 | - } else if ($interval == '15m'){ |
|
| 337 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date '; |
|
| 338 | - } |
|
| 339 | - } |
|
| 340 | - } else { |
|
| 341 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 342 | - } |
|
| 343 | - |
|
| 344 | - $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live |
|
| 327 | + { |
|
| 328 | + if (!is_string($interval)) |
|
| 329 | + { |
|
| 330 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 331 | + return false; |
|
| 332 | + } else { |
|
| 333 | + if ($interval == '1m') |
|
| 334 | + { |
|
| 335 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 336 | + } else if ($interval == '15m'){ |
|
| 337 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date '; |
|
| 338 | + } |
|
| 339 | + } |
|
| 340 | + } else { |
|
| 341 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
|
| 342 | + } |
|
| 343 | + |
|
| 344 | + $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live |
|
| 345 | 345 | WHERE tracker_live.latitude <> '' |
| 346 | 346 | AND tracker_live.longitude <> '' |
| 347 | 347 | ".$additional_query." |
| 348 | 348 | HAVING distance < :radius |
| 349 | 349 | ORDER BY distance"; |
| 350 | 350 | |
| 351 | - $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 351 | + $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 352 | 352 | |
| 353 | - return $spotter_array; |
|
| 354 | - } |
|
| 353 | + return $spotter_array; |
|
| 354 | + } |
|
| 355 | 355 | |
| 356 | 356 | |
| 357 | - /** |
|
| 358 | - * Gets all the spotter information based on a particular callsign |
|
| 359 | - * |
|
| 360 | - * @return Array the spotter information |
|
| 361 | - * |
|
| 362 | - */ |
|
| 357 | + /** |
|
| 358 | + * Gets all the spotter information based on a particular callsign |
|
| 359 | + * |
|
| 360 | + * @return Array the spotter information |
|
| 361 | + * |
|
| 362 | + */ |
|
| 363 | 363 | public function getLastLiveTrackerDataByIdent($ident) |
| 364 | 364 | { |
| 365 | 365 | $Tracker = new Tracker($this->db); |
| 366 | 366 | date_default_timezone_set('UTC'); |
| 367 | 367 | |
| 368 | 368 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 369 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 369 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 370 | 370 | |
| 371 | 371 | $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 372 | 372 | |
| 373 | 373 | return $spotter_array; |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - /** |
|
| 377 | - * Gets all the spotter information based on a particular callsign |
|
| 378 | - * |
|
| 379 | - * @return Array the spotter information |
|
| 380 | - * |
|
| 381 | - */ |
|
| 376 | + /** |
|
| 377 | + * Gets all the spotter information based on a particular callsign |
|
| 378 | + * |
|
| 379 | + * @return Array the spotter information |
|
| 380 | + * |
|
| 381 | + */ |
|
| 382 | 382 | public function getDateLiveTrackerDataByIdent($ident,$date) |
| 383 | 383 | { |
| 384 | 384 | $Tracker = new Tracker($this->db); |
| 385 | 385 | date_default_timezone_set('UTC'); |
| 386 | 386 | |
| 387 | 387 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 388 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 388 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 389 | 389 | |
| 390 | - $date = date('c',$date); |
|
| 390 | + $date = date('c',$date); |
|
| 391 | 391 | $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 392 | 392 | |
| 393 | 393 | return $spotter_array; |
| 394 | 394 | } |
| 395 | 395 | |
| 396 | - /** |
|
| 397 | - * Gets last spotter information based on a particular callsign |
|
| 398 | - * |
|
| 399 | - * @return Array the spotter information |
|
| 400 | - * |
|
| 401 | - */ |
|
| 396 | + /** |
|
| 397 | + * Gets last spotter information based on a particular callsign |
|
| 398 | + * |
|
| 399 | + * @return Array the spotter information |
|
| 400 | + * |
|
| 401 | + */ |
|
| 402 | 402 | public function getLastLiveTrackerDataById($id) |
| 403 | 403 | { |
| 404 | 404 | $Tracker = new Tracker($this->db); |
| 405 | 405 | date_default_timezone_set('UTC'); |
| 406 | 406 | |
| 407 | 407 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 408 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 408 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 409 | 409 | |
| 410 | 410 | $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id),'',true); |
| 411 | 411 | |
| 412 | 412 | return $spotter_array; |
| 413 | 413 | } |
| 414 | 414 | |
| 415 | - /** |
|
| 416 | - * Gets last spotter information based on a particular callsign |
|
| 417 | - * |
|
| 418 | - * @return Array the spotter information |
|
| 419 | - * |
|
| 420 | - */ |
|
| 415 | + /** |
|
| 416 | + * Gets last spotter information based on a particular callsign |
|
| 417 | + * |
|
| 418 | + * @return Array the spotter information |
|
| 419 | + * |
|
| 420 | + */ |
|
| 421 | 421 | public function getDateLiveTrackerDataById($id,$date) |
| 422 | 422 | { |
| 423 | 423 | $Tracker = new Tracker($this->db); |
| 424 | 424 | date_default_timezone_set('UTC'); |
| 425 | 425 | |
| 426 | 426 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 427 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 428 | - $date = date('c',$date); |
|
| 427 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 428 | + $date = date('c',$date); |
|
| 429 | 429 | $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
| 430 | 430 | |
| 431 | 431 | return $spotter_array; |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | - /** |
|
| 435 | - * Gets altitude information based on a particular callsign |
|
| 436 | - * |
|
| 437 | - * @return Array the spotter information |
|
| 438 | - * |
|
| 439 | - */ |
|
| 434 | + /** |
|
| 435 | + * Gets altitude information based on a particular callsign |
|
| 436 | + * |
|
| 437 | + * @return Array the spotter information |
|
| 438 | + * |
|
| 439 | + */ |
|
| 440 | 440 | public function getAltitudeLiveTrackerDataByIdent($ident) |
| 441 | 441 | { |
| 442 | 442 | |
| 443 | 443 | date_default_timezone_set('UTC'); |
| 444 | 444 | |
| 445 | 445 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 446 | - $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident'; |
|
| 446 | + $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident'; |
|
| 447 | 447 | |
| 448 | - try { |
|
| 448 | + try { |
|
| 449 | 449 | |
| 450 | 450 | $sth = $this->db->prepare($query); |
| 451 | 451 | $sth->execute(array(':ident' => $ident)); |
@@ -458,12 +458,12 @@ discard block |
||
| 458 | 458 | return $spotter_array; |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | - /** |
|
| 462 | - * Gets all the spotter information based on a particular id |
|
| 463 | - * |
|
| 464 | - * @return Array the spotter information |
|
| 465 | - * |
|
| 466 | - */ |
|
| 461 | + /** |
|
| 462 | + * Gets all the spotter information based on a particular id |
|
| 463 | + * |
|
| 464 | + * @return Array the spotter information |
|
| 465 | + * |
|
| 466 | + */ |
|
| 467 | 467 | public function getAllLiveTrackerDataById($id,$liveinterval = false) |
| 468 | 468 | { |
| 469 | 469 | global $globalDBdriver, $globalLiveInterval; |
@@ -491,18 +491,18 @@ discard block |
||
| 491 | 491 | return $spotter_array; |
| 492 | 492 | } |
| 493 | 493 | |
| 494 | - /** |
|
| 495 | - * Gets all the spotter information based on a particular ident |
|
| 496 | - * |
|
| 497 | - * @return Array the spotter information |
|
| 498 | - * |
|
| 499 | - */ |
|
| 494 | + /** |
|
| 495 | + * Gets all the spotter information based on a particular ident |
|
| 496 | + * |
|
| 497 | + * @return Array the spotter information |
|
| 498 | + * |
|
| 499 | + */ |
|
| 500 | 500 | public function getAllLiveTrackerDataByIdent($ident) |
| 501 | 501 | { |
| 502 | 502 | date_default_timezone_set('UTC'); |
| 503 | 503 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 504 | 504 | $query = self::$global_query.' WHERE tracker_live.ident = :ident'; |
| 505 | - try { |
|
| 505 | + try { |
|
| 506 | 506 | |
| 507 | 507 | $sth = $this->db->prepare($query); |
| 508 | 508 | $sth->execute(array(':ident' => $ident)); |
@@ -516,23 +516,23 @@ discard block |
||
| 516 | 516 | |
| 517 | 517 | |
| 518 | 518 | /** |
| 519 | - * Deletes all info in the table |
|
| 520 | - * |
|
| 521 | - * @return String success or false |
|
| 522 | - * |
|
| 523 | - */ |
|
| 519 | + * Deletes all info in the table |
|
| 520 | + * |
|
| 521 | + * @return String success or false |
|
| 522 | + * |
|
| 523 | + */ |
|
| 524 | 524 | public function deleteLiveTrackerData() |
| 525 | 525 | { |
| 526 | 526 | global $globalDBdriver; |
| 527 | 527 | if ($globalDBdriver == 'mysql') { |
| 528 | 528 | //$query = "DELETE FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= tracker_live.date"; |
| 529 | 529 | $query = 'DELETE FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= tracker_live.date'; |
| 530 | - //$query = "DELETE FROM tracker_live WHERE tracker_live.id IN (SELECT tracker_live.id FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= tracker_live.date)"; |
|
| 530 | + //$query = "DELETE FROM tracker_live WHERE tracker_live.id IN (SELECT tracker_live.id FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= tracker_live.date)"; |
|
| 531 | 531 | } else { |
| 532 | 532 | $query = "DELETE FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= tracker_live.date"; |
| 533 | 533 | } |
| 534 | 534 | |
| 535 | - try { |
|
| 535 | + try { |
|
| 536 | 536 | |
| 537 | 537 | $sth = $this->db->prepare($query); |
| 538 | 538 | $sth->execute(); |
@@ -544,18 +544,18 @@ discard block |
||
| 544 | 544 | } |
| 545 | 545 | |
| 546 | 546 | /** |
| 547 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 548 | - * |
|
| 549 | - * @return String success or false |
|
| 550 | - * |
|
| 551 | - */ |
|
| 547 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 548 | + * |
|
| 549 | + * @return String success or false |
|
| 550 | + * |
|
| 551 | + */ |
|
| 552 | 552 | public function deleteLiveTrackerDataNotUpdated() |
| 553 | 553 | { |
| 554 | 554 | global $globalDBdriver, $globalDebug; |
| 555 | 555 | if ($globalDBdriver == 'mysql') { |
| 556 | 556 | //$query = 'SELECT famtrackid FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= tracker_live.date AND tracker_live.famtrackid NOT IN (SELECT famtrackid FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < tracker_live.date) LIMIT 800 OFFSET 0'; |
| 557 | - $query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
| 558 | - try { |
|
| 557 | + $query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
| 558 | + try { |
|
| 559 | 559 | |
| 560 | 560 | $sth = $this->db->prepare($query); |
| 561 | 561 | $sth->execute(); |
@@ -563,8 +563,8 @@ discard block |
||
| 563 | 563 | return "error"; |
| 564 | 564 | } |
| 565 | 565 | $query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN ('; |
| 566 | - $i = 0; |
|
| 567 | - $j =0; |
|
| 566 | + $i = 0; |
|
| 567 | + $j =0; |
|
| 568 | 568 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 569 | 569 | foreach($all as $row) |
| 570 | 570 | { |
@@ -572,20 +572,20 @@ discard block |
||
| 572 | 572 | $j++; |
| 573 | 573 | if ($j == 30) { |
| 574 | 574 | if ($globalDebug) echo "."; |
| 575 | - try { |
|
| 575 | + try { |
|
| 576 | 576 | |
| 577 | 577 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 578 | 578 | $sth->execute(); |
| 579 | 579 | } catch(PDOException $e) { |
| 580 | 580 | return "error"; |
| 581 | 581 | } |
| 582 | - $query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN ('; |
|
| 583 | - $j = 0; |
|
| 582 | + $query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN ('; |
|
| 583 | + $j = 0; |
|
| 584 | 584 | } |
| 585 | 585 | $query_delete .= "'".$row['famtrackid']."',"; |
| 586 | 586 | } |
| 587 | 587 | if ($i > 0) { |
| 588 | - try { |
|
| 588 | + try { |
|
| 589 | 589 | |
| 590 | 590 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 591 | 591 | $sth->execute(); |
@@ -596,9 +596,9 @@ discard block |
||
| 596 | 596 | return "success"; |
| 597 | 597 | } elseif ($globalDBdriver == 'pgsql') { |
| 598 | 598 | //$query = "SELECT famtrackid FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= tracker_live.date AND tracker_live.famtrackid NOT IN (SELECT famtrackid FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < tracker_live.date) LIMIT 800 OFFSET 0"; |
| 599 | - //$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 600 | - $query = "DELETE FROM tracker_live WHERE famtrackid IN (SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
| 601 | - try { |
|
| 599 | + //$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 600 | + $query = "DELETE FROM tracker_live WHERE famtrackid IN (SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
| 601 | + try { |
|
| 602 | 602 | |
| 603 | 603 | $sth = $this->db->prepare($query); |
| 604 | 604 | $sth->execute(); |
@@ -642,17 +642,17 @@ discard block |
||
| 642 | 642 | } |
| 643 | 643 | |
| 644 | 644 | /** |
| 645 | - * Deletes all info in the table for an ident |
|
| 646 | - * |
|
| 647 | - * @return String success or false |
|
| 648 | - * |
|
| 649 | - */ |
|
| 645 | + * Deletes all info in the table for an ident |
|
| 646 | + * |
|
| 647 | + * @return String success or false |
|
| 648 | + * |
|
| 649 | + */ |
|
| 650 | 650 | public function deleteLiveTrackerDataByIdent($ident) |
| 651 | 651 | { |
| 652 | 652 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 653 | 653 | $query = 'DELETE FROM tracker_live WHERE ident = :ident'; |
| 654 | 654 | |
| 655 | - try { |
|
| 655 | + try { |
|
| 656 | 656 | |
| 657 | 657 | $sth = $this->db->prepare($query); |
| 658 | 658 | $sth->execute(array(':ident' => $ident)); |
@@ -664,17 +664,17 @@ discard block |
||
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | /** |
| 667 | - * Deletes all info in the table for an id |
|
| 668 | - * |
|
| 669 | - * @return String success or false |
|
| 670 | - * |
|
| 671 | - */ |
|
| 667 | + * Deletes all info in the table for an id |
|
| 668 | + * |
|
| 669 | + * @return String success or false |
|
| 670 | + * |
|
| 671 | + */ |
|
| 672 | 672 | public function deleteLiveTrackerDataById($id) |
| 673 | 673 | { |
| 674 | 674 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 675 | 675 | $query = 'DELETE FROM tracker_live WHERE famtrackid = :id'; |
| 676 | 676 | |
| 677 | - try { |
|
| 677 | + try { |
|
| 678 | 678 | |
| 679 | 679 | $sth = $this->db->prepare($query); |
| 680 | 680 | $sth->execute(array(':id' => $id)); |
@@ -687,11 +687,11 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | |
| 689 | 689 | /** |
| 690 | - * Gets the aircraft ident within the last hour |
|
| 691 | - * |
|
| 692 | - * @return String the ident |
|
| 693 | - * |
|
| 694 | - */ |
|
| 690 | + * Gets the aircraft ident within the last hour |
|
| 691 | + * |
|
| 692 | + * @return String the ident |
|
| 693 | + * |
|
| 694 | + */ |
|
| 695 | 695 | public function getIdentFromLastHour($ident) |
| 696 | 696 | { |
| 697 | 697 | global $globalDBdriver, $globalTimezone; |
@@ -717,14 +717,14 @@ discard block |
||
| 717 | 717 | $ident_result = $row['ident']; |
| 718 | 718 | } |
| 719 | 719 | return $ident_result; |
| 720 | - } |
|
| 720 | + } |
|
| 721 | 721 | |
| 722 | 722 | /** |
| 723 | - * Check recent aircraft |
|
| 724 | - * |
|
| 725 | - * @return String the ident |
|
| 726 | - * |
|
| 727 | - */ |
|
| 723 | + * Check recent aircraft |
|
| 724 | + * |
|
| 725 | + * @return String the ident |
|
| 726 | + * |
|
| 727 | + */ |
|
| 728 | 728 | public function checkIdentRecent($ident) |
| 729 | 729 | { |
| 730 | 730 | global $globalDBdriver, $globalTimezone; |
@@ -750,14 +750,14 @@ discard block |
||
| 750 | 750 | $ident_result = $row['famtrackid']; |
| 751 | 751 | } |
| 752 | 752 | return $ident_result; |
| 753 | - } |
|
| 753 | + } |
|
| 754 | 754 | |
| 755 | 755 | /** |
| 756 | - * Check recent aircraft by id |
|
| 757 | - * |
|
| 758 | - * @return String the ident |
|
| 759 | - * |
|
| 760 | - */ |
|
| 756 | + * Check recent aircraft by id |
|
| 757 | + * |
|
| 758 | + * @return String the ident |
|
| 759 | + * |
|
| 760 | + */ |
|
| 761 | 761 | public function checkIdRecent($id) |
| 762 | 762 | { |
| 763 | 763 | global $globalDBdriver, $globalTimezone; |
@@ -783,19 +783,19 @@ discard block |
||
| 783 | 783 | $ident_result = $row['famtrackid']; |
| 784 | 784 | } |
| 785 | 785 | return $ident_result; |
| 786 | - } |
|
| 786 | + } |
|
| 787 | 787 | |
| 788 | 788 | /** |
| 789 | - * Adds a new spotter data |
|
| 790 | - * |
|
| 791 | - * @param String $famtrackid the ID from flightaware |
|
| 792 | - * @param String $ident the flight ident |
|
| 793 | - * @param String $aircraft_icao the aircraft type |
|
| 794 | - * @param String $departure_airport_icao the departure airport |
|
| 795 | - * @param String $arrival_airport_icao the arrival airport |
|
| 796 | - * @return String success or false |
|
| 797 | - * |
|
| 798 | - */ |
|
| 789 | + * Adds a new spotter data |
|
| 790 | + * |
|
| 791 | + * @param String $famtrackid the ID from flightaware |
|
| 792 | + * @param String $ident the flight ident |
|
| 793 | + * @param String $aircraft_icao the aircraft type |
|
| 794 | + * @param String $departure_airport_icao the departure airport |
|
| 795 | + * @param String $arrival_airport_icao the arrival airport |
|
| 796 | + * @return String success or false |
|
| 797 | + * |
|
| 798 | + */ |
|
| 799 | 799 | public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
| 800 | 800 | { |
| 801 | 801 | global $globalURL, $globalArchive, $globalDebug; |
@@ -868,8 +868,8 @@ discard block |
||
| 868 | 868 | $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
| 869 | 869 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
| 870 | 870 | |
| 871 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 872 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 871 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 872 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 873 | 873 | |
| 874 | 874 | $query = ''; |
| 875 | 875 | if ($globalArchive) { |
@@ -884,16 +884,16 @@ discard block |
||
| 884 | 884 | |
| 885 | 885 | $sth = $this->db->prepare($query); |
| 886 | 886 | $sth->execute($query_values); |
| 887 | - } catch(PDOException $e) { |
|
| 888 | - return "error : ".$e->getMessage(); |
|
| 889 | - } |
|
| 890 | - echo 'putinarchive : '.$putinarchive."\n"; |
|
| 891 | - echo 'noarchive : '.$noarchive."\n"; |
|
| 887 | + } catch(PDOException $e) { |
|
| 888 | + return "error : ".$e->getMessage(); |
|
| 889 | + } |
|
| 890 | + echo 'putinarchive : '.$putinarchive."\n"; |
|
| 891 | + echo 'noarchive : '.$noarchive."\n"; |
|
| 892 | 892 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 893 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 894 | - $TrackerArchive = new TrackerArchive($this->db); |
|
| 895 | - $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country); |
|
| 896 | - if ($globalDebug) echo $result.')'; |
|
| 893 | + if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 894 | + $TrackerArchive = new TrackerArchive($this->db); |
|
| 895 | + $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country); |
|
| 896 | + if ($globalDebug) echo $result.')'; |
|
| 897 | 897 | } |
| 898 | 898 | |
| 899 | 899 | return "success"; |
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 37 | 37 | if (isset($flt['source'])) { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid"; |
|
| 39 | 39 | } else { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid"; |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 45 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 45 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 48 | 48 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | $filter_query_date .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'"; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid"; |
|
| 75 | 75 | } |
| 76 | 76 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 77 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 77 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 78 | 78 | } |
| 79 | 79 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 80 | 80 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 81 | 81 | if ($filter_query_where != '') { |
| 82 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 82 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 83 | 83 | } |
| 84 | 84 | $filter_query = $filter_query_join.$filter_query_where; |
| 85 | 85 | return $filter_query; |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | if ($limit != '') |
| 103 | 103 | { |
| 104 | 104 | $limit_array = explode(',', $limit); |
| 105 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 105 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 107 | 107 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 108 | 108 | { |
| 109 | 109 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | } else { |
| 127 | 127 | $query = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate".$filter_query.$orderby_query; |
| 128 | 128 | } |
| 129 | - $spotter_array = $Tracker->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 129 | + $spotter_array = $Tracker->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 130 | 130 | |
| 131 | 131 | return $spotter_array; |
| 132 | 132 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | global $globalDBdriver, $globalLiveInterval; |
| 143 | 143 | date_default_timezone_set('UTC'); |
| 144 | 144 | |
| 145 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 145 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 146 | 146 | |
| 147 | 147 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 148 | 148 | if ($globalDBdriver == 'mysql') { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | try { |
| 161 | 161 | $sth = $this->db->prepare($query); |
| 162 | 162 | $sth->execute(); |
| 163 | - } catch(PDOException $e) { |
|
| 163 | + } catch (PDOException $e) { |
|
| 164 | 164 | echo $e->getMessage(); |
| 165 | 165 | die; |
| 166 | 166 | } |
@@ -180,15 +180,15 @@ discard block |
||
| 180 | 180 | global $globalDBdriver, $globalLiveInterval; |
| 181 | 181 | date_default_timezone_set('UTC'); |
| 182 | 182 | |
| 183 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 183 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 184 | 184 | |
| 185 | 185 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 186 | 186 | if ($globalDBdriver == 'mysql') { |
| 187 | - $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 187 | + $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 188 | 188 | FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' |
| 189 | 189 | ORDER BY tracker_live.famtrackid, tracker_live.date"; |
| 190 | 190 | } else { |
| 191 | - $query = "SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 191 | + $query = "SELECT tracker_live.ident, tracker_live.famtrackid, tracker_live.type,tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 192 | 192 | FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' |
| 193 | 193 | ORDER BY tracker_live.famtrackid, tracker_live.date"; |
| 194 | 194 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $this->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | echo $e->getMessage(); |
| 201 | 201 | die; |
| 202 | 202 | } |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | public function getLiveTrackerCount($filter = array()) |
| 214 | 214 | { |
| 215 | 215 | global $globalDBdriver, $globalLiveInterval; |
| 216 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 216 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 217 | 217 | |
| 218 | 218 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 219 | 219 | if ($globalDBdriver == 'mysql') { |
@@ -224,7 +224,7 @@ discard block |
||
| 224 | 224 | try { |
| 225 | 225 | $sth = $this->db->prepare($query); |
| 226 | 226 | $sth->execute(); |
| 227 | - } catch(PDOException $e) { |
|
| 227 | + } catch (PDOException $e) { |
|
| 228 | 228 | echo $e->getMessage(); |
| 229 | 229 | die; |
| 230 | 230 | } |
@@ -247,10 +247,10 @@ discard block |
||
| 247 | 247 | $filter_query = $this->getFilter($filter); |
| 248 | 248 | |
| 249 | 249 | if (is_array($coord)) { |
| 250 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 251 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 252 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 253 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 250 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 251 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 252 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 253 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 254 | 254 | } else return array(); |
| 255 | 255 | if ($globalDBdriver == 'mysql') { |
| 256 | 256 | $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query; |
@@ -275,17 +275,17 @@ discard block |
||
| 275 | 275 | $filter_query = $this->getFilter($filter); |
| 276 | 276 | |
| 277 | 277 | if (is_array($coord)) { |
| 278 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 279 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 280 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 281 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 278 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 279 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 280 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 281 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 282 | 282 | } else return array(); |
| 283 | 283 | if ($globalDBdriver == 'mysql') { |
| 284 | 284 | $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 285 | 285 | FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' AND tracker_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong." |
| 286 | 286 | ORDER BY tracker_live.famtrackid, tracker_live.date"; |
| 287 | 287 | } else { |
| 288 | - $query = "SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 288 | + $query = "SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
|
| 289 | 289 | FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date l.latitude BETWEEN ".$minlat." AND ".$maxlat." AND l.longitude BETWEEN ".$minlong." AND ".$maxlong." GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate".$filter_query." tracker_live.latitude <> '0' AND tracker_live.longitude <> '0'"; |
| 290 | 290 | } |
| 291 | 291 | $spotter_array = $Spotter->getDataFromDB($query); |
@@ -333,7 +333,7 @@ discard block |
||
| 333 | 333 | if ($interval == '1m') |
| 334 | 334 | { |
| 335 | 335 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
| 336 | - } else if ($interval == '15m'){ |
|
| 336 | + } else if ($interval == '15m') { |
|
| 337 | 337 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date '; |
| 338 | 338 | } |
| 339 | 339 | } |
@@ -341,14 +341,14 @@ discard block |
||
| 341 | 341 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date '; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live |
|
| 344 | + $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live |
|
| 345 | 345 | WHERE tracker_live.latitude <> '' |
| 346 | 346 | AND tracker_live.longitude <> '' |
| 347 | 347 | ".$additional_query." |
| 348 | 348 | HAVING distance < :radius |
| 349 | 349 | ORDER BY distance"; |
| 350 | 350 | |
| 351 | - $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 351 | + $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 352 | 352 | |
| 353 | 353 | return $spotter_array; |
| 354 | 354 | } |
@@ -366,9 +366,9 @@ discard block |
||
| 366 | 366 | date_default_timezone_set('UTC'); |
| 367 | 367 | |
| 368 | 368 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 369 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 369 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 370 | 370 | |
| 371 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 371 | + $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 372 | 372 | |
| 373 | 373 | return $spotter_array; |
| 374 | 374 | } |
@@ -379,16 +379,16 @@ discard block |
||
| 379 | 379 | * @return Array the spotter information |
| 380 | 380 | * |
| 381 | 381 | */ |
| 382 | - public function getDateLiveTrackerDataByIdent($ident,$date) |
|
| 382 | + public function getDateLiveTrackerDataByIdent($ident, $date) |
|
| 383 | 383 | { |
| 384 | 384 | $Tracker = new Tracker($this->db); |
| 385 | 385 | date_default_timezone_set('UTC'); |
| 386 | 386 | |
| 387 | 387 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 388 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 388 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 389 | 389 | |
| 390 | - $date = date('c',$date); |
|
| 391 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 390 | + $date = date('c', $date); |
|
| 391 | + $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 392 | 392 | |
| 393 | 393 | return $spotter_array; |
| 394 | 394 | } |
@@ -405,9 +405,9 @@ discard block |
||
| 405 | 405 | date_default_timezone_set('UTC'); |
| 406 | 406 | |
| 407 | 407 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 408 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 408 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 409 | 409 | |
| 410 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 410 | + $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 411 | 411 | |
| 412 | 412 | return $spotter_array; |
| 413 | 413 | } |
@@ -418,15 +418,15 @@ discard block |
||
| 418 | 418 | * @return Array the spotter information |
| 419 | 419 | * |
| 420 | 420 | */ |
| 421 | - public function getDateLiveTrackerDataById($id,$date) |
|
| 421 | + public function getDateLiveTrackerDataById($id, $date) |
|
| 422 | 422 | { |
| 423 | 423 | $Tracker = new Tracker($this->db); |
| 424 | 424 | date_default_timezone_set('UTC'); |
| 425 | 425 | |
| 426 | 426 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 427 | - $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 428 | - $date = date('c',$date); |
|
| 429 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 427 | + $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC'; |
|
| 428 | + $date = date('c', $date); |
|
| 429 | + $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 430 | 430 | |
| 431 | 431 | return $spotter_array; |
| 432 | 432 | } |
@@ -443,13 +443,13 @@ discard block |
||
| 443 | 443 | date_default_timezone_set('UTC'); |
| 444 | 444 | |
| 445 | 445 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 446 | - $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident'; |
|
| 446 | + $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident'; |
|
| 447 | 447 | |
| 448 | 448 | try { |
| 449 | 449 | |
| 450 | 450 | $sth = $this->db->prepare($query); |
| 451 | 451 | $sth->execute(array(':ident' => $ident)); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | echo $e->getMessage(); |
| 454 | 454 | die; |
| 455 | 455 | } |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | * @return Array the spotter information |
| 465 | 465 | * |
| 466 | 466 | */ |
| 467 | - public function getAllLiveTrackerDataById($id,$liveinterval = false) |
|
| 467 | + public function getAllLiveTrackerDataById($id, $liveinterval = false) |
|
| 468 | 468 | { |
| 469 | 469 | global $globalDBdriver, $globalLiveInterval; |
| 470 | 470 | date_default_timezone_set('UTC'); |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | try { |
| 484 | 484 | $sth = $this->db->prepare($query); |
| 485 | 485 | $sth->execute(array(':id' => $id)); |
| 486 | - } catch(PDOException $e) { |
|
| 486 | + } catch (PDOException $e) { |
|
| 487 | 487 | echo $e->getMessage(); |
| 488 | 488 | die; |
| 489 | 489 | } |
@@ -501,12 +501,12 @@ discard block |
||
| 501 | 501 | { |
| 502 | 502 | date_default_timezone_set('UTC'); |
| 503 | 503 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 504 | - $query = self::$global_query.' WHERE tracker_live.ident = :ident'; |
|
| 504 | + $query = self::$global_query.' WHERE tracker_live.ident = :ident'; |
|
| 505 | 505 | try { |
| 506 | 506 | |
| 507 | 507 | $sth = $this->db->prepare($query); |
| 508 | 508 | $sth->execute(array(':ident' => $ident)); |
| 509 | - } catch(PDOException $e) { |
|
| 509 | + } catch (PDOException $e) { |
|
| 510 | 510 | echo $e->getMessage(); |
| 511 | 511 | die; |
| 512 | 512 | } |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | |
| 537 | 537 | $sth = $this->db->prepare($query); |
| 538 | 538 | $sth->execute(); |
| 539 | - } catch(PDOException $e) { |
|
| 539 | + } catch (PDOException $e) { |
|
| 540 | 540 | return "error"; |
| 541 | 541 | } |
| 542 | 542 | |
@@ -559,14 +559,14 @@ discard block |
||
| 559 | 559 | |
| 560 | 560 | $sth = $this->db->prepare($query); |
| 561 | 561 | $sth->execute(); |
| 562 | - } catch(PDOException $e) { |
|
| 562 | + } catch (PDOException $e) { |
|
| 563 | 563 | return "error"; |
| 564 | 564 | } |
| 565 | 565 | $query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN ('; |
| 566 | 566 | $i = 0; |
| 567 | - $j =0; |
|
| 567 | + $j = 0; |
|
| 568 | 568 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 569 | - foreach($all as $row) |
|
| 569 | + foreach ($all as $row) |
|
| 570 | 570 | { |
| 571 | 571 | $i++; |
| 572 | 572 | $j++; |
@@ -574,9 +574,9 @@ discard block |
||
| 574 | 574 | if ($globalDebug) echo "."; |
| 575 | 575 | try { |
| 576 | 576 | |
| 577 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 577 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 578 | 578 | $sth->execute(); |
| 579 | - } catch(PDOException $e) { |
|
| 579 | + } catch (PDOException $e) { |
|
| 580 | 580 | return "error"; |
| 581 | 581 | } |
| 582 | 582 | $query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN ('; |
@@ -587,9 +587,9 @@ discard block |
||
| 587 | 587 | if ($i > 0) { |
| 588 | 588 | try { |
| 589 | 589 | |
| 590 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 590 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error"; |
| 594 | 594 | } |
| 595 | 595 | } |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | |
| 603 | 603 | $sth = $this->db->prepare($query); |
| 604 | 604 | $sth->execute(); |
| 605 | - } catch(PDOException $e) { |
|
| 605 | + } catch (PDOException $e) { |
|
| 606 | 606 | return "error"; |
| 607 | 607 | } |
| 608 | 608 | /* $query_delete = "DELETE FROM tracker_live WHERE famtrackid IN ("; |
@@ -650,13 +650,13 @@ discard block |
||
| 650 | 650 | public function deleteLiveTrackerDataByIdent($ident) |
| 651 | 651 | { |
| 652 | 652 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 653 | - $query = 'DELETE FROM tracker_live WHERE ident = :ident'; |
|
| 653 | + $query = 'DELETE FROM tracker_live WHERE ident = :ident'; |
|
| 654 | 654 | |
| 655 | 655 | try { |
| 656 | 656 | |
| 657 | 657 | $sth = $this->db->prepare($query); |
| 658 | 658 | $sth->execute(array(':ident' => $ident)); |
| 659 | - } catch(PDOException $e) { |
|
| 659 | + } catch (PDOException $e) { |
|
| 660 | 660 | return "error"; |
| 661 | 661 | } |
| 662 | 662 | |
@@ -672,13 +672,13 @@ discard block |
||
| 672 | 672 | public function deleteLiveTrackerDataById($id) |
| 673 | 673 | { |
| 674 | 674 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 675 | - $query = 'DELETE FROM tracker_live WHERE famtrackid = :id'; |
|
| 675 | + $query = 'DELETE FROM tracker_live WHERE famtrackid = :id'; |
|
| 676 | 676 | |
| 677 | 677 | try { |
| 678 | 678 | |
| 679 | 679 | $sth = $this->db->prepare($query); |
| 680 | 680 | $sth->execute(array(':id' => $id)); |
| 681 | - } catch(PDOException $e) { |
|
| 681 | + } catch (PDOException $e) { |
|
| 682 | 682 | return "error"; |
| 683 | 683 | } |
| 684 | 684 | |
@@ -696,13 +696,13 @@ discard block |
||
| 696 | 696 | { |
| 697 | 697 | global $globalDBdriver, $globalTimezone; |
| 698 | 698 | if ($globalDBdriver == 'mysql') { |
| 699 | - $query = 'SELECT tracker_live.ident FROM tracker_live |
|
| 699 | + $query = 'SELECT tracker_live.ident FROM tracker_live |
|
| 700 | 700 | WHERE tracker_live.ident = :ident |
| 701 | 701 | AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 702 | 702 | AND tracker_live.date < UTC_TIMESTAMP()'; |
| 703 | 703 | $query_data = array(':ident' => $ident); |
| 704 | 704 | } else { |
| 705 | - $query = "SELECT tracker_live.ident FROM tracker_live |
|
| 705 | + $query = "SELECT tracker_live.ident FROM tracker_live |
|
| 706 | 706 | WHERE tracker_live.ident = :ident |
| 707 | 707 | AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 708 | 708 | AND tracker_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -711,8 +711,8 @@ discard block |
||
| 711 | 711 | |
| 712 | 712 | $sth = $this->db->prepare($query); |
| 713 | 713 | $sth->execute($query_data); |
| 714 | - $ident_result=''; |
|
| 715 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 714 | + $ident_result = ''; |
|
| 715 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 716 | 716 | { |
| 717 | 717 | $ident_result = $row['ident']; |
| 718 | 718 | } |
@@ -729,13 +729,13 @@ discard block |
||
| 729 | 729 | { |
| 730 | 730 | global $globalDBdriver, $globalTimezone; |
| 731 | 731 | if ($globalDBdriver == 'mysql') { |
| 732 | - $query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 732 | + $query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 733 | 733 | WHERE tracker_live.ident = :ident |
| 734 | 734 | AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 735 | 735 | // AND tracker_live.date < UTC_TIMESTAMP()"; |
| 736 | 736 | $query_data = array(':ident' => $ident); |
| 737 | 737 | } else { |
| 738 | - $query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 738 | + $query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 739 | 739 | WHERE tracker_live.ident = :ident |
| 740 | 740 | AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 741 | 741 | // AND tracker_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -744,8 +744,8 @@ discard block |
||
| 744 | 744 | |
| 745 | 745 | $sth = $this->db->prepare($query); |
| 746 | 746 | $sth->execute($query_data); |
| 747 | - $ident_result=''; |
|
| 748 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 747 | + $ident_result = ''; |
|
| 748 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 749 | 749 | { |
| 750 | 750 | $ident_result = $row['famtrackid']; |
| 751 | 751 | } |
@@ -762,13 +762,13 @@ discard block |
||
| 762 | 762 | { |
| 763 | 763 | global $globalDBdriver, $globalTimezone; |
| 764 | 764 | if ($globalDBdriver == 'mysql') { |
| 765 | - $query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 765 | + $query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 766 | 766 | WHERE tracker_live.famtrackid = :id |
| 767 | 767 | AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 768 | 768 | // AND tracker_live.date < UTC_TIMESTAMP()"; |
| 769 | 769 | $query_data = array(':id' => $id); |
| 770 | 770 | } else { |
| 771 | - $query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 771 | + $query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live |
|
| 772 | 772 | WHERE tracker_live.famtrackid = :id |
| 773 | 773 | AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 774 | 774 | // AND tracker_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | |
| 778 | 778 | $sth = $this->db->prepare($query); |
| 779 | 779 | $sth->execute($query_data); |
| 780 | - $ident_result=''; |
|
| 781 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 780 | + $ident_result = ''; |
|
| 781 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 782 | 782 | { |
| 783 | 783 | $ident_result = $row['famtrackid']; |
| 784 | 784 | } |
@@ -796,7 +796,7 @@ discard block |
||
| 796 | 796 | * @return String success or false |
| 797 | 797 | * |
| 798 | 798 | */ |
| 799 | - public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 799 | + public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 800 | 800 | { |
| 801 | 801 | global $globalURL, $globalArchive, $globalDebug; |
| 802 | 802 | $Common = new Common(); |
@@ -855,21 +855,21 @@ discard block |
||
| 855 | 855 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 856 | 856 | |
| 857 | 857 | |
| 858 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 859 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 860 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 861 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 862 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 863 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 864 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 865 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 866 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 867 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 868 | - $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
|
| 869 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 870 | - |
|
| 871 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 872 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 858 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 859 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 860 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 861 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 862 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 863 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 864 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 865 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 866 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 867 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 868 | + $comment = filter_var($comment, FILTER_SANITIZE_STRING); |
|
| 869 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 870 | + |
|
| 871 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 872 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 873 | 873 | |
| 874 | 874 | $query = ''; |
| 875 | 875 | if ($globalArchive) { |
@@ -879,12 +879,12 @@ discard block |
||
| 879 | 879 | $query .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) |
| 880 | 880 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)'; |
| 881 | 881 | |
| 882 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':comment' => $comment,':type' => $type); |
|
| 882 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':comment' => $comment, ':type' => $type); |
|
| 883 | 883 | try { |
| 884 | 884 | |
| 885 | 885 | $sth = $this->db->prepare($query); |
| 886 | 886 | $sth->execute($query_values); |
| 887 | - } catch(PDOException $e) { |
|
| 887 | + } catch (PDOException $e) { |
|
| 888 | 888 | return "error : ".$e->getMessage(); |
| 889 | 889 | } |
| 890 | 890 | echo 'putinarchive : '.$putinarchive."\n"; |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 893 | 893 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 894 | 894 | $TrackerArchive = new TrackerArchive($this->db); |
| 895 | - $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country); |
|
| 895 | + $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident, $latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type, $noarchive, $format_source, $source_name, $over_country); |
|
| 896 | 896 | if ($globalDebug) echo $result.')'; |
| 897 | 897 | } |
| 898 | 898 | |
@@ -902,7 +902,7 @@ discard block |
||
| 902 | 902 | |
| 903 | 903 | public function getOrderBy() |
| 904 | 904 | { |
| 905 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC")); |
|
| 905 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC")); |
|
| 906 | 906 | return $orderby; |
| 907 | 907 | } |
| 908 | 908 | |
@@ -29,7 +29,9 @@ discard block |
||
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | 30 | $filters = array_merge($filters,$filter); |
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 33 | 35 | $filter_query_join = ''; |
| 34 | 36 | $filter_query_where = ''; |
| 35 | 37 | foreach($filters as $flt) { |
@@ -76,8 +78,11 @@ discard block |
||
| 76 | 78 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 77 | 79 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 78 | 80 | } |
| 79 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 80 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 81 | + if ($filter_query_where == '' && $where) { |
|
| 82 | + $filter_query_where = ' WHERE'; |
|
| 83 | + } elseif ($filter_query_where != '' && $and) { |
|
| 84 | + $filter_query_where .= ' AND'; |
|
| 85 | + } |
|
| 81 | 86 | if ($filter_query_where != '') { |
| 82 | 87 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 83 | 88 | } |
@@ -119,7 +124,9 @@ discard block |
||
| 119 | 124 | } |
| 120 | 125 | } |
| 121 | 126 | |
| 122 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 127 | + if (!isset($globalLiveInterval)) { |
|
| 128 | + $globalLiveInterval = '200'; |
|
| 129 | + } |
|
| 123 | 130 | if ($globalDBdriver == 'mysql') { |
| 124 | 131 | //$query = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate"; |
| 125 | 132 | $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -144,7 +151,9 @@ discard block |
||
| 144 | 151 | |
| 145 | 152 | $filter_query = $this->getFilter($filter,true,true); |
| 146 | 153 | |
| 147 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 154 | + if (!isset($globalLiveInterval)) { |
|
| 155 | + $globalLiveInterval = '200'; |
|
| 156 | + } |
|
| 148 | 157 | if ($globalDBdriver == 'mysql') { |
| 149 | 158 | $query = 'SELECT tracker_live.ident, tracker_live.type,tracker_live.famtrackid, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 150 | 159 | FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate'.$filter_query." tracker_live.latitude <> 0 AND tracker_live.longitude <> 0"; |
@@ -182,7 +191,9 @@ discard block |
||
| 182 | 191 | |
| 183 | 192 | $filter_query = $this->getFilter($filter,true,true); |
| 184 | 193 | |
| 185 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 194 | + if (!isset($globalLiveInterval)) { |
|
| 195 | + $globalLiveInterval = '200'; |
|
| 196 | + } |
|
| 186 | 197 | if ($globalDBdriver == 'mysql') { |
| 187 | 198 | $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 188 | 199 | FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' |
@@ -215,7 +226,9 @@ discard block |
||
| 215 | 226 | global $globalDBdriver, $globalLiveInterval; |
| 216 | 227 | $filter_query = $this->getFilter($filter,true,true); |
| 217 | 228 | |
| 218 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 229 | + if (!isset($globalLiveInterval)) { |
|
| 230 | + $globalLiveInterval = '200'; |
|
| 231 | + } |
|
| 219 | 232 | if ($globalDBdriver == 'mysql') { |
| 220 | 233 | $query = 'SELECT COUNT(DISTINCT tracker_live.famtrackid) as nb FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
| 221 | 234 | } else { |
@@ -243,7 +256,9 @@ discard block |
||
| 243 | 256 | { |
| 244 | 257 | global $globalDBdriver, $globalLiveInterval; |
| 245 | 258 | $Spotter = new Spotter($this->db); |
| 246 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 259 | + if (!isset($globalLiveInterval)) { |
|
| 260 | + $globalLiveInterval = '200'; |
|
| 261 | + } |
|
| 247 | 262 | $filter_query = $this->getFilter($filter); |
| 248 | 263 | |
| 249 | 264 | if (is_array($coord)) { |
@@ -251,7 +266,9 @@ discard block |
||
| 251 | 266 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 252 | 267 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 253 | 268 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 254 | - } else return array(); |
|
| 269 | + } else { |
|
| 270 | + return array(); |
|
| 271 | + } |
|
| 255 | 272 | if ($globalDBdriver == 'mysql') { |
| 256 | 273 | $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query; |
| 257 | 274 | } else { |
@@ -271,7 +288,9 @@ discard block |
||
| 271 | 288 | { |
| 272 | 289 | global $globalDBdriver, $globalLiveInterval; |
| 273 | 290 | $Spotter = new Spotter($this->db); |
| 274 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 291 | + if (!isset($globalLiveInterval)) { |
|
| 292 | + $globalLiveInterval = '200'; |
|
| 293 | + } |
|
| 275 | 294 | $filter_query = $this->getFilter($filter); |
| 276 | 295 | |
| 277 | 296 | if (is_array($coord)) { |
@@ -279,7 +298,9 @@ discard block |
||
| 279 | 298 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 280 | 299 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 281 | 300 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 282 | - } else return array(); |
|
| 301 | + } else { |
|
| 302 | + return array(); |
|
| 303 | + } |
|
| 283 | 304 | if ($globalDBdriver == 'mysql') { |
| 284 | 305 | $query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source |
| 285 | 306 | FROM tracker_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0' AND tracker_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong." |
@@ -472,11 +493,15 @@ discard block |
||
| 472 | 493 | //$query = self::$global_query.' WHERE tracker_live.famtrackid = :id ORDER BY date'; |
| 473 | 494 | if ($globalDBdriver == 'mysql') { |
| 474 | 495 | $query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id'; |
| 475 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 496 | + if ($liveinterval) { |
|
| 497 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 498 | + } |
|
| 476 | 499 | $query .= ' ORDER BY date'; |
| 477 | 500 | } else { |
| 478 | 501 | $query = 'SELECT tracker_live.* FROM tracker_live WHERE tracker_live.famtrackid = :id'; |
| 479 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 502 | + if ($liveinterval) { |
|
| 503 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 504 | + } |
|
| 480 | 505 | $query .= ' ORDER BY date'; |
| 481 | 506 | } |
| 482 | 507 | |
@@ -571,7 +596,9 @@ discard block |
||
| 571 | 596 | $i++; |
| 572 | 597 | $j++; |
| 573 | 598 | if ($j == 30) { |
| 574 | - if ($globalDebug) echo "."; |
|
| 599 | + if ($globalDebug) { |
|
| 600 | + echo "."; |
|
| 601 | + } |
|
| 575 | 602 | try { |
| 576 | 603 | |
| 577 | 604 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -818,7 +845,9 @@ discard block |
||
| 818 | 845 | { |
| 819 | 846 | return false; |
| 820 | 847 | } |
| 821 | - } else return ''; |
|
| 848 | + } else { |
|
| 849 | + return ''; |
|
| 850 | + } |
|
| 822 | 851 | |
| 823 | 852 | if ($longitude != '') |
| 824 | 853 | { |
@@ -826,7 +855,9 @@ discard block |
||
| 826 | 855 | { |
| 827 | 856 | return false; |
| 828 | 857 | } |
| 829 | - } else return ''; |
|
| 858 | + } else { |
|
| 859 | + return ''; |
|
| 860 | + } |
|
| 830 | 861 | |
| 831 | 862 | if ($altitude != '') |
| 832 | 863 | { |
@@ -834,7 +865,9 @@ discard block |
||
| 834 | 865 | { |
| 835 | 866 | return false; |
| 836 | 867 | } |
| 837 | - } else $altitude = 0; |
|
| 868 | + } else { |
|
| 869 | + $altitude = 0; |
|
| 870 | + } |
|
| 838 | 871 | |
| 839 | 872 | if ($heading != '') |
| 840 | 873 | { |
@@ -842,7 +875,9 @@ discard block |
||
| 842 | 875 | { |
| 843 | 876 | return false; |
| 844 | 877 | } |
| 845 | - } else $heading = 0; |
|
| 878 | + } else { |
|
| 879 | + $heading = 0; |
|
| 880 | + } |
|
| 846 | 881 | |
| 847 | 882 | if ($groundspeed != '') |
| 848 | 883 | { |
@@ -850,9 +885,13 @@ discard block |
||
| 850 | 885 | { |
| 851 | 886 | return false; |
| 852 | 887 | } |
| 853 | - } else $groundspeed = 0; |
|
| 888 | + } else { |
|
| 889 | + $groundspeed = 0; |
|
| 890 | + } |
|
| 854 | 891 | date_default_timezone_set('UTC'); |
| 855 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 892 | + if ($date == '') { |
|
| 893 | + $date = date("Y-m-d H:i:s", time()); |
|
| 894 | + } |
|
| 856 | 895 | |
| 857 | 896 | |
| 858 | 897 | $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
@@ -868,12 +907,18 @@ discard block |
||
| 868 | 907 | $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
| 869 | 908 | $type = filter_var($type,FILTER_SANITIZE_STRING); |
| 870 | 909 | |
| 871 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 872 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 910 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 911 | + $groundspeed = 0; |
|
| 912 | + } |
|
| 913 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 914 | + $heading = 0; |
|
| 915 | + } |
|
| 873 | 916 | |
| 874 | 917 | $query = ''; |
| 875 | 918 | if ($globalArchive) { |
| 876 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 919 | + if ($globalDebug) { |
|
| 920 | + echo '-- Delete previous data -- '; |
|
| 921 | + } |
|
| 877 | 922 | $query .= 'DELETE FROM tracker_live WHERE famtrackid = :famtrackid;'; |
| 878 | 923 | } |
| 879 | 924 | $query .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) |
@@ -890,10 +935,14 @@ discard block |
||
| 890 | 935 | echo 'putinarchive : '.$putinarchive."\n"; |
| 891 | 936 | echo 'noarchive : '.$noarchive."\n"; |
| 892 | 937 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 893 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 938 | + if ($globalDebug) { |
|
| 939 | + echo '(Add to SBS archive : '; |
|
| 940 | + } |
|
| 894 | 941 | $TrackerArchive = new TrackerArchive($this->db); |
| 895 | 942 | $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country); |
| 896 | - if ($globalDebug) echo $result.')'; |
|
| 943 | + if ($globalDebug) { |
|
| 944 | + echo $result.')'; |
|
| 945 | + } |
|
| 897 | 946 | } |
| 898 | 947 | |
| 899 | 948 | return "success"; |
@@ -131,5 +131,5 @@ |
||
| 131 | 131 | } else { |
| 132 | 132 | var clockViewModel = new Cesium.ClockViewModel(viewer.clock); |
| 133 | 133 | var animationViewModel = new Cesium.AnimationViewModel(clockViewModel); |
| 134 | - $(".archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 134 | + $(".archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 135 | 135 | } |
@@ -53,7 +53,12 @@ discard block |
||
| 53 | 53 | } else { |
| 54 | 54 | for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) { |
| 55 | 55 | var entity = viewer.dataSources.get(dsn).entities.values[i]; |
| 56 | - if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) { |
|
| 56 | + if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) { |
|
| 57 | + print $globalMapRefresh*2000; |
|
| 58 | +} else { |
|
| 59 | + print '60000'; |
|
| 60 | +} |
|
| 61 | +?>)) { |
|
| 57 | 62 | viewer.dataSources.get(dsn).entities.remove(entity); |
| 58 | 63 | } else { |
| 59 | 64 | //console.log(parseInt(entity.lastupdate)+' > '+Math.floor(Date.now()-100)); |
@@ -127,7 +132,12 @@ discard block |
||
| 127 | 132 | function(){ |
| 128 | 133 | updateMarineData(); |
| 129 | 134 | } |
| 130 | - ,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 135 | + ,<?php if (isset($globalMapRefresh)) { |
|
| 136 | + print $globalMapRefresh*1000; |
|
| 137 | +} else { |
|
| 138 | + print '30000'; |
|
| 139 | +} |
|
| 140 | +?>); |
|
| 131 | 141 | } else { |
| 132 | 142 | var clockViewModel = new Cesium.ClockViewModel(viewer.clock); |
| 133 | 143 | var animationViewModel = new Cesium.AnimationViewModel(clockViewModel); |
@@ -6,8 +6,8 @@ discard block |
||
| 6 | 6 | if (!isset($globalJsonCompress)) $compress = true; |
| 7 | 7 | else $compress = $globalJsonCompress; |
| 8 | 8 | |
| 9 | -if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 10 | -if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 9 | +if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 10 | +if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | ?> |
| 12 | 12 | |
| 13 | 13 | |
@@ -176,10 +176,10 @@ discard block |
||
| 176 | 176 | }; |
| 177 | 177 | archive.update = function (props) { |
| 178 | 178 | if (typeof props != 'undefined') { |
| 179 | - //this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i> <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a> <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>'; |
|
| 180 | - this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>'; |
|
| 179 | + //this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><i class="fa fa-fast-backward" aria-hidden="true"></i> <i class="fa fa-backward" aria-hidden="true"></i> <a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a> <i class="fa fa-forward" aria-hidden="true"></i> <i class="fa fa-fast-forward" aria-hidden="true"></i>'; |
|
| 180 | + this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b>' + props.archive_date + ' UTC </b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a>'; |
|
| 181 | 181 | } else { |
| 182 | - this._div.innerHTML = '<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>'; |
|
| 182 | + this._div.innerHTML = '<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>'; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | 185 | }; |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | <?php |
| 341 | 341 | } else { |
| 342 | 342 | ?> |
| 343 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 343 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 344 | 344 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 345 | 345 | <?php |
| 346 | 346 | } |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | /* |
| 357 | 357 | shadowUrl: iconURLShadowpath, |
| 358 | 358 | shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
| 359 | - shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 359 | + shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 360 | 360 | */ |
| 361 | 361 | }) |
| 362 | 362 | }) |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | <?php |
| 383 | 383 | } else { |
| 384 | 384 | ?> |
| 385 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 385 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 386 | 386 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 387 | 387 | <?php |
| 388 | 388 | } |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | <?php |
| 423 | 423 | } else { |
| 424 | 424 | ?> |
| 425 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 425 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 426 | 426 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 427 | 427 | <?php |
| 428 | 428 | } |
@@ -3,11 +3,18 @@ discard block |
||
| 3 | 3 | require_once('../require/class.Language.php'); |
| 4 | 4 | |
| 5 | 5 | // Compressed GeoJson is used if true |
| 6 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 7 | -else $compress = $globalJsonCompress; |
|
| 6 | +if (!isset($globalJsonCompress)) { |
|
| 7 | + $compress = true; |
|
| 8 | +} else { |
|
| 9 | + $compress = $globalJsonCompress; |
|
| 10 | +} |
|
| 8 | 11 | |
| 9 | -if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 10 | -if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 12 | +if (isset($_GET['ident'])) { |
|
| 13 | + $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 14 | +} |
|
| 15 | +if (isset($_GET['flightaware_id'])) { |
|
| 16 | + $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 17 | +} |
|
| 11 | 18 | ?> |
| 12 | 19 | |
| 13 | 20 | |
@@ -72,9 +79,12 @@ discard block |
||
| 72 | 79 | |
| 73 | 80 | function update_airportsLayer() { |
| 74 | 81 | <?php |
| 75 | - if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom']; |
|
| 76 | - else $getZoom = '7'; |
|
| 77 | -?> |
|
| 82 | + if (isset($_COOKIE['AirportZoom'])) { |
|
| 83 | + $getZoom = $_COOKIE['AirportZoom']; |
|
| 84 | + } else { |
|
| 85 | + $getZoom = '7'; |
|
| 86 | + } |
|
| 87 | + ?> |
|
| 78 | 88 | if (typeof airportsLayer != 'undefined') { |
| 79 | 89 | if (map.hasLayer(airportsLayer) == true) { |
| 80 | 90 | map.removeLayer(airportsLayer); |
@@ -290,9 +300,13 @@ discard block |
||
| 290 | 300 | if (callsign != ""){ markerLabel += callsign; } |
| 291 | 301 | if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; } |
| 292 | 302 | <?php |
| 293 | - if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor']; |
|
| 294 | - elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor; |
|
| 295 | - else $IconColor = '1a3151'; |
|
| 303 | + if (isset($_COOKIE['IconColor'])) { |
|
| 304 | + $IconColor = $_COOKIE['IconColor']; |
|
| 305 | + } elseif (isset($globalAircraftIconColor)) { |
|
| 306 | + $IconColor = $globalAircraftIconColor; |
|
| 307 | + } else { |
|
| 308 | + $IconColor = '1a3151'; |
|
| 309 | + } |
|
| 296 | 310 | if (!isset($ident) && !isset($flightaware_id)) { |
| 297 | 311 | ?> |
| 298 | 312 | info_update(feature.properties.fc); |
@@ -340,7 +354,12 @@ discard block |
||
| 340 | 354 | <?php |
| 341 | 355 | } else { |
| 342 | 356 | ?> |
| 343 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 357 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 358 | + print $archiveupdatetime*1000; |
|
| 359 | +} else { |
|
| 360 | + print $globalMapRefresh*1000+20000; |
|
| 361 | +} |
|
| 362 | +?>+feature.properties.sqt*1000); |
|
| 344 | 363 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 345 | 364 | <?php |
| 346 | 365 | } |
@@ -382,7 +401,12 @@ discard block |
||
| 382 | 401 | <?php |
| 383 | 402 | } else { |
| 384 | 403 | ?> |
| 385 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 404 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 405 | + print $archiveupdatetime*1000; |
|
| 406 | +} else { |
|
| 407 | + print $globalMapRefresh*1000+20000; |
|
| 408 | +} |
|
| 409 | +?>+feature.properties.sqt*1000); |
|
| 386 | 410 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 387 | 411 | <?php |
| 388 | 412 | } |
@@ -422,7 +446,12 @@ discard block |
||
| 422 | 446 | <?php |
| 423 | 447 | } else { |
| 424 | 448 | ?> |
| 425 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 449 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 450 | + print $archiveupdatetime*1000; |
|
| 451 | +} else { |
|
| 452 | + print $globalMapRefresh*1000+20000; |
|
| 453 | +} |
|
| 454 | +?>+feature.properties.sqt*1000); |
|
| 426 | 455 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 427 | 456 | <?php |
| 428 | 457 | } |
@@ -759,13 +788,23 @@ discard block |
||
| 759 | 788 | if (isset($archive) && $archive) { |
| 760 | 789 | ?> |
| 761 | 790 | //then load it again every 30 seconds |
| 762 | - // var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
| 791 | + // var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 792 | + print ($globalMapRefresh*1000)/2; |
|
| 793 | +} else { |
|
| 794 | + print '15000'; |
|
| 795 | +} |
|
| 796 | +?>); |
|
| 763 | 797 | reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>); |
| 764 | 798 | <?php |
| 765 | 799 | } else { |
| 766 | 800 | ?> |
| 767 | 801 | //then load it again every 30 seconds |
| 768 | - reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 802 | + reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 803 | + print $globalMapRefresh*1000; |
|
| 804 | +} else { |
|
| 805 | + print '30000'; |
|
| 806 | +} |
|
| 807 | +?>); |
|
| 769 | 808 | var currentdate = new Date(); |
| 770 | 809 | var currentyear = new Date().getFullYear(); |
| 771 | 810 | var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0)); |
@@ -777,7 +816,12 @@ discard block |
||
| 777 | 816 | if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
| 778 | 817 | ?> |
| 779 | 818 | update_polarLayer(); |
| 780 | - setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
| 819 | + setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) { |
|
| 820 | + print $globalMapRefresh*1000*2; |
|
| 821 | +} else { |
|
| 822 | + print '60000'; |
|
| 823 | +} |
|
| 824 | +?>); |
|
| 781 | 825 | <?php |
| 782 | 826 | } |
| 783 | 827 | ?> |
@@ -792,7 +836,12 @@ discard block |
||
| 792 | 836 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 793 | 837 | ?> |
| 794 | 838 | update_atcLayer(); |
| 795 | - setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
| 839 | + setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) { |
|
| 840 | + print $globalMapRefresh*1000*2; |
|
| 841 | +} else { |
|
| 842 | + print '60000'; |
|
| 843 | +} |
|
| 844 | +?>); |
|
| 796 | 845 | <?php |
| 797 | 846 | } |
| 798 | 847 | ?> |
@@ -53,7 +53,12 @@ discard block |
||
| 53 | 53 | } else { |
| 54 | 54 | for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) { |
| 55 | 55 | var entity = viewer.dataSources.get(dsn).entities.values[i]; |
| 56 | - if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) { |
|
| 56 | + if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) { |
|
| 57 | + print $globalMapRefresh*2000; |
|
| 58 | +} else { |
|
| 59 | + print '60000'; |
|
| 60 | +} |
|
| 61 | +?>)) { |
|
| 57 | 62 | viewer.dataSources.get(dsn).entities.remove(entity); |
| 58 | 63 | } else { |
| 59 | 64 | //console.log(parseInt(entity.lastupdate)+' > '+Math.floor(Date.now()-100)); |
@@ -127,7 +132,12 @@ discard block |
||
| 127 | 132 | function(){ |
| 128 | 133 | updateTrackerData(); |
| 129 | 134 | } |
| 130 | - ,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 135 | + ,<?php if (isset($globalMapRefresh)) { |
|
| 136 | + print $globalMapRefresh*1000; |
|
| 137 | +} else { |
|
| 138 | + print '30000'; |
|
| 139 | +} |
|
| 140 | +?>); |
|
| 131 | 141 | } else { |
| 132 | 142 | var clockViewModel = new Cesium.ClockViewModel(viewer.clock); |
| 133 | 143 | var animationViewModel = new Cesium.AnimationViewModel(clockViewModel); |
@@ -131,5 +131,5 @@ |
||
| 131 | 131 | } else { |
| 132 | 132 | var clockViewModel = new Cesium.ClockViewModel(viewer.clock); |
| 133 | 133 | var animationViewModel = new Cesium.AnimationViewModel(clockViewModel); |
| 134 | - $(".archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 134 | + $(".archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive")); ?></h4>' + '<br/><form id="noarchive" method="post"><input type="hidden" name="noarchive" /></form><a href="#" onClick="animationViewModel.playReverseViewModel.command();"><i class="fa fa-play fa-flip-horizontal" aria-hidden="true"></i></a> <a href="#" onClick="'+"document.getElementById('noarchive').submit();"+'"><i class="fa fa-eject" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.pauseViewModel.command();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="animationViewModel.playForwardViewModel.command();"><i class="fa fa-play" aria-hidden="true"></i></a>'); |
|
| 135 | 135 | } |
@@ -516,8 +516,8 @@ discard block |
||
| 516 | 516 | } |
| 517 | 517 | } |
| 518 | 518 | <?php |
| 519 | - } else { |
|
| 520 | - ?> |
|
| 519 | + } else { |
|
| 520 | + ?> |
|
| 521 | 521 | if (map.getZoom() > 7) { |
| 522 | 522 | var style = { |
| 523 | 523 | "color": "#1a3151", |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | layer_marine_data.addLayer(layer); |
| 537 | 537 | } |
| 538 | 538 | <?php |
| 539 | - } |
|
| 539 | + } |
|
| 540 | 540 | ?> |
| 541 | 541 | } |
| 542 | 542 | } |
@@ -5,8 +5,11 @@ discard block |
||
| 5 | 5 | setcookie("MapFormat",'2d'); |
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 9 | -else $compress = $globalJsonCompress; |
|
| 8 | +if (!isset($globalJsonCompress)) { |
|
| 9 | + $compress = true; |
|
| 10 | +} else { |
|
| 11 | + $compress = $globalJsonCompress; |
|
| 12 | +} |
|
| 10 | 13 | ?> |
| 11 | 14 | |
| 12 | 15 | |
@@ -142,9 +145,13 @@ discard block |
||
| 142 | 145 | if (callsign != ""){ markerMarineLabel += callsign; } |
| 143 | 146 | if (type != ""){ markerMarineLabel += ' - '+type; } |
| 144 | 147 | <?php |
| 145 | - if (isset($_COOKIE['MarineIconColor'])) $MarineIconColor = $_COOKIE['MarineIconColor']; |
|
| 146 | - elseif (isset($globalMarineIconColor)) $MarineIconColor = $globalMarineIconColor; |
|
| 147 | - else $MarineIconColor = '1a3151'; |
|
| 148 | + if (isset($_COOKIE['MarineIconColor'])) { |
|
| 149 | + $MarineIconColor = $_COOKIE['MarineIconColor']; |
|
| 150 | + } elseif (isset($globalMarineIconColor)) { |
|
| 151 | + $MarineIconColor = $globalMarineIconColor; |
|
| 152 | + } else { |
|
| 153 | + $MarineIconColor = '1a3151'; |
|
| 154 | + } |
|
| 148 | 155 | if (!isset($ident) && !isset($fammarine_id)) { |
| 149 | 156 | ?> |
| 150 | 157 | info_marine_update(feature.properties.fc); |
@@ -179,7 +186,12 @@ discard block |
||
| 179 | 186 | <?php |
| 180 | 187 | } else { |
| 181 | 188 | ?> |
| 182 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 189 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 190 | + print $archiveupdatetime*1000; |
|
| 191 | +} else { |
|
| 192 | + print $globalMapRefresh*1000+20000; |
|
| 193 | +} |
|
| 194 | +?>+feature.properties.sqt*1000); |
|
| 183 | 195 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 184 | 196 | <?php |
| 185 | 197 | } |
@@ -228,7 +240,12 @@ discard block |
||
| 228 | 240 | <?php |
| 229 | 241 | } else { |
| 230 | 242 | ?> |
| 231 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 243 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 244 | + print $archiveupdatetime*1000; |
|
| 245 | +} else { |
|
| 246 | + print $globalMapRefresh*1000+20000; |
|
| 247 | +} |
|
| 248 | +?>+feature.properties.sqt*1000); |
|
| 232 | 249 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 233 | 250 | <?php |
| 234 | 251 | } |
@@ -276,7 +293,12 @@ discard block |
||
| 276 | 293 | <?php |
| 277 | 294 | } else { |
| 278 | 295 | ?> |
| 279 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 296 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 297 | + print $archiveupdatetime*1000; |
|
| 298 | +} else { |
|
| 299 | + print $globalMapRefresh*1000+20000; |
|
| 300 | +} |
|
| 301 | +?>+feature.properties.sqt*1000); |
|
| 280 | 302 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 281 | 303 | <?php |
| 282 | 304 | } |
@@ -559,14 +581,24 @@ discard block |
||
| 559 | 581 | if (isset($archive) && $archive) { |
| 560 | 582 | ?> |
| 561 | 583 | //then load it again every 30 seconds |
| 562 | -// var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
| 584 | +// var reload = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 585 | + print ($globalMapRefresh*1000)/2; |
|
| 586 | +} else { |
|
| 587 | + print '15000'; |
|
| 588 | +} |
|
| 589 | +?>); |
|
| 563 | 590 | reloadMarinePage = setInterval(function(){if (noTimeout) getLiveMarineData(0)},<?php print $archiveupdatetime*1000; ?>); |
| 564 | 591 | <?php |
| 565 | 592 | } else { |
| 566 | 593 | ?> |
| 567 | 594 | //then load it again every 30 seconds |
| 568 | 595 | reloadMarinePage = setInterval( |
| 569 | - function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 596 | + function(){if (noTimeout) getLiveMarineData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 597 | + print $globalMapRefresh*1000; |
|
| 598 | +} else { |
|
| 599 | + print '30000'; |
|
| 600 | +} |
|
| 601 | +?>); |
|
| 570 | 602 | <?php |
| 571 | 603 | } |
| 572 | 604 | ?> |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once('../require/settings.php'); |
| 3 | 3 | require_once('../require/class.Language.php'); |
| 4 | 4 | |
| 5 | -setcookie("MapFormat",'2d'); |
|
| 5 | +setcookie("MapFormat", '2d'); |
|
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | 8 | if (!isset($globalJsonCompress)) $compress = true; |
@@ -16,10 +16,10 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | <?php |
| 18 | 18 | if (isset($_GET['fammarine_id'])) { |
| 19 | - $fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING); |
|
| 19 | + $fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING); |
|
| 20 | 20 | } |
| 21 | 21 | if (isset($_GET['ident'])) { |
| 22 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 22 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 23 | 23 | } |
| 24 | 24 | if (!isset($ident) && !isset($fammarine_id)) { |
| 25 | 25 | ?> |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | <?php |
| 183 | 183 | } else { |
| 184 | 184 | ?> |
| 185 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 185 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 186 | 186 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 187 | 187 | <?php |
| 188 | 188 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | /* |
| 199 | 199 | shadowUrl: iconURLShadowpath, |
| 200 | 200 | shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
| 201 | - shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 201 | + shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 202 | 202 | */ |
| 203 | 203 | }) |
| 204 | 204 | }) |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | <?php |
| 232 | 232 | } else { |
| 233 | 233 | ?> |
| 234 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 234 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 235 | 235 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 236 | 236 | <?php |
| 237 | 237 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <?php |
| 280 | 280 | } else { |
| 281 | 281 | ?> |
| 282 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 282 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 283 | 283 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 284 | 284 | <?php |
| 285 | 285 | } |
@@ -517,8 +517,8 @@ discard block |
||
| 517 | 517 | } |
| 518 | 518 | } |
| 519 | 519 | <?php |
| 520 | - } else { |
|
| 521 | - ?> |
|
| 520 | + } else { |
|
| 521 | + ?> |
|
| 522 | 522 | if (map.getZoom() > 7) { |
| 523 | 523 | var style = { |
| 524 | 524 | "color": "#1a3151", |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | layer_tracker_data.addLayer(layer); |
| 538 | 538 | } |
| 539 | 539 | <?php |
| 540 | - } |
|
| 540 | + } |
|
| 541 | 541 | ?> |
| 542 | 542 | } |
| 543 | 543 | } |
@@ -5,8 +5,11 @@ discard block |
||
| 5 | 5 | setcookie("MapFormat",'2d'); |
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 9 | -else $compress = $globalJsonCompress; |
|
| 8 | +if (!isset($globalJsonCompress)) { |
|
| 9 | + $compress = true; |
|
| 10 | +} else { |
|
| 11 | + $compress = $globalJsonCompress; |
|
| 12 | +} |
|
| 10 | 13 | ?> |
| 11 | 14 | |
| 12 | 15 | |
@@ -143,9 +146,13 @@ discard block |
||
| 143 | 146 | if (callsign != ""){ markerTrackerLabel += callsign; } |
| 144 | 147 | if (type != ""){ markerTrackerLabel += ' - '+type; } |
| 145 | 148 | <?php |
| 146 | - if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor']; |
|
| 147 | - elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor; |
|
| 148 | - else $IconColor = '1a3151'; |
|
| 149 | + if (isset($_COOKIE['IconColor'])) { |
|
| 150 | + $IconColor = $_COOKIE['IconColor']; |
|
| 151 | + } elseif (isset($globalAircraftIconColor)) { |
|
| 152 | + $IconColor = $globalAircraftIconColor; |
|
| 153 | + } else { |
|
| 154 | + $IconColor = '1a3151'; |
|
| 155 | + } |
|
| 149 | 156 | if (!isset($ident) && !isset($famtrackid)) { |
| 150 | 157 | ?> |
| 151 | 158 | info_tracker_update(feature.properties.fc); |
@@ -179,7 +186,12 @@ discard block |
||
| 179 | 186 | <?php |
| 180 | 187 | } else { |
| 181 | 188 | ?> |
| 182 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 189 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 190 | + print $archiveupdatetime*1000; |
|
| 191 | +} else { |
|
| 192 | + print $globalMapRefresh*1000+20000; |
|
| 193 | +} |
|
| 194 | +?>+feature.properties.sqt*1000); |
|
| 183 | 195 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 184 | 196 | <?php |
| 185 | 197 | } |
@@ -228,7 +240,12 @@ discard block |
||
| 228 | 240 | <?php |
| 229 | 241 | } else { |
| 230 | 242 | ?> |
| 231 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 243 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 244 | + print $archiveupdatetime*1000; |
|
| 245 | +} else { |
|
| 246 | + print $globalMapRefresh*1000+20000; |
|
| 247 | +} |
|
| 248 | +?>+feature.properties.sqt*1000); |
|
| 232 | 249 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 233 | 250 | <?php |
| 234 | 251 | } |
@@ -276,7 +293,12 @@ discard block |
||
| 276 | 293 | <?php |
| 277 | 294 | } else { |
| 278 | 295 | ?> |
| 279 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 296 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 297 | + print $archiveupdatetime*1000; |
|
| 298 | +} else { |
|
| 299 | + print $globalMapRefresh*1000+20000; |
|
| 300 | +} |
|
| 301 | +?>+feature.properties.sqt*1000); |
|
| 280 | 302 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 281 | 303 | <?php |
| 282 | 304 | } |
@@ -559,14 +581,24 @@ discard block |
||
| 559 | 581 | if (isset($archive) && $archive) { |
| 560 | 582 | ?> |
| 561 | 583 | //then load it again every 30 seconds |
| 562 | -// var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
| 584 | +// var reload = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 585 | + print ($globalMapRefresh*1000)/2; |
|
| 586 | +} else { |
|
| 587 | + print '15000'; |
|
| 588 | +} |
|
| 589 | +?>); |
|
| 563 | 590 | reloadTrackerPage = setInterval(function(){if (noTimeout) getLiveTrackerData(0)},<?php print $archiveupdatetime*1000; ?>); |
| 564 | 591 | <?php |
| 565 | 592 | } else { |
| 566 | 593 | ?> |
| 567 | 594 | //then load it again every 30 seconds |
| 568 | 595 | reloadTrackerPage = setInterval( |
| 569 | - function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 596 | + function(){if (noTimeout) getLiveTrackerData(0)},<?php if (isset($globalMapRefresh)) { |
|
| 597 | + print $globalMapRefresh*1000; |
|
| 598 | +} else { |
|
| 599 | + print '30000'; |
|
| 600 | +} |
|
| 601 | +?>); |
|
| 570 | 602 | <?php |
| 571 | 603 | } |
| 572 | 604 | ?> |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once('../require/settings.php'); |
| 3 | 3 | require_once('../require/class.Language.php'); |
| 4 | 4 | |
| 5 | -setcookie("MapFormat",'2d'); |
|
| 5 | +setcookie("MapFormat", '2d'); |
|
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | 8 | if (!isset($globalJsonCompress)) $compress = true; |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | <?php |
| 19 | 19 | if (isset($_GET['famtrackid'])) { |
| 20 | - $famtrackid = filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING); |
|
| 20 | + $famtrackid = filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING); |
|
| 21 | 21 | } |
| 22 | 22 | if (isset($_GET['ident'])) { |
| 23 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 23 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 24 | 24 | } |
| 25 | 25 | if (!isset($ident) && !isset($famtrackid)) { |
| 26 | 26 | ?> |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | <?php |
| 183 | 183 | } else { |
| 184 | 184 | ?> |
| 185 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 185 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 186 | 186 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 187 | 187 | <?php |
| 188 | 188 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | /* |
| 199 | 199 | shadowUrl: iconURLShadowpath, |
| 200 | 200 | shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
| 201 | - shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 201 | + shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 202 | 202 | */ |
| 203 | 203 | }) |
| 204 | 204 | }) |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | <?php |
| 232 | 232 | } else { |
| 233 | 233 | ?> |
| 234 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 234 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 235 | 235 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 236 | 236 | <?php |
| 237 | 237 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | <?php |
| 280 | 280 | } else { |
| 281 | 281 | ?> |
| 282 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 282 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 283 | 283 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 284 | 284 | <?php |
| 285 | 285 | } |
