Ysurac /
FlightAirMap
@@ -17,6 +17,10 @@ discard block |
||
| 17 | 17 | $this->db = $Connection->db(); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | + /** |
|
| 21 | + * @param string $type |
|
| 22 | + * @param string $stats_date |
|
| 23 | + */ |
|
| 20 | 24 | public function addLastStatsUpdate($type,$stats_date) { |
| 21 | 25 | $query = "DELETE FROM config WHERE name = :type; |
| 22 | 26 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
@@ -795,6 +799,11 @@ discard block |
||
| 795 | 799 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 796 | 800 | return $all; |
| 797 | 801 | } |
| 802 | + |
|
| 803 | + /** |
|
| 804 | + * @param string $type |
|
| 805 | + * @param string $year |
|
| 806 | + */ |
|
| 798 | 807 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') { |
| 799 | 808 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 800 | 809 | global $globalArchiveMonths, $globalDBdriver; |
@@ -900,6 +909,10 @@ discard block |
||
| 900 | 909 | return $all[0]['total']; |
| 901 | 910 | } |
| 902 | 911 | |
| 912 | + /** |
|
| 913 | + * @param string $type |
|
| 914 | + * @param string $stats_date |
|
| 915 | + */ |
|
| 903 | 916 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 904 | 917 | global $globalDBdriver; |
| 905 | 918 | if ($filter_name == '') $filter_name = $this->filter_name; |
@@ -933,6 +946,10 @@ discard block |
||
| 933 | 946 | return "error : ".$e->getMessage(); |
| 934 | 947 | } |
| 935 | 948 | } |
| 949 | + |
|
| 950 | + /** |
|
| 951 | + * @param string $date |
|
| 952 | + */ |
|
| 936 | 953 | public function getStatsSource($date,$stats_type = '') { |
| 937 | 954 | if ($stats_type == '') { |
| 938 | 955 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -951,6 +968,9 @@ discard block |
||
| 951 | 968 | return $all; |
| 952 | 969 | } |
| 953 | 970 | |
| 971 | + /** |
|
| 972 | + * @param string $stats_type |
|
| 973 | + */ |
|
| 954 | 974 | public function addStatSource($data,$source_name,$stats_type,$date) { |
| 955 | 975 | global $globalDBdriver; |
| 956 | 976 | if ($globalDBdriver == 'mysql') { |
@@ -966,6 +986,10 @@ discard block |
||
| 966 | 986 | return "error : ".$e->getMessage(); |
| 967 | 987 | } |
| 968 | 988 | } |
| 989 | + |
|
| 990 | + /** |
|
| 991 | + * @param string $type |
|
| 992 | + */ |
|
| 969 | 993 | public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
| 970 | 994 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 971 | 995 | $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
@@ -1160,6 +1184,10 @@ discard block |
||
| 1160 | 1184 | return "error : ".$e->getMessage(); |
| 1161 | 1185 | } |
| 1162 | 1186 | } |
| 1187 | + |
|
| 1188 | + /** |
|
| 1189 | + * @param string $type |
|
| 1190 | + */ |
|
| 1163 | 1191 | public function deleteStatFlight($type) { |
| 1164 | 1192 | $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
| 1165 | 1193 | $query_values = array(':type' => $type); |
@@ -1170,6 +1198,10 @@ discard block |
||
| 1170 | 1198 | return "error : ".$e->getMessage(); |
| 1171 | 1199 | } |
| 1172 | 1200 | } |
| 1201 | + |
|
| 1202 | + /** |
|
| 1203 | + * @param string $type |
|
| 1204 | + */ |
|
| 1173 | 1205 | public function deleteStatAirport($type) { |
| 1174 | 1206 | $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
| 1175 | 1207 | $query_values = array(':type' => $type); |
@@ -15,33 +15,33 @@ discard block |
||
| 15 | 15 | if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
| 16 | 16 | $Connection = new Connection($dbc); |
| 17 | 17 | $this->db = $Connection->db(); |
| 18 | - } |
|
| 18 | + } |
|
| 19 | 19 | |
| 20 | 20 | public function addLastStatsUpdate($type,$stats_date) { |
| 21 | - $query = "DELETE FROM config WHERE name = :type; |
|
| 21 | + $query = "DELETE FROM config WHERE name = :type; |
|
| 22 | 22 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 23 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 24 | - try { |
|
| 25 | - $sth = $this->db->prepare($query); |
|
| 26 | - $sth->execute($query_values); |
|
| 27 | - } catch(PDOException $e) { |
|
| 28 | - return "error : ".$e->getMessage(); |
|
| 29 | - } |
|
| 30 | - } |
|
| 23 | + $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 24 | + try { |
|
| 25 | + $sth = $this->db->prepare($query); |
|
| 26 | + $sth->execute($query_values); |
|
| 27 | + } catch(PDOException $e) { |
|
| 28 | + return "error : ".$e->getMessage(); |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | 32 | public function getLastStatsUpdate($type = 'last_update_stats') { |
| 33 | - $query = "SELECT value FROM config WHERE name = :type"; |
|
| 34 | - try { |
|
| 35 | - $sth = $this->db->prepare($query); |
|
| 36 | - $sth->execute(array(':type' => $type)); |
|
| 37 | - } catch(PDOException $e) { |
|
| 38 | - echo "error : ".$e->getMessage(); |
|
| 39 | - } |
|
| 40 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 41 | - return $all; |
|
| 42 | - } |
|
| 43 | - public function deleteStats($filter_name = '') { |
|
| 44 | - /* |
|
| 33 | + $query = "SELECT value FROM config WHERE name = :type"; |
|
| 34 | + try { |
|
| 35 | + $sth = $this->db->prepare($query); |
|
| 36 | + $sth->execute(array(':type' => $type)); |
|
| 37 | + } catch(PDOException $e) { |
|
| 38 | + echo "error : ".$e->getMessage(); |
|
| 39 | + } |
|
| 40 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 41 | + return $all; |
|
| 42 | + } |
|
| 43 | + public function deleteStats($filter_name = '') { |
|
| 44 | + /* |
|
| 45 | 45 | $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
| 46 | 46 | try { |
| 47 | 47 | $sth = $this->db->prepare($query); |
@@ -50,80 +50,80 @@ discard block |
||
| 50 | 50 | return "error : ".$e->getMessage(); |
| 51 | 51 | } |
| 52 | 52 | */ |
| 53 | - $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;"; |
|
| 54 | - try { |
|
| 55 | - $sth = $this->db->prepare($query); |
|
| 56 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 57 | - } catch(PDOException $e) { |
|
| 58 | - return "error : ".$e->getMessage(); |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - public function deleteOldStats($filter_name = '') { |
|
| 53 | + $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;"; |
|
| 54 | + try { |
|
| 55 | + $sth = $this->db->prepare($query); |
|
| 56 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 57 | + } catch(PDOException $e) { |
|
| 58 | + return "error : ".$e->getMessage(); |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + public function deleteOldStats($filter_name = '') { |
|
| 62 | 62 | |
| 63 | - $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 64 | - try { |
|
| 65 | - $sth = $this->db->prepare($query); |
|
| 66 | - $sth->execute(); |
|
| 67 | - } catch(PDOException $e) { |
|
| 68 | - return "error : ".$e->getMessage(); |
|
| 69 | - } |
|
| 63 | + $query = "DELETE FROM config WHERE name = 'last_update_stats'"; |
|
| 64 | + try { |
|
| 65 | + $sth = $this->db->prepare($query); |
|
| 66 | + $sth->execute(); |
|
| 67 | + } catch(PDOException $e) { |
|
| 68 | + return "error : ".$e->getMessage(); |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | - $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;"; |
|
| 72 | - try { |
|
| 73 | - $sth = $this->db->prepare($query); |
|
| 74 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 75 | - } catch(PDOException $e) { |
|
| 76 | - return "error : ".$e->getMessage(); |
|
| 77 | - } |
|
| 78 | - } |
|
| 71 | + $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;"; |
|
| 72 | + try { |
|
| 73 | + $sth = $this->db->prepare($query); |
|
| 74 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 75 | + } catch(PDOException $e) { |
|
| 76 | + return "error : ".$e->getMessage(); |
|
| 77 | + } |
|
| 78 | + } |
|
| 79 | 79 | public function getAllAirlineNames($filter_name = '') { |
| 80 | 80 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 81 | - $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 82 | - try { |
|
| 83 | - $sth = $this->db->prepare($query); |
|
| 84 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 85 | - } catch(PDOException $e) { |
|
| 86 | - echo "error : ".$e->getMessage(); |
|
| 87 | - } |
|
| 88 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 89 | - return $all; |
|
| 90 | - } |
|
| 81 | + $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
|
| 82 | + try { |
|
| 83 | + $sth = $this->db->prepare($query); |
|
| 84 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 85 | + } catch(PDOException $e) { |
|
| 86 | + echo "error : ".$e->getMessage(); |
|
| 87 | + } |
|
| 88 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 89 | + return $all; |
|
| 90 | + } |
|
| 91 | 91 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 92 | 92 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 93 | - $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 94 | - try { |
|
| 95 | - $sth = $this->db->prepare($query); |
|
| 96 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 97 | - } catch(PDOException $e) { |
|
| 98 | - echo "error : ".$e->getMessage(); |
|
| 99 | - } |
|
| 100 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 101 | - return $all; |
|
| 102 | - } |
|
| 93 | + $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
|
| 94 | + try { |
|
| 95 | + $sth = $this->db->prepare($query); |
|
| 96 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 97 | + } catch(PDOException $e) { |
|
| 98 | + echo "error : ".$e->getMessage(); |
|
| 99 | + } |
|
| 100 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 101 | + return $all; |
|
| 102 | + } |
|
| 103 | 103 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 104 | 104 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 105 | - $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 106 | - try { |
|
| 107 | - $sth = $this->db->prepare($query); |
|
| 108 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 109 | - } catch(PDOException $e) { |
|
| 110 | - echo "error : ".$e->getMessage(); |
|
| 111 | - } |
|
| 112 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 113 | - return $all; |
|
| 114 | - } |
|
| 105 | + $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
|
| 106 | + try { |
|
| 107 | + $sth = $this->db->prepare($query); |
|
| 108 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 109 | + } catch(PDOException $e) { |
|
| 110 | + echo "error : ".$e->getMessage(); |
|
| 111 | + } |
|
| 112 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 113 | + return $all; |
|
| 114 | + } |
|
| 115 | 115 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 116 | 116 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 117 | - $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 118 | - try { |
|
| 119 | - $sth = $this->db->prepare($query); |
|
| 120 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 121 | - } catch(PDOException $e) { |
|
| 122 | - echo "error : ".$e->getMessage(); |
|
| 123 | - } |
|
| 124 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 125 | - return $all; |
|
| 126 | - } |
|
| 117 | + $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
|
| 118 | + try { |
|
| 119 | + $sth = $this->db->prepare($query); |
|
| 120 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 121 | + } catch(PDOException $e) { |
|
| 122 | + echo "error : ".$e->getMessage(); |
|
| 123 | + } |
|
| 124 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 125 | + return $all; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | 128 | |
| 129 | 129 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') { |
@@ -131,66 +131,66 @@ discard block |
||
| 131 | 131 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 132 | 132 | if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
| 133 | 133 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
| 134 | - try { |
|
| 135 | - $sth = $this->db->prepare($query); |
|
| 136 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 137 | - } catch(PDOException $e) { |
|
| 138 | - echo "error : ".$e->getMessage(); |
|
| 139 | - } |
|
| 140 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 141 | - if (empty($all)) { |
|
| 142 | - $filters = array('airlines' => array($stats_airline)); |
|
| 143 | - if ($filter_name != '') { |
|
| 144 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 145 | - } |
|
| 146 | - $Spotter = new Spotter($this->db); |
|
| 147 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 148 | - } |
|
| 149 | - return $all; |
|
| 134 | + try { |
|
| 135 | + $sth = $this->db->prepare($query); |
|
| 136 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 137 | + } catch(PDOException $e) { |
|
| 138 | + echo "error : ".$e->getMessage(); |
|
| 139 | + } |
|
| 140 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 141 | + if (empty($all)) { |
|
| 142 | + $filters = array('airlines' => array($stats_airline)); |
|
| 143 | + if ($filter_name != '') { |
|
| 144 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 145 | + } |
|
| 146 | + $Spotter = new Spotter($this->db); |
|
| 147 | + $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 148 | + } |
|
| 149 | + return $all; |
|
| 150 | 150 | } |
| 151 | 151 | public function countAllAirlineCountries($limit = true,$filter_name = '') { |
| 152 | 152 | global $globalStatsFilters; |
| 153 | 153 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 154 | 154 | if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
| 155 | 155 | else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC"; |
| 156 | - try { |
|
| 157 | - $sth = $this->db->prepare($query); |
|
| 158 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 159 | - } catch(PDOException $e) { |
|
| 160 | - echo "error : ".$e->getMessage(); |
|
| 161 | - } |
|
| 162 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 163 | - if (empty($all)) { |
|
| 164 | - $Spotter = new Spotter($this->db); |
|
| 165 | - $filters = array(); |
|
| 166 | - if ($filter_name != '') { |
|
| 167 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 168 | - } |
|
| 169 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 170 | - } |
|
| 171 | - return $all; |
|
| 156 | + try { |
|
| 157 | + $sth = $this->db->prepare($query); |
|
| 158 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 159 | + } catch(PDOException $e) { |
|
| 160 | + echo "error : ".$e->getMessage(); |
|
| 161 | + } |
|
| 162 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 163 | + if (empty($all)) { |
|
| 164 | + $Spotter = new Spotter($this->db); |
|
| 165 | + $filters = array(); |
|
| 166 | + if ($filter_name != '') { |
|
| 167 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 168 | + } |
|
| 169 | + $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 170 | + } |
|
| 171 | + return $all; |
|
| 172 | 172 | } |
| 173 | 173 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') { |
| 174 | 174 | global $globalStatsFilters; |
| 175 | 175 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 176 | 176 | 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"; |
| 177 | 177 | 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"; |
| 178 | - try { |
|
| 179 | - $sth = $this->db->prepare($query); |
|
| 180 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 181 | - } catch(PDOException $e) { |
|
| 182 | - echo "error : ".$e->getMessage(); |
|
| 183 | - } |
|
| 184 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 185 | - if (empty($all)) { |
|
| 186 | - $filters = array('airlines' => array($stats_airline)); |
|
| 187 | - if ($filter_name != '') { |
|
| 188 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 178 | + try { |
|
| 179 | + $sth = $this->db->prepare($query); |
|
| 180 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 181 | + } catch(PDOException $e) { |
|
| 182 | + echo "error : ".$e->getMessage(); |
|
| 183 | + } |
|
| 184 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 185 | + if (empty($all)) { |
|
| 186 | + $filters = array('airlines' => array($stats_airline)); |
|
| 187 | + if ($filter_name != '') { |
|
| 188 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 189 | 189 | } |
| 190 | - $Spotter = new Spotter($this->db); |
|
| 190 | + $Spotter = new Spotter($this->db); |
|
| 191 | 191 | $all = $Spotter->countAllAircraftManufacturers($filters); |
| 192 | - } |
|
| 193 | - return $all; |
|
| 192 | + } |
|
| 193 | + return $all; |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') { |
@@ -198,44 +198,44 @@ discard block |
||
| 198 | 198 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 199 | 199 | if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
| 200 | 200 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
| 201 | - try { |
|
| 202 | - $sth = $this->db->prepare($query); |
|
| 203 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 204 | - } catch(PDOException $e) { |
|
| 205 | - echo "error : ".$e->getMessage(); |
|
| 206 | - } |
|
| 207 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 208 | - if (empty($all)) { |
|
| 201 | + try { |
|
| 202 | + $sth = $this->db->prepare($query); |
|
| 203 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 204 | + } catch(PDOException $e) { |
|
| 205 | + echo "error : ".$e->getMessage(); |
|
| 206 | + } |
|
| 207 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 208 | + if (empty($all)) { |
|
| 209 | 209 | $filters = array('airlines' => array($stats_airline)); |
| 210 | 210 | if ($filter_name != '') { |
| 211 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 211 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 212 | 212 | } |
| 213 | 213 | $Spotter = new Spotter($this->db); |
| 214 | 214 | $all = $Spotter->countAllArrivalCountries($limit,$filters); |
| 215 | - } |
|
| 216 | - return $all; |
|
| 215 | + } |
|
| 216 | + return $all; |
|
| 217 | 217 | } |
| 218 | 218 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') { |
| 219 | 219 | global $globalStatsFilters; |
| 220 | 220 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 221 | 221 | if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
| 222 | 222 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
| 223 | - try { |
|
| 224 | - $sth = $this->db->prepare($query); |
|
| 225 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 226 | - } catch(PDOException $e) { |
|
| 227 | - echo "error : ".$e->getMessage(); |
|
| 228 | - } |
|
| 229 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 230 | - if (empty($all)) { |
|
| 223 | + try { |
|
| 224 | + $sth = $this->db->prepare($query); |
|
| 225 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 226 | + } catch(PDOException $e) { |
|
| 227 | + echo "error : ".$e->getMessage(); |
|
| 228 | + } |
|
| 229 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 230 | + if (empty($all)) { |
|
| 231 | 231 | $filters = array('airlines' => array($stats_airline)); |
| 232 | 232 | if ($filter_name != '') { |
| 233 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 233 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 234 | 234 | } |
| 235 | 235 | $Spotter = new Spotter($this->db); |
| 236 | 236 | $all = $Spotter->countAllDepartureCountries($filters); |
| 237 | - } |
|
| 238 | - return $all; |
|
| 237 | + } |
|
| 238 | + return $all; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | public function countAllAirlines($limit = true,$filter_name = '') { |
@@ -243,45 +243,45 @@ discard block |
||
| 243 | 243 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 244 | 244 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 245 | 245 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC"; |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo "error : ".$e->getMessage(); |
|
| 251 | - } |
|
| 252 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 253 | - if (empty($all)) { |
|
| 254 | - $Spotter = new Spotter($this->db); |
|
| 255 | - $filters = array(); |
|
| 256 | - if ($filter_name != '') { |
|
| 257 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo "error : ".$e->getMessage(); |
|
| 251 | + } |
|
| 252 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 253 | + if (empty($all)) { |
|
| 254 | + $Spotter = new Spotter($this->db); |
|
| 255 | + $filters = array(); |
|
| 256 | + if ($filter_name != '') { |
|
| 257 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 261 | - } |
|
| 262 | - return $all; |
|
| 260 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 261 | + } |
|
| 262 | + return $all; |
|
| 263 | 263 | } |
| 264 | 264 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') { |
| 265 | 265 | global $globalStatsFilters; |
| 266 | 266 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 267 | 267 | 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"; |
| 268 | 268 | 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"; |
| 269 | - try { |
|
| 270 | - $sth = $this->db->prepare($query); |
|
| 271 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 272 | - } catch(PDOException $e) { |
|
| 273 | - echo "error : ".$e->getMessage(); |
|
| 274 | - } |
|
| 275 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 276 | - if (empty($all)) { |
|
| 269 | + try { |
|
| 270 | + $sth = $this->db->prepare($query); |
|
| 271 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 272 | + } catch(PDOException $e) { |
|
| 273 | + echo "error : ".$e->getMessage(); |
|
| 274 | + } |
|
| 275 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 276 | + if (empty($all)) { |
|
| 277 | 277 | $filters = array('airlines' => array($stats_airline)); |
| 278 | 278 | if ($filter_name != '') { |
| 279 | 279 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 280 | 280 | } |
| 281 | - $Spotter = new Spotter($this->db); |
|
| 282 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 283 | - } |
|
| 284 | - return $all; |
|
| 281 | + $Spotter = new Spotter($this->db); |
|
| 282 | + $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 283 | + } |
|
| 284 | + return $all; |
|
| 285 | 285 | } |
| 286 | 286 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') { |
| 287 | 287 | global $globalStatsFilters; |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | echo "error : ".$e->getMessage(); |
| 319 | 319 | } |
| 320 | 320 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 321 | - /* |
|
| 321 | + /* |
|
| 322 | 322 | if (empty($all)) { |
| 323 | 323 | $Spotter = new Spotter($this->db); |
| 324 | 324 | $all = $Spotter->countAllFlightOverCountries($limit); |
@@ -334,84 +334,84 @@ discard block |
||
| 334 | 334 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 335 | 335 | 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"; |
| 336 | 336 | 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"; |
| 337 | - try { |
|
| 338 | - $sth = $this->db->prepare($query); |
|
| 339 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 340 | - } catch(PDOException $e) { |
|
| 341 | - echo "error : ".$e->getMessage(); |
|
| 342 | - } |
|
| 343 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 344 | - if (empty($all)) { |
|
| 337 | + try { |
|
| 338 | + $sth = $this->db->prepare($query); |
|
| 339 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 340 | + } catch(PDOException $e) { |
|
| 341 | + echo "error : ".$e->getMessage(); |
|
| 342 | + } |
|
| 343 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 344 | + if (empty($all)) { |
|
| 345 | 345 | $filters = array('airlines' => array($stats_airline)); |
| 346 | 346 | if ($filter_name != '') { |
| 347 | 347 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 348 | 348 | } |
| 349 | - $Spotter = new Spotter($this->db); |
|
| 350 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 351 | - } |
|
| 352 | - return $all; |
|
| 349 | + $Spotter = new Spotter($this->db); |
|
| 350 | + $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 351 | + } |
|
| 352 | + return $all; |
|
| 353 | 353 | } |
| 354 | 354 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') { |
| 355 | 355 | global $globalStatsFilters; |
| 356 | 356 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 357 | 357 | 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"; |
| 358 | 358 | 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"; |
| 359 | - try { |
|
| 360 | - $sth = $this->db->prepare($query); |
|
| 361 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 362 | - } catch(PDOException $e) { |
|
| 363 | - echo "error : ".$e->getMessage(); |
|
| 364 | - } |
|
| 365 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 366 | - if (empty($all)) { |
|
| 359 | + try { |
|
| 360 | + $sth = $this->db->prepare($query); |
|
| 361 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 362 | + } catch(PDOException $e) { |
|
| 363 | + echo "error : ".$e->getMessage(); |
|
| 364 | + } |
|
| 365 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 366 | + if (empty($all)) { |
|
| 367 | 367 | $filters = array('airlines' => array($stats_airline)); |
| 368 | 368 | if ($filter_name != '') { |
| 369 | 369 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 370 | 370 | } |
| 371 | - $Spotter = new Spotter($this->db); |
|
| 372 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 373 | - } |
|
| 374 | - return $all; |
|
| 371 | + $Spotter = new Spotter($this->db); |
|
| 372 | + $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 373 | + } |
|
| 374 | + return $all; |
|
| 375 | 375 | } |
| 376 | 376 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') { |
| 377 | 377 | global $globalStatsFilters; |
| 378 | 378 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 379 | 379 | if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
| 380 | 380 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 381 | - try { |
|
| 382 | - $sth = $this->db->prepare($query); |
|
| 383 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 384 | - } catch(PDOException $e) { |
|
| 385 | - echo "error : ".$e->getMessage(); |
|
| 386 | - } |
|
| 387 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 388 | - if (empty($all)) { |
|
| 381 | + try { |
|
| 382 | + $sth = $this->db->prepare($query); |
|
| 383 | + $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 384 | + } catch(PDOException $e) { |
|
| 385 | + echo "error : ".$e->getMessage(); |
|
| 386 | + } |
|
| 387 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 388 | + if (empty($all)) { |
|
| 389 | 389 | $filters = array('airlines' => array($stats_airline)); |
| 390 | - if ($filter_name != '') { |
|
| 391 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 392 | - } |
|
| 393 | - $Spotter = new Spotter($this->db); |
|
| 394 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 395 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 396 | - $all = array(); |
|
| 397 | - foreach ($pall as $value) { |
|
| 398 | - $icao = $value['airport_departure_icao']; |
|
| 399 | - $all[$icao] = $value; |
|
| 400 | - } |
|
| 390 | + if ($filter_name != '') { |
|
| 391 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 392 | + } |
|
| 393 | + $Spotter = new Spotter($this->db); |
|
| 394 | + $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 395 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 396 | + $all = array(); |
|
| 397 | + foreach ($pall as $value) { |
|
| 398 | + $icao = $value['airport_departure_icao']; |
|
| 399 | + $all[$icao] = $value; |
|
| 400 | + } |
|
| 401 | 401 | |
| 402 | - foreach ($dall as $value) { |
|
| 403 | - $icao = $value['airport_departure_icao']; |
|
| 404 | - if (isset($all[$icao])) { |
|
| 405 | - $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 406 | - } else $all[$icao] = $value; |
|
| 407 | - } |
|
| 408 | - $count = array(); |
|
| 409 | - foreach ($all as $key => $row) { |
|
| 410 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 411 | - } |
|
| 412 | - array_multisort($count,SORT_DESC,$all); |
|
| 413 | - } |
|
| 414 | - return $all; |
|
| 402 | + foreach ($dall as $value) { |
|
| 403 | + $icao = $value['airport_departure_icao']; |
|
| 404 | + if (isset($all[$icao])) { |
|
| 405 | + $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 406 | + } else $all[$icao] = $value; |
|
| 407 | + } |
|
| 408 | + $count = array(); |
|
| 409 | + foreach ($all as $key => $row) { |
|
| 410 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 411 | + } |
|
| 412 | + array_multisort($count,SORT_DESC,$all); |
|
| 413 | + } |
|
| 414 | + return $all; |
|
| 415 | 415 | } |
| 416 | 416 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') { |
| 417 | 417 | global $globalStatsFilters; |
@@ -433,26 +433,26 @@ discard block |
||
| 433 | 433 | $Spotter = new Spotter($this->db); |
| 434 | 434 | $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
| 435 | 435 | $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
| 436 | - $all = array(); |
|
| 437 | - foreach ($pall as $value) { |
|
| 438 | - $icao = $value['airport_arrival_icao']; |
|
| 439 | - $all[$icao] = $value; |
|
| 440 | - } |
|
| 436 | + $all = array(); |
|
| 437 | + foreach ($pall as $value) { |
|
| 438 | + $icao = $value['airport_arrival_icao']; |
|
| 439 | + $all[$icao] = $value; |
|
| 440 | + } |
|
| 441 | 441 | |
| 442 | - foreach ($dall as $value) { |
|
| 443 | - $icao = $value['airport_arrival_icao']; |
|
| 444 | - if (isset($all[$icao])) { |
|
| 445 | - $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 446 | - } else $all[$icao] = $value; |
|
| 447 | - } |
|
| 448 | - $count = array(); |
|
| 449 | - foreach ($all as $key => $row) { |
|
| 450 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 451 | - } |
|
| 452 | - array_multisort($count,SORT_DESC,$all); |
|
| 453 | - } |
|
| 442 | + foreach ($dall as $value) { |
|
| 443 | + $icao = $value['airport_arrival_icao']; |
|
| 444 | + if (isset($all[$icao])) { |
|
| 445 | + $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 446 | + } else $all[$icao] = $value; |
|
| 447 | + } |
|
| 448 | + $count = array(); |
|
| 449 | + foreach ($all as $key => $row) { |
|
| 450 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 451 | + } |
|
| 452 | + array_multisort($count,SORT_DESC,$all); |
|
| 453 | + } |
|
| 454 | 454 | |
| 455 | - return $all; |
|
| 455 | + return $all; |
|
| 456 | 456 | } |
| 457 | 457 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 458 | 458 | global $globalDBdriver, $globalStatsFilters; |
@@ -465,23 +465,23 @@ discard block |
||
| 465 | 465 | 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"; |
| 466 | 466 | } |
| 467 | 467 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 468 | - try { |
|
| 469 | - $sth = $this->db->prepare($query); |
|
| 470 | - $sth->execute($query_data); |
|
| 471 | - } catch(PDOException $e) { |
|
| 472 | - echo "error : ".$e->getMessage(); |
|
| 473 | - } |
|
| 474 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 475 | - if (empty($all)) { |
|
| 468 | + try { |
|
| 469 | + $sth = $this->db->prepare($query); |
|
| 470 | + $sth->execute($query_data); |
|
| 471 | + } catch(PDOException $e) { |
|
| 472 | + echo "error : ".$e->getMessage(); |
|
| 473 | + } |
|
| 474 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 475 | + if (empty($all)) { |
|
| 476 | 476 | $filters = array('airlines' => array($stats_airline)); |
| 477 | 477 | if ($filter_name != '') { |
| 478 | 478 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 479 | 479 | } |
| 480 | - $Spotter = new Spotter($this->db); |
|
| 481 | - $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 482 | - } |
|
| 480 | + $Spotter = new Spotter($this->db); |
|
| 481 | + $all = $Spotter->countAllMonthsLastYear($filters); |
|
| 482 | + } |
|
| 483 | 483 | |
| 484 | - return $all; |
|
| 484 | + return $all; |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
@@ -489,22 +489,22 @@ discard block |
||
| 489 | 489 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 490 | 490 | $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"; |
| 491 | 491 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 492 | - try { |
|
| 493 | - $sth = $this->db->prepare($query); |
|
| 494 | - $sth->execute($query_data); |
|
| 495 | - } catch(PDOException $e) { |
|
| 496 | - echo "error : ".$e->getMessage(); |
|
| 497 | - } |
|
| 498 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 499 | - if (empty($all)) { |
|
| 492 | + try { |
|
| 493 | + $sth = $this->db->prepare($query); |
|
| 494 | + $sth->execute($query_data); |
|
| 495 | + } catch(PDOException $e) { |
|
| 496 | + echo "error : ".$e->getMessage(); |
|
| 497 | + } |
|
| 498 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 499 | + if (empty($all)) { |
|
| 500 | 500 | $filters = array('airlines' => array($stats_airline)); |
| 501 | 501 | if ($filter_name != '') { |
| 502 | 502 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 503 | 503 | } |
| 504 | - $Spotter = new Spotter($this->db); |
|
| 505 | - $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 506 | - } |
|
| 507 | - return $all; |
|
| 504 | + $Spotter = new Spotter($this->db); |
|
| 505 | + $all = $Spotter->countAllDatesLastMonth($filters); |
|
| 506 | + } |
|
| 507 | + return $all; |
|
| 508 | 508 | } |
| 509 | 509 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 510 | 510 | global $globalDBdriver, $globalStatsFilters; |
@@ -515,108 +515,108 @@ discard block |
||
| 515 | 515 | $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"; |
| 516 | 516 | } |
| 517 | 517 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 518 | - try { |
|
| 519 | - $sth = $this->db->prepare($query); |
|
| 520 | - $sth->execute($query_data); |
|
| 521 | - } catch(PDOException $e) { |
|
| 522 | - echo "error : ".$e->getMessage(); |
|
| 523 | - } |
|
| 524 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 525 | - if (empty($all)) { |
|
| 518 | + try { |
|
| 519 | + $sth = $this->db->prepare($query); |
|
| 520 | + $sth->execute($query_data); |
|
| 521 | + } catch(PDOException $e) { |
|
| 522 | + echo "error : ".$e->getMessage(); |
|
| 523 | + } |
|
| 524 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 525 | + if (empty($all)) { |
|
| 526 | 526 | $filters = array('airlines' => array($stats_airline)); |
| 527 | 527 | if ($filter_name != '') { |
| 528 | 528 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 529 | 529 | } |
| 530 | - $Spotter = new Spotter($this->db); |
|
| 531 | - $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 532 | - } |
|
| 533 | - return $all; |
|
| 530 | + $Spotter = new Spotter($this->db); |
|
| 531 | + $all = $Spotter->countAllDatesLast7Days($filters); |
|
| 532 | + } |
|
| 533 | + return $all; |
|
| 534 | 534 | } |
| 535 | 535 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 536 | 536 | global $globalStatsFilters; |
| 537 | 537 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 538 | 538 | $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"; |
| 539 | 539 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 540 | - try { |
|
| 541 | - $sth = $this->db->prepare($query); |
|
| 542 | - $sth->execute($query_data); |
|
| 543 | - } catch(PDOException $e) { |
|
| 544 | - echo "error : ".$e->getMessage(); |
|
| 545 | - } |
|
| 546 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 547 | - if (empty($all)) { |
|
| 540 | + try { |
|
| 541 | + $sth = $this->db->prepare($query); |
|
| 542 | + $sth->execute($query_data); |
|
| 543 | + } catch(PDOException $e) { |
|
| 544 | + echo "error : ".$e->getMessage(); |
|
| 545 | + } |
|
| 546 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 547 | + if (empty($all)) { |
|
| 548 | 548 | $filters = array('airlines' => array($stats_airline)); |
| 549 | 549 | if ($filter_name != '') { |
| 550 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 550 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 551 | 551 | } |
| 552 | - $Spotter = new Spotter($this->db); |
|
| 553 | - $all = $Spotter->countAllDates($filters); |
|
| 554 | - } |
|
| 555 | - return $all; |
|
| 552 | + $Spotter = new Spotter($this->db); |
|
| 553 | + $all = $Spotter->countAllDates($filters); |
|
| 554 | + } |
|
| 555 | + return $all; |
|
| 556 | 556 | } |
| 557 | 557 | public function countAllDatesByAirlines($filter_name = '') { |
| 558 | 558 | global $globalStatsFilters; |
| 559 | 559 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 560 | 560 | $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"; |
| 561 | 561 | $query_data = array('filter_name' => $filter_name); |
| 562 | - try { |
|
| 563 | - $sth = $this->db->prepare($query); |
|
| 564 | - $sth->execute($query_data); |
|
| 565 | - } catch(PDOException $e) { |
|
| 566 | - echo "error : ".$e->getMessage(); |
|
| 567 | - } |
|
| 568 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 569 | - if (empty($all)) { |
|
| 570 | - $filters = array(); |
|
| 571 | - if ($filter_name != '') { |
|
| 572 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 573 | - } |
|
| 574 | - $Spotter = new Spotter($this->db); |
|
| 575 | - $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 576 | - } |
|
| 577 | - return $all; |
|
| 562 | + try { |
|
| 563 | + $sth = $this->db->prepare($query); |
|
| 564 | + $sth->execute($query_data); |
|
| 565 | + } catch(PDOException $e) { |
|
| 566 | + echo "error : ".$e->getMessage(); |
|
| 567 | + } |
|
| 568 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 569 | + if (empty($all)) { |
|
| 570 | + $filters = array(); |
|
| 571 | + if ($filter_name != '') { |
|
| 572 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 573 | + } |
|
| 574 | + $Spotter = new Spotter($this->db); |
|
| 575 | + $all = $Spotter->countAllDatesByAirlines($filters); |
|
| 576 | + } |
|
| 577 | + return $all; |
|
| 578 | 578 | } |
| 579 | 579 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 580 | 580 | global $globalStatsFilters; |
| 581 | 581 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 582 | - $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"; |
|
| 583 | - try { |
|
| 584 | - $sth = $this->db->prepare($query); |
|
| 585 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 586 | - } catch(PDOException $e) { |
|
| 587 | - echo "error : ".$e->getMessage(); |
|
| 588 | - } |
|
| 589 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 590 | - if (empty($all)) { |
|
| 582 | + $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"; |
|
| 583 | + try { |
|
| 584 | + $sth = $this->db->prepare($query); |
|
| 585 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 586 | + } catch(PDOException $e) { |
|
| 587 | + echo "error : ".$e->getMessage(); |
|
| 588 | + } |
|
| 589 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 590 | + if (empty($all)) { |
|
| 591 | 591 | $filters = array('airlines' => array($stats_airline)); |
| 592 | 592 | if ($filter_name != '') { |
| 593 | 593 | $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
| 594 | 594 | } |
| 595 | - $Spotter = new Spotter($this->db); |
|
| 596 | - $all = $Spotter->countAllMonths($filters); |
|
| 597 | - } |
|
| 598 | - return $all; |
|
| 595 | + $Spotter = new Spotter($this->db); |
|
| 596 | + $all = $Spotter->countAllMonths($filters); |
|
| 597 | + } |
|
| 598 | + return $all; |
|
| 599 | 599 | } |
| 600 | 600 | public function countAllMilitaryMonths($filter_name = '') { |
| 601 | 601 | global $globalStatsFilters; |
| 602 | 602 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 603 | - $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"; |
|
| 604 | - try { |
|
| 605 | - $sth = $this->db->prepare($query); |
|
| 606 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 607 | - } catch(PDOException $e) { |
|
| 608 | - echo "error : ".$e->getMessage(); |
|
| 609 | - } |
|
| 610 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 611 | - if (empty($all)) { |
|
| 612 | - $filters = array(); |
|
| 613 | - if ($filter_name != '') { |
|
| 614 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 615 | - } |
|
| 616 | - $Spotter = new Spotter($this->db); |
|
| 617 | - $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 618 | - } |
|
| 619 | - return $all; |
|
| 603 | + $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"; |
|
| 604 | + try { |
|
| 605 | + $sth = $this->db->prepare($query); |
|
| 606 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 607 | + } catch(PDOException $e) { |
|
| 608 | + echo "error : ".$e->getMessage(); |
|
| 609 | + } |
|
| 610 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 611 | + if (empty($all)) { |
|
| 612 | + $filters = array(); |
|
| 613 | + if ($filter_name != '') { |
|
| 614 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 615 | + } |
|
| 616 | + $Spotter = new Spotter($this->db); |
|
| 617 | + $all = $Spotter->countAllMilitaryMonths($filters); |
|
| 618 | + } |
|
| 619 | + return $all; |
|
| 620 | 620 | } |
| 621 | 621 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 622 | 622 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
@@ -632,22 +632,22 @@ discard block |
||
| 632 | 632 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 633 | 633 | } |
| 634 | 634 | if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
| 635 | - try { |
|
| 636 | - $sth = $this->db->prepare($query); |
|
| 637 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 638 | - } catch(PDOException $e) { |
|
| 639 | - echo "error : ".$e->getMessage(); |
|
| 640 | - } |
|
| 641 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 642 | - if (empty($all)) { |
|
| 635 | + try { |
|
| 636 | + $sth = $this->db->prepare($query); |
|
| 637 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 638 | + } catch(PDOException $e) { |
|
| 639 | + echo "error : ".$e->getMessage(); |
|
| 640 | + } |
|
| 641 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 642 | + if (empty($all)) { |
|
| 643 | 643 | $filters = array('airlines' => array($stats_airline)); |
| 644 | 644 | if ($filter_name != '') { |
| 645 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 645 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 646 | 646 | } |
| 647 | - $Spotter = new Spotter($this->db); |
|
| 648 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 649 | - } |
|
| 650 | - return $all; |
|
| 647 | + $Spotter = new Spotter($this->db); |
|
| 648 | + $all = $Spotter->countAllHours($orderby,$filters); |
|
| 649 | + } |
|
| 650 | + return $all; |
|
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | public function countOverallFlights($stats_airline = '', $filter_name = '') { |
@@ -669,9 +669,9 @@ discard block |
||
| 669 | 669 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 670 | 670 | $all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name); |
| 671 | 671 | if (empty($all)) { |
| 672 | - $filters = array(); |
|
| 673 | - if ($filter_name != '') { |
|
| 674 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 672 | + $filters = array(); |
|
| 673 | + if ($filter_name != '') { |
|
| 674 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 675 | 675 | } |
| 676 | 676 | $Spotter = new Spotter($this->db); |
| 677 | 677 | $all = $Spotter->countOverallMilitaryFlights($filters); |
@@ -710,19 +710,19 @@ discard block |
||
| 710 | 710 | global $globalStatsFilters; |
| 711 | 711 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 712 | 712 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 713 | - try { |
|
| 714 | - $sth = $this->db->prepare($query); |
|
| 715 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 716 | - } catch(PDOException $e) { |
|
| 717 | - echo "error : ".$e->getMessage(); |
|
| 718 | - } |
|
| 719 | - $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 720 | - $all = $result[0]['nb_airline']; |
|
| 713 | + try { |
|
| 714 | + $sth = $this->db->prepare($query); |
|
| 715 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 716 | + } catch(PDOException $e) { |
|
| 717 | + echo "error : ".$e->getMessage(); |
|
| 718 | + } |
|
| 719 | + $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 720 | + $all = $result[0]['nb_airline']; |
|
| 721 | 721 | //$all = $this->getSumStats('airlines_bymonth',date('Y')); |
| 722 | 722 | if (empty($all)) { |
| 723 | - $filters = array(); |
|
| 724 | - if ($filter_name != '') { |
|
| 725 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 723 | + $filters = array(); |
|
| 724 | + if ($filter_name != '') { |
|
| 725 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 726 | 726 | } |
| 727 | 727 | $Spotter = new Spotter($this->db); |
| 728 | 728 | $all = $Spotter->countOverallAirlines($filters); |
@@ -773,166 +773,166 @@ discard block |
||
| 773 | 773 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 774 | 774 | $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"; |
| 775 | 775 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 776 | - try { |
|
| 777 | - $sth = $this->db->prepare($query); |
|
| 778 | - $sth->execute($query_values); |
|
| 779 | - } catch(PDOException $e) { |
|
| 780 | - echo "error : ".$e->getMessage(); |
|
| 781 | - } |
|
| 782 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 783 | - return $all; |
|
| 776 | + try { |
|
| 777 | + $sth = $this->db->prepare($query); |
|
| 778 | + $sth->execute($query_values); |
|
| 779 | + } catch(PDOException $e) { |
|
| 780 | + echo "error : ".$e->getMessage(); |
|
| 781 | + } |
|
| 782 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 783 | + return $all; |
|
| 784 | 784 | } |
| 785 | 785 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 786 | 786 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 787 | - $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 788 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 789 | - try { |
|
| 790 | - $sth = $this->db->prepare($query); |
|
| 791 | - $sth->execute($query_values); |
|
| 792 | - } catch(PDOException $e) { |
|
| 793 | - echo "error : ".$e->getMessage(); |
|
| 794 | - } |
|
| 795 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 796 | - return $all; |
|
| 797 | - } |
|
| 787 | + $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
|
| 788 | + $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 789 | + try { |
|
| 790 | + $sth = $this->db->prepare($query); |
|
| 791 | + $sth->execute($query_values); |
|
| 792 | + } catch(PDOException $e) { |
|
| 793 | + echo "error : ".$e->getMessage(); |
|
| 794 | + } |
|
| 795 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 796 | + return $all; |
|
| 797 | + } |
|
| 798 | 798 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') { |
| 799 | 799 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 800 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 801 | - if ($globalDBdriver == 'mysql') { |
|
| 802 | - $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"; |
|
| 803 | - } else { |
|
| 804 | - $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"; |
|
| 805 | - } |
|
| 806 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 807 | - try { |
|
| 808 | - $sth = $this->db->prepare($query); |
|
| 809 | - $sth->execute($query_values); |
|
| 810 | - } catch(PDOException $e) { |
|
| 811 | - echo "error : ".$e->getMessage(); |
|
| 812 | - } |
|
| 813 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 814 | - return $all[0]['total']; |
|
| 815 | - } |
|
| 800 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 801 | + if ($globalDBdriver == 'mysql') { |
|
| 802 | + $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"; |
|
| 803 | + } else { |
|
| 804 | + $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"; |
|
| 805 | + } |
|
| 806 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 807 | + try { |
|
| 808 | + $sth = $this->db->prepare($query); |
|
| 809 | + $sth->execute($query_values); |
|
| 810 | + } catch(PDOException $e) { |
|
| 811 | + echo "error : ".$e->getMessage(); |
|
| 812 | + } |
|
| 813 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 814 | + return $all[0]['total']; |
|
| 815 | + } |
|
| 816 | 816 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 817 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 817 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 818 | 818 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 819 | - if ($globalDBdriver == 'mysql') { |
|
| 819 | + if ($globalDBdriver == 'mysql') { |
|
| 820 | 820 | $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"; |
| 821 | 821 | } else { |
| 822 | 822 | $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"; |
| 823 | - } |
|
| 824 | - $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 825 | - try { |
|
| 826 | - $sth = $this->db->prepare($query); |
|
| 827 | - $sth->execute($query_values); |
|
| 828 | - } catch(PDOException $e) { |
|
| 829 | - echo "error : ".$e->getMessage(); |
|
| 830 | - } |
|
| 831 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 832 | - return $all[0]['total']; |
|
| 833 | - } |
|
| 823 | + } |
|
| 824 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 825 | + try { |
|
| 826 | + $sth = $this->db->prepare($query); |
|
| 827 | + $sth->execute($query_values); |
|
| 828 | + } catch(PDOException $e) { |
|
| 829 | + echo "error : ".$e->getMessage(); |
|
| 830 | + } |
|
| 831 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 832 | + return $all[0]['total']; |
|
| 833 | + } |
|
| 834 | 834 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 835 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 835 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 836 | 836 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 837 | - if ($globalDBdriver == 'mysql') { |
|
| 837 | + if ($globalDBdriver == 'mysql') { |
|
| 838 | 838 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 839 | - } else { |
|
| 839 | + } else { |
|
| 840 | 840 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 841 | - } |
|
| 842 | - try { |
|
| 843 | - $sth = $this->db->prepare($query); |
|
| 844 | - $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 845 | - } catch(PDOException $e) { |
|
| 846 | - echo "error : ".$e->getMessage(); |
|
| 847 | - } |
|
| 848 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 849 | - return $all[0]['total']; |
|
| 850 | - } |
|
| 841 | + } |
|
| 842 | + try { |
|
| 843 | + $sth = $this->db->prepare($query); |
|
| 844 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 845 | + } catch(PDOException $e) { |
|
| 846 | + echo "error : ".$e->getMessage(); |
|
| 847 | + } |
|
| 848 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 849 | + return $all[0]['total']; |
|
| 850 | + } |
|
| 851 | 851 | public function getStatsAirlineTotal($filter_name = '') { |
| 852 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 852 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 853 | 853 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 854 | - if ($globalDBdriver == 'mysql') { |
|
| 854 | + if ($globalDBdriver == 'mysql') { |
|
| 855 | 855 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 856 | - } else { |
|
| 856 | + } else { |
|
| 857 | 857 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 858 | - } |
|
| 859 | - try { |
|
| 860 | - $sth = $this->db->prepare($query); |
|
| 861 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 862 | - } catch(PDOException $e) { |
|
| 863 | - echo "error : ".$e->getMessage(); |
|
| 864 | - } |
|
| 865 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 866 | - return $all[0]['total']; |
|
| 867 | - } |
|
| 858 | + } |
|
| 859 | + try { |
|
| 860 | + $sth = $this->db->prepare($query); |
|
| 861 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 862 | + } catch(PDOException $e) { |
|
| 863 | + echo "error : ".$e->getMessage(); |
|
| 864 | + } |
|
| 865 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 866 | + return $all[0]['total']; |
|
| 867 | + } |
|
| 868 | 868 | public function getStatsOwnerTotal($filter_name = '') { |
| 869 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 869 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 870 | 870 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 871 | - if ($globalDBdriver == 'mysql') { |
|
| 871 | + if ($globalDBdriver == 'mysql') { |
|
| 872 | 872 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 873 | 873 | } else { |
| 874 | 874 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 875 | - } |
|
| 876 | - try { |
|
| 877 | - $sth = $this->db->prepare($query); |
|
| 878 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 879 | - } catch(PDOException $e) { |
|
| 880 | - echo "error : ".$e->getMessage(); |
|
| 881 | - } |
|
| 882 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 883 | - return $all[0]['total']; |
|
| 884 | - } |
|
| 875 | + } |
|
| 876 | + try { |
|
| 877 | + $sth = $this->db->prepare($query); |
|
| 878 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 879 | + } catch(PDOException $e) { |
|
| 880 | + echo "error : ".$e->getMessage(); |
|
| 881 | + } |
|
| 882 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 883 | + return $all[0]['total']; |
|
| 884 | + } |
|
| 885 | 885 | public function getStatsPilotTotal($filter_name = '') { |
| 886 | - global $globalArchiveMonths, $globalDBdriver; |
|
| 886 | + global $globalArchiveMonths, $globalDBdriver; |
|
| 887 | 887 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 888 | - if ($globalDBdriver == 'mysql') { |
|
| 889 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 890 | - } else { |
|
| 891 | - $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 892 | - } |
|
| 893 | - try { |
|
| 894 | - $sth = $this->db->prepare($query); |
|
| 895 | - $sth->execute(array(':filter_name' => $filter_name)); |
|
| 896 | - } catch(PDOException $e) { |
|
| 897 | - echo "error : ".$e->getMessage(); |
|
| 898 | - } |
|
| 899 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 900 | - return $all[0]['total']; |
|
| 901 | - } |
|
| 888 | + if ($globalDBdriver == 'mysql') { |
|
| 889 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 890 | + } else { |
|
| 891 | + $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
|
| 892 | + } |
|
| 893 | + try { |
|
| 894 | + $sth = $this->db->prepare($query); |
|
| 895 | + $sth->execute(array(':filter_name' => $filter_name)); |
|
| 896 | + } catch(PDOException $e) { |
|
| 897 | + echo "error : ".$e->getMessage(); |
|
| 898 | + } |
|
| 899 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 900 | + return $all[0]['total']; |
|
| 901 | + } |
|
| 902 | 902 | |
| 903 | 903 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 904 | 904 | global $globalDBdriver; |
| 905 | 905 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 906 | 906 | if ($globalDBdriver == 'mysql') { |
| 907 | 907 | $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"; |
| 908 | - } else { |
|
| 908 | + } else { |
|
| 909 | 909 | $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);"; |
| 910 | 910 | } |
| 911 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 912 | - try { |
|
| 913 | - $sth = $this->db->prepare($query); |
|
| 914 | - $sth->execute($query_values); |
|
| 915 | - } catch(PDOException $e) { |
|
| 916 | - return "error : ".$e->getMessage(); |
|
| 917 | - } |
|
| 918 | - } |
|
| 911 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 912 | + try { |
|
| 913 | + $sth = $this->db->prepare($query); |
|
| 914 | + $sth->execute($query_values); |
|
| 915 | + } catch(PDOException $e) { |
|
| 916 | + return "error : ".$e->getMessage(); |
|
| 917 | + } |
|
| 918 | + } |
|
| 919 | 919 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 920 | 920 | global $globalDBdriver; |
| 921 | 921 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 922 | 922 | if ($globalDBdriver == 'mysql') { |
| 923 | 923 | $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"; |
| 924 | 924 | } else { |
| 925 | - //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 925 | + //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
|
| 926 | 926 | $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);"; |
| 927 | - } |
|
| 928 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 929 | - try { |
|
| 930 | - $sth = $this->db->prepare($query); |
|
| 931 | - $sth->execute($query_values); |
|
| 932 | - } catch(PDOException $e) { |
|
| 933 | - return "error : ".$e->getMessage(); |
|
| 934 | - } |
|
| 935 | - } |
|
| 927 | + } |
|
| 928 | + $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 929 | + try { |
|
| 930 | + $sth = $this->db->prepare($query); |
|
| 931 | + $sth->execute($query_values); |
|
| 932 | + } catch(PDOException $e) { |
|
| 933 | + return "error : ".$e->getMessage(); |
|
| 934 | + } |
|
| 935 | + } |
|
| 936 | 936 | public function getStatsSource($date,$stats_type = '') { |
| 937 | 937 | if ($stats_type == '') { |
| 938 | 938 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -941,15 +941,15 @@ discard block |
||
| 941 | 941 | $query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name"; |
| 942 | 942 | $query_values = array(':date' => $date,':stats_type' => $stats_type); |
| 943 | 943 | } |
| 944 | - try { |
|
| 945 | - $sth = $this->db->prepare($query); |
|
| 946 | - $sth->execute($query_values); |
|
| 947 | - } catch(PDOException $e) { |
|
| 948 | - echo "error : ".$e->getMessage(); |
|
| 949 | - } |
|
| 950 | - $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 951 | - return $all; |
|
| 952 | - } |
|
| 944 | + try { |
|
| 945 | + $sth = $this->db->prepare($query); |
|
| 946 | + $sth->execute($query_values); |
|
| 947 | + } catch(PDOException $e) { |
|
| 948 | + echo "error : ".$e->getMessage(); |
|
| 949 | + } |
|
| 950 | + $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 951 | + return $all; |
|
| 952 | + } |
|
| 953 | 953 | |
| 954 | 954 | public function addStatSource($data,$source_name,$stats_type,$date) { |
| 955 | 955 | global $globalDBdriver; |
@@ -957,25 +957,25 @@ discard block |
||
| 957 | 957 | $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"; |
| 958 | 958 | } else { |
| 959 | 959 | $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);"; |
| 960 | - } |
|
| 961 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 962 | - try { |
|
| 963 | - $sth = $this->db->prepare($query); |
|
| 964 | - $sth->execute($query_values); |
|
| 965 | - } catch(PDOException $e) { |
|
| 966 | - return "error : ".$e->getMessage(); |
|
| 967 | - } |
|
| 968 | - } |
|
| 960 | + } |
|
| 961 | + $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 962 | + try { |
|
| 963 | + $sth = $this->db->prepare($query); |
|
| 964 | + $sth->execute($query_values); |
|
| 965 | + } catch(PDOException $e) { |
|
| 966 | + return "error : ".$e->getMessage(); |
|
| 967 | + } |
|
| 968 | + } |
|
| 969 | 969 | public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
| 970 | - $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 971 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 972 | - try { |
|
| 973 | - $sth = $this->db->prepare($query); |
|
| 974 | - $sth->execute($query_values); |
|
| 975 | - } catch(PDOException $e) { |
|
| 976 | - return "error : ".$e->getMessage(); |
|
| 977 | - } |
|
| 978 | - } |
|
| 970 | + $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
|
| 971 | + $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 972 | + try { |
|
| 973 | + $sth = $this->db->prepare($query); |
|
| 974 | + $sth->execute($query_values); |
|
| 975 | + } catch(PDOException $e) { |
|
| 976 | + return "error : ".$e->getMessage(); |
|
| 977 | + } |
|
| 978 | + } |
|
| 979 | 979 | public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
| 980 | 980 | global $globalDBdriver; |
| 981 | 981 | if ($globalDBdriver == 'mysql') { |
@@ -991,14 +991,14 @@ discard block |
||
| 991 | 991 | $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);"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 995 | - try { |
|
| 996 | - $sth = $this->db->prepare($query); |
|
| 997 | - $sth->execute($query_values); |
|
| 998 | - } catch(PDOException $e) { |
|
| 999 | - return "error : ".$e->getMessage(); |
|
| 1000 | - } |
|
| 1001 | - } |
|
| 994 | + $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 995 | + try { |
|
| 996 | + $sth = $this->db->prepare($query); |
|
| 997 | + $sth->execute($query_values); |
|
| 998 | + } catch(PDOException $e) { |
|
| 999 | + return "error : ".$e->getMessage(); |
|
| 1000 | + } |
|
| 1001 | + } |
|
| 1002 | 1002 | public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
| 1003 | 1003 | global $globalDBdriver; |
| 1004 | 1004 | if ($globalDBdriver == 'mysql') { |
@@ -1014,14 +1014,14 @@ discard block |
||
| 1014 | 1014 | $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);"; |
| 1015 | 1015 | } |
| 1016 | 1016 | } |
| 1017 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1018 | - try { |
|
| 1019 | - $sth = $this->db->prepare($query); |
|
| 1020 | - $sth->execute($query_values); |
|
| 1021 | - } catch(PDOException $e) { |
|
| 1022 | - return "error : ".$e->getMessage(); |
|
| 1023 | - } |
|
| 1024 | - } |
|
| 1017 | + $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1018 | + try { |
|
| 1019 | + $sth = $this->db->prepare($query); |
|
| 1020 | + $sth->execute($query_values); |
|
| 1021 | + } catch(PDOException $e) { |
|
| 1022 | + return "error : ".$e->getMessage(); |
|
| 1023 | + } |
|
| 1024 | + } |
|
| 1025 | 1025 | public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
| 1026 | 1026 | global $globalDBdriver; |
| 1027 | 1027 | if ($globalDBdriver == 'mysql') { |
@@ -1037,14 +1037,14 @@ discard block |
||
| 1037 | 1037 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1038 | 1038 | } |
| 1039 | 1039 | } |
| 1040 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1041 | - try { |
|
| 1042 | - $sth = $this->db->prepare($query); |
|
| 1043 | - $sth->execute($query_values); |
|
| 1044 | - } catch(PDOException $e) { |
|
| 1045 | - return "error : ".$e->getMessage(); |
|
| 1046 | - } |
|
| 1047 | - } |
|
| 1040 | + $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1041 | + try { |
|
| 1042 | + $sth = $this->db->prepare($query); |
|
| 1043 | + $sth->execute($query_values); |
|
| 1044 | + } catch(PDOException $e) { |
|
| 1045 | + return "error : ".$e->getMessage(); |
|
| 1046 | + } |
|
| 1047 | + } |
|
| 1048 | 1048 | public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
| 1049 | 1049 | global $globalDBdriver; |
| 1050 | 1050 | if ($globalDBdriver == 'mysql') { |
@@ -1060,14 +1060,14 @@ discard block |
||
| 1060 | 1060 | $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);"; |
| 1061 | 1061 | } |
| 1062 | 1062 | } |
| 1063 | - $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); |
|
| 1064 | - try { |
|
| 1065 | - $sth = $this->db->prepare($query); |
|
| 1066 | - $sth->execute($query_values); |
|
| 1067 | - } catch(PDOException $e) { |
|
| 1068 | - return "error : ".$e->getMessage(); |
|
| 1069 | - } |
|
| 1070 | - } |
|
| 1063 | + $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); |
|
| 1064 | + try { |
|
| 1065 | + $sth = $this->db->prepare($query); |
|
| 1066 | + $sth->execute($query_values); |
|
| 1067 | + } catch(PDOException $e) { |
|
| 1068 | + return "error : ".$e->getMessage(); |
|
| 1069 | + } |
|
| 1070 | + } |
|
| 1071 | 1071 | public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
| 1072 | 1072 | global $globalDBdriver; |
| 1073 | 1073 | if ($globalDBdriver == 'mysql') { |
@@ -1083,14 +1083,14 @@ discard block |
||
| 1083 | 1083 | $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);"; |
| 1084 | 1084 | } |
| 1085 | 1085 | } |
| 1086 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1087 | - try { |
|
| 1088 | - $sth = $this->db->prepare($query); |
|
| 1089 | - $sth->execute($query_values); |
|
| 1090 | - } catch(PDOException $e) { |
|
| 1091 | - return "error : ".$e->getMessage(); |
|
| 1092 | - } |
|
| 1093 | - } |
|
| 1086 | + $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1087 | + try { |
|
| 1088 | + $sth = $this->db->prepare($query); |
|
| 1089 | + $sth->execute($query_values); |
|
| 1090 | + } catch(PDOException $e) { |
|
| 1091 | + return "error : ".$e->getMessage(); |
|
| 1092 | + } |
|
| 1093 | + } |
|
| 1094 | 1094 | public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
| 1095 | 1095 | global $globalDBdriver; |
| 1096 | 1096 | if ($globalDBdriver == 'mysql') { |
@@ -1106,14 +1106,14 @@ discard block |
||
| 1106 | 1106 | $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);"; |
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1110 | - try { |
|
| 1111 | - $sth = $this->db->prepare($query); |
|
| 1112 | - $sth->execute($query_values); |
|
| 1113 | - } catch(PDOException $e) { |
|
| 1114 | - return "error : ".$e->getMessage(); |
|
| 1115 | - } |
|
| 1116 | - } |
|
| 1109 | + $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1110 | + try { |
|
| 1111 | + $sth = $this->db->prepare($query); |
|
| 1112 | + $sth->execute($query_values); |
|
| 1113 | + } catch(PDOException $e) { |
|
| 1114 | + return "error : ".$e->getMessage(); |
|
| 1115 | + } |
|
| 1116 | + } |
|
| 1117 | 1117 | public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
| 1118 | 1118 | global $globalDBdriver; |
| 1119 | 1119 | if ($globalDBdriver == 'mysql') { |
@@ -1129,14 +1129,14 @@ discard block |
||
| 1129 | 1129 | $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);"; |
| 1130 | 1130 | } |
| 1131 | 1131 | } |
| 1132 | - $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); |
|
| 1133 | - try { |
|
| 1134 | - $sth = $this->db->prepare($query); |
|
| 1135 | - $sth->execute($query_values); |
|
| 1136 | - } catch(PDOException $e) { |
|
| 1137 | - return "error : ".$e->getMessage(); |
|
| 1138 | - } |
|
| 1139 | - } |
|
| 1132 | + $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); |
|
| 1133 | + try { |
|
| 1134 | + $sth = $this->db->prepare($query); |
|
| 1135 | + $sth->execute($query_values); |
|
| 1136 | + } catch(PDOException $e) { |
|
| 1137 | + return "error : ".$e->getMessage(); |
|
| 1138 | + } |
|
| 1139 | + } |
|
| 1140 | 1140 | public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | if ($airport_icao != '') { |
@@ -1160,8 +1160,8 @@ discard block |
||
| 1160 | 1160 | } catch(PDOException $e) { |
| 1161 | 1161 | return "error : ".$e->getMessage(); |
| 1162 | 1162 | } |
| 1163 | - } |
|
| 1164 | - } |
|
| 1163 | + } |
|
| 1164 | + } |
|
| 1165 | 1165 | public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | if ($airport_icao != '') { |
@@ -1177,8 +1177,8 @@ discard block |
||
| 1177 | 1177 | } catch(PDOException $e) { |
| 1178 | 1178 | return "error : ".$e->getMessage(); |
| 1179 | 1179 | } |
| 1180 | - } |
|
| 1181 | - } |
|
| 1180 | + } |
|
| 1181 | + } |
|
| 1182 | 1182 | public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
| 1183 | 1183 | global $globalDBdriver; |
| 1184 | 1184 | if ($airport_icao != '') { |
@@ -1195,15 +1195,15 @@ discard block |
||
| 1195 | 1195 | $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);"; |
| 1196 | 1196 | } |
| 1197 | 1197 | } |
| 1198 | - $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); |
|
| 1198 | + $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); |
|
| 1199 | 1199 | try { |
| 1200 | - $sth = $this->db->prepare($query); |
|
| 1201 | - $sth->execute($query_values); |
|
| 1202 | - } catch(PDOException $e) { |
|
| 1203 | - return "error : ".$e->getMessage(); |
|
| 1204 | - } |
|
| 1205 | - } |
|
| 1206 | - } |
|
| 1200 | + $sth = $this->db->prepare($query); |
|
| 1201 | + $sth->execute($query_values); |
|
| 1202 | + } catch(PDOException $e) { |
|
| 1203 | + return "error : ".$e->getMessage(); |
|
| 1204 | + } |
|
| 1205 | + } |
|
| 1206 | + } |
|
| 1207 | 1207 | public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
| 1208 | 1208 | global $globalDBdriver; |
| 1209 | 1209 | if ($airport_icao != '') { |
@@ -1219,46 +1219,46 @@ discard block |
||
| 1219 | 1219 | } catch(PDOException $e) { |
| 1220 | 1220 | return "error : ".$e->getMessage(); |
| 1221 | 1221 | } |
| 1222 | - } |
|
| 1223 | - } |
|
| 1222 | + } |
|
| 1223 | + } |
|
| 1224 | 1224 | |
| 1225 | 1225 | public function deleteStat($id) { |
| 1226 | - $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1227 | - $query_values = array(':id' => $id); |
|
| 1228 | - try { |
|
| 1229 | - $sth = $this->db->prepare($query); |
|
| 1230 | - $sth->execute($query_values); |
|
| 1231 | - } catch(PDOException $e) { |
|
| 1232 | - return "error : ".$e->getMessage(); |
|
| 1233 | - } |
|
| 1234 | - } |
|
| 1226 | + $query = "DELETE FROM stats WHERE stats_id = :id"; |
|
| 1227 | + $query_values = array(':id' => $id); |
|
| 1228 | + try { |
|
| 1229 | + $sth = $this->db->prepare($query); |
|
| 1230 | + $sth->execute($query_values); |
|
| 1231 | + } catch(PDOException $e) { |
|
| 1232 | + return "error : ".$e->getMessage(); |
|
| 1233 | + } |
|
| 1234 | + } |
|
| 1235 | 1235 | public function deleteStatFlight($type) { |
| 1236 | - $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1237 | - $query_values = array(':type' => $type); |
|
| 1238 | - try { |
|
| 1239 | - $sth = $this->db->prepare($query); |
|
| 1240 | - $sth->execute($query_values); |
|
| 1241 | - } catch(PDOException $e) { |
|
| 1242 | - return "error : ".$e->getMessage(); |
|
| 1243 | - } |
|
| 1244 | - } |
|
| 1236 | + $query = "DELETE FROM stats_flight WHERE stats_type = :type"; |
|
| 1237 | + $query_values = array(':type' => $type); |
|
| 1238 | + try { |
|
| 1239 | + $sth = $this->db->prepare($query); |
|
| 1240 | + $sth->execute($query_values); |
|
| 1241 | + } catch(PDOException $e) { |
|
| 1242 | + return "error : ".$e->getMessage(); |
|
| 1243 | + } |
|
| 1244 | + } |
|
| 1245 | 1245 | public function deleteStatAirport($type) { |
| 1246 | - $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1247 | - $query_values = array(':type' => $type); |
|
| 1248 | - try { |
|
| 1249 | - $sth = $this->db->prepare($query); |
|
| 1250 | - $sth->execute($query_values); |
|
| 1251 | - } catch(PDOException $e) { |
|
| 1252 | - return "error : ".$e->getMessage(); |
|
| 1253 | - } |
|
| 1254 | - } |
|
| 1246 | + $query = "DELETE FROM stats_airport WHERE stats_type = :type"; |
|
| 1247 | + $query_values = array(':type' => $type); |
|
| 1248 | + try { |
|
| 1249 | + $sth = $this->db->prepare($query); |
|
| 1250 | + $sth->execute($query_values); |
|
| 1251 | + } catch(PDOException $e) { |
|
| 1252 | + return "error : ".$e->getMessage(); |
|
| 1253 | + } |
|
| 1254 | + } |
|
| 1255 | 1255 | |
| 1256 | - public function addOldStats() { |
|
| 1257 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1258 | - $Common = new Common(); |
|
| 1259 | - $Connection = new Connection(); |
|
| 1260 | - date_default_timezone_set('UTC'); |
|
| 1261 | - $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1256 | + public function addOldStats() { |
|
| 1257 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1258 | + $Common = new Common(); |
|
| 1259 | + $Connection = new Connection(); |
|
| 1260 | + date_default_timezone_set('UTC'); |
|
| 1261 | + $last_update = $this->getLastStatsUpdate('last_update_stats'); |
|
| 1262 | 1262 | if ($globalDebug) echo 'Update stats !'."\n"; |
| 1263 | 1263 | if (isset($last_update[0]['value'])) { |
| 1264 | 1264 | $last_update_day = $last_update[0]['value']; |
@@ -1304,24 +1304,24 @@ discard block |
||
| 1304 | 1304 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1305 | 1305 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1306 | 1306 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1307 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1307 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1308 | 1308 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1309 | - $alldata = array(); |
|
| 1309 | + $alldata = array(); |
|
| 1310 | 1310 | |
| 1311 | - foreach ($pall as $value) { |
|
| 1312 | - $icao = $value['airport_departure_icao']; |
|
| 1313 | - $alldata[$icao] = $value; |
|
| 1314 | - } |
|
| 1315 | - foreach ($dall as $value) { |
|
| 1316 | - $icao = $value['airport_departure_icao']; |
|
| 1317 | - if (isset($alldata[$icao])) { |
|
| 1318 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1319 | - } else $alldata[$icao] = $value; |
|
| 1320 | - } |
|
| 1321 | - $count = array(); |
|
| 1322 | - foreach ($alldata as $key => $row) { |
|
| 1323 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 1324 | - } |
|
| 1311 | + foreach ($pall as $value) { |
|
| 1312 | + $icao = $value['airport_departure_icao']; |
|
| 1313 | + $alldata[$icao] = $value; |
|
| 1314 | + } |
|
| 1315 | + foreach ($dall as $value) { |
|
| 1316 | + $icao = $value['airport_departure_icao']; |
|
| 1317 | + if (isset($alldata[$icao])) { |
|
| 1318 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1319 | + } else $alldata[$icao] = $value; |
|
| 1320 | + } |
|
| 1321 | + $count = array(); |
|
| 1322 | + foreach ($alldata as $key => $row) { |
|
| 1323 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 1324 | + } |
|
| 1325 | 1325 | array_multisort($count,SORT_DESC,$alldata); |
| 1326 | 1326 | foreach ($alldata as $number) { |
| 1327 | 1327 | 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); |
@@ -1329,25 +1329,25 @@ discard block |
||
| 1329 | 1329 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1330 | 1330 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1331 | 1331 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1332 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1332 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1333 | 1333 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1334 | - $alldata = array(); |
|
| 1335 | - foreach ($pall as $value) { |
|
| 1336 | - $icao = $value['airport_arrival_icao']; |
|
| 1337 | - $alldata[$icao] = $value; |
|
| 1338 | - } |
|
| 1339 | - foreach ($dall as $value) { |
|
| 1340 | - $icao = $value['airport_arrival_icao']; |
|
| 1341 | - if (isset($alldata[$icao])) { |
|
| 1342 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1343 | - } else $alldata[$icao] = $value; |
|
| 1344 | - } |
|
| 1345 | - $count = array(); |
|
| 1346 | - foreach ($alldata as $key => $row) { |
|
| 1347 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1348 | - } |
|
| 1349 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1350 | - foreach ($alldata as $number) { |
|
| 1334 | + $alldata = array(); |
|
| 1335 | + foreach ($pall as $value) { |
|
| 1336 | + $icao = $value['airport_arrival_icao']; |
|
| 1337 | + $alldata[$icao] = $value; |
|
| 1338 | + } |
|
| 1339 | + foreach ($dall as $value) { |
|
| 1340 | + $icao = $value['airport_arrival_icao']; |
|
| 1341 | + if (isset($alldata[$icao])) { |
|
| 1342 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1343 | + } else $alldata[$icao] = $value; |
|
| 1344 | + } |
|
| 1345 | + $count = array(); |
|
| 1346 | + foreach ($alldata as $key => $row) { |
|
| 1347 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1348 | + } |
|
| 1349 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 1350 | + foreach ($alldata as $number) { |
|
| 1351 | 1351 | 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); |
| 1352 | 1352 | } |
| 1353 | 1353 | if ($Connection->tableExists('countries')) { |
@@ -1407,8 +1407,8 @@ discard block |
||
| 1407 | 1407 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1408 | 1408 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
| 1409 | 1409 | $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1410 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1411 | - /* |
|
| 1410 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
|
| 1411 | + /* |
|
| 1412 | 1412 | $alldata = array(); |
| 1413 | 1413 | foreach ($pall as $value) { |
| 1414 | 1414 | $icao = $value['departure_airport_icao']; |
@@ -1427,29 +1427,29 @@ discard block |
||
| 1427 | 1427 | } |
| 1428 | 1428 | array_multisort($count,SORT_DESC,$alldata); |
| 1429 | 1429 | */ |
| 1430 | - foreach ($dall as $value) { |
|
| 1431 | - $icao = $value['departure_airport_icao']; |
|
| 1432 | - $ddate = $value['date']; |
|
| 1433 | - $find = false; |
|
| 1434 | - foreach ($pall as $pvalue) { |
|
| 1435 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1436 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1437 | - $find = true; |
|
| 1438 | - break; |
|
| 1439 | - } |
|
| 1440 | - } |
|
| 1441 | - if ($find === false) { |
|
| 1442 | - $pall[] = $value; |
|
| 1443 | - } |
|
| 1444 | - } |
|
| 1445 | - $alldata = $pall; |
|
| 1430 | + foreach ($dall as $value) { |
|
| 1431 | + $icao = $value['departure_airport_icao']; |
|
| 1432 | + $ddate = $value['date']; |
|
| 1433 | + $find = false; |
|
| 1434 | + foreach ($pall as $pvalue) { |
|
| 1435 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1436 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1437 | + $find = true; |
|
| 1438 | + break; |
|
| 1439 | + } |
|
| 1440 | + } |
|
| 1441 | + if ($find === false) { |
|
| 1442 | + $pall[] = $value; |
|
| 1443 | + } |
|
| 1444 | + } |
|
| 1445 | + $alldata = $pall; |
|
| 1446 | 1446 | foreach ($alldata as $number) { |
| 1447 | 1447 | $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
| 1448 | 1448 | } |
| 1449 | 1449 | echo '...Arrival'."\n"; |
| 1450 | 1450 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
| 1451 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1452 | - /* |
|
| 1451 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival(); |
|
| 1452 | + /* |
|
| 1453 | 1453 | $alldata = array(); |
| 1454 | 1454 | foreach ($pall as $value) { |
| 1455 | 1455 | $icao = $value['arrival_airport_icao']; |
@@ -1469,22 +1469,22 @@ discard block |
||
| 1469 | 1469 | */ |
| 1470 | 1470 | |
| 1471 | 1471 | |
| 1472 | - foreach ($dall as $value) { |
|
| 1473 | - $icao = $value['arrival_airport_icao']; |
|
| 1474 | - $ddate = $value['date']; |
|
| 1475 | - $find = false; |
|
| 1476 | - foreach ($pall as $pvalue) { |
|
| 1477 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1478 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1479 | - $find = true; |
|
| 1480 | - break; |
|
| 1481 | - } |
|
| 1482 | - } |
|
| 1483 | - if ($find === false) { |
|
| 1484 | - $pall[] = $value; |
|
| 1485 | - } |
|
| 1486 | - } |
|
| 1487 | - $alldata = $pall; |
|
| 1472 | + foreach ($dall as $value) { |
|
| 1473 | + $icao = $value['arrival_airport_icao']; |
|
| 1474 | + $ddate = $value['date']; |
|
| 1475 | + $find = false; |
|
| 1476 | + foreach ($pall as $pvalue) { |
|
| 1477 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1478 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1479 | + $find = true; |
|
| 1480 | + break; |
|
| 1481 | + } |
|
| 1482 | + } |
|
| 1483 | + if ($find === false) { |
|
| 1484 | + $pall[] = $value; |
|
| 1485 | + } |
|
| 1486 | + } |
|
| 1487 | + $alldata = $pall; |
|
| 1488 | 1488 | foreach ($alldata as $number) { |
| 1489 | 1489 | $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
| 1490 | 1490 | } |
@@ -1551,51 +1551,51 @@ discard block |
||
| 1551 | 1551 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1552 | 1552 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1553 | 1553 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1554 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1554 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1555 | 1555 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1556 | - //$alldata = array(); |
|
| 1557 | - foreach ($dall as $value) { |
|
| 1558 | - $icao = $value['airport_departure_icao']; |
|
| 1559 | - $dicao = $value['airline_icao']; |
|
| 1560 | - $find = false; |
|
| 1561 | - foreach ($pall as $pvalue) { |
|
| 1562 | - if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1563 | - $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1564 | - $find = true; |
|
| 1565 | - break; |
|
| 1566 | - } |
|
| 1567 | - } |
|
| 1568 | - if ($find === false) { |
|
| 1569 | - $pall[] = $value; |
|
| 1570 | - } |
|
| 1571 | - } |
|
| 1572 | - $alldata = $pall; |
|
| 1556 | + //$alldata = array(); |
|
| 1557 | + foreach ($dall as $value) { |
|
| 1558 | + $icao = $value['airport_departure_icao']; |
|
| 1559 | + $dicao = $value['airline_icao']; |
|
| 1560 | + $find = false; |
|
| 1561 | + foreach ($pall as $pvalue) { |
|
| 1562 | + if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1563 | + $pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1564 | + $find = true; |
|
| 1565 | + break; |
|
| 1566 | + } |
|
| 1567 | + } |
|
| 1568 | + if ($find === false) { |
|
| 1569 | + $pall[] = $value; |
|
| 1570 | + } |
|
| 1571 | + } |
|
| 1572 | + $alldata = $pall; |
|
| 1573 | 1573 | foreach ($alldata as $number) { |
| 1574 | 1574 | 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); |
| 1575 | 1575 | } |
| 1576 | 1576 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1577 | 1577 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1578 | 1578 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1579 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1579 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1580 | 1580 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1581 | - //$alldata = array(); |
|
| 1582 | - foreach ($dall as $value) { |
|
| 1583 | - $icao = $value['airport_arrival_icao']; |
|
| 1584 | - $dicao = $value['airline_icao']; |
|
| 1585 | - $find = false; |
|
| 1586 | - foreach ($pall as $pvalue) { |
|
| 1587 | - if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1588 | - $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1589 | - $find = true; |
|
| 1590 | - break; |
|
| 1591 | - } |
|
| 1592 | - } |
|
| 1593 | - if ($find === false) { |
|
| 1594 | - $pall[] = $value; |
|
| 1595 | - } |
|
| 1596 | - } |
|
| 1597 | - $alldata = $pall; |
|
| 1598 | - foreach ($alldata as $number) { |
|
| 1581 | + //$alldata = array(); |
|
| 1582 | + foreach ($dall as $value) { |
|
| 1583 | + $icao = $value['airport_arrival_icao']; |
|
| 1584 | + $dicao = $value['airline_icao']; |
|
| 1585 | + $find = false; |
|
| 1586 | + foreach ($pall as $pvalue) { |
|
| 1587 | + if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) { |
|
| 1588 | + $pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1589 | + $find = true; |
|
| 1590 | + break; |
|
| 1591 | + } |
|
| 1592 | + } |
|
| 1593 | + if ($find === false) { |
|
| 1594 | + $pall[] = $value; |
|
| 1595 | + } |
|
| 1596 | + } |
|
| 1597 | + $alldata = $pall; |
|
| 1598 | + foreach ($alldata as $number) { |
|
| 1599 | 1599 | 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); |
| 1600 | 1600 | } |
| 1601 | 1601 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
@@ -1628,47 +1628,47 @@ discard block |
||
| 1628 | 1628 | } |
| 1629 | 1629 | if ($globalDebug) echo '...Departure'."\n"; |
| 1630 | 1630 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1631 | - $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1632 | - foreach ($dall as $value) { |
|
| 1633 | - $icao = $value['departure_airport_icao']; |
|
| 1634 | - $airline = $value['airline_icao']; |
|
| 1635 | - $ddate = $value['date']; |
|
| 1636 | - $find = false; |
|
| 1637 | - foreach ($pall as $pvalue) { |
|
| 1638 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1639 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1640 | - $find = true; |
|
| 1641 | - break; |
|
| 1642 | - } |
|
| 1643 | - } |
|
| 1644 | - if ($find === false) { |
|
| 1645 | - $pall[] = $value; |
|
| 1646 | - } |
|
| 1647 | - } |
|
| 1648 | - $alldata = $pall; |
|
| 1631 | + $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
|
| 1632 | + foreach ($dall as $value) { |
|
| 1633 | + $icao = $value['departure_airport_icao']; |
|
| 1634 | + $airline = $value['airline_icao']; |
|
| 1635 | + $ddate = $value['date']; |
|
| 1636 | + $find = false; |
|
| 1637 | + foreach ($pall as $pvalue) { |
|
| 1638 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) { |
|
| 1639 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1640 | + $find = true; |
|
| 1641 | + break; |
|
| 1642 | + } |
|
| 1643 | + } |
|
| 1644 | + if ($find === false) { |
|
| 1645 | + $pall[] = $value; |
|
| 1646 | + } |
|
| 1647 | + } |
|
| 1648 | + $alldata = $pall; |
|
| 1649 | 1649 | foreach ($alldata as $number) { |
| 1650 | 1650 | $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']); |
| 1651 | 1651 | } |
| 1652 | 1652 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1653 | 1653 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1654 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1655 | - foreach ($dall as $value) { |
|
| 1656 | - $icao = $value['arrival_airport_icao']; |
|
| 1657 | - $airline = $value['airline_icao']; |
|
| 1658 | - $ddate = $value['date']; |
|
| 1659 | - $find = false; |
|
| 1660 | - foreach ($pall as $pvalue) { |
|
| 1661 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1662 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1663 | - $find = true; |
|
| 1664 | - break; |
|
| 1665 | - } |
|
| 1666 | - } |
|
| 1667 | - if ($find === false) { |
|
| 1668 | - $pall[] = $value; |
|
| 1669 | - } |
|
| 1670 | - } |
|
| 1671 | - $alldata = $pall; |
|
| 1654 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
|
| 1655 | + foreach ($dall as $value) { |
|
| 1656 | + $icao = $value['arrival_airport_icao']; |
|
| 1657 | + $airline = $value['airline_icao']; |
|
| 1658 | + $ddate = $value['date']; |
|
| 1659 | + $find = false; |
|
| 1660 | + foreach ($pall as $pvalue) { |
|
| 1661 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) { |
|
| 1662 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1663 | + $find = true; |
|
| 1664 | + break; |
|
| 1665 | + } |
|
| 1666 | + } |
|
| 1667 | + if ($find === false) { |
|
| 1668 | + $pall[] = $value; |
|
| 1669 | + } |
|
| 1670 | + } |
|
| 1671 | + $alldata = $pall; |
|
| 1672 | 1672 | foreach ($alldata as $number) { |
| 1673 | 1673 | $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']); |
| 1674 | 1674 | } |
@@ -1739,44 +1739,44 @@ discard block |
||
| 1739 | 1739 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
| 1740 | 1740 | } |
| 1741 | 1741 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
| 1742 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1743 | - $alldata = array(); |
|
| 1744 | - foreach ($pall as $value) { |
|
| 1745 | - $icao = $value['airport_departure_icao']; |
|
| 1746 | - $alldata[$icao] = $value; |
|
| 1747 | - } |
|
| 1748 | - foreach ($dall as $value) { |
|
| 1749 | - $icao = $value['airport_departure_icao']; |
|
| 1750 | - if (isset($alldata[$icao])) { |
|
| 1751 | - $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1752 | - } else $alldata[$icao] = $value; |
|
| 1753 | - } |
|
| 1754 | - $count = array(); |
|
| 1755 | - foreach ($alldata as $key => $row) { |
|
| 1756 | - $count[$key] = $row['airport_departure_icao_count']; |
|
| 1757 | - } |
|
| 1742 | + $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1743 | + $alldata = array(); |
|
| 1744 | + foreach ($pall as $value) { |
|
| 1745 | + $icao = $value['airport_departure_icao']; |
|
| 1746 | + $alldata[$icao] = $value; |
|
| 1747 | + } |
|
| 1748 | + foreach ($dall as $value) { |
|
| 1749 | + $icao = $value['airport_departure_icao']; |
|
| 1750 | + if (isset($alldata[$icao])) { |
|
| 1751 | + $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
|
| 1752 | + } else $alldata[$icao] = $value; |
|
| 1753 | + } |
|
| 1754 | + $count = array(); |
|
| 1755 | + foreach ($alldata as $key => $row) { |
|
| 1756 | + $count[$key] = $row['airport_departure_icao_count']; |
|
| 1757 | + } |
|
| 1758 | 1758 | array_multisort($count,SORT_DESC,$alldata); |
| 1759 | 1759 | foreach ($alldata as $number) { |
| 1760 | - 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); |
|
| 1760 | + 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); |
|
| 1761 | 1761 | } |
| 1762 | 1762 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
| 1763 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1763 | + $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1764 | 1764 | $alldata = array(); |
| 1765 | - foreach ($pall as $value) { |
|
| 1766 | - $icao = $value['airport_arrival_icao']; |
|
| 1767 | - $alldata[$icao] = $value; |
|
| 1768 | - } |
|
| 1769 | - foreach ($dall as $value) { |
|
| 1770 | - $icao = $value['airport_arrival_icao']; |
|
| 1771 | - if (isset($alldata[$icao])) { |
|
| 1772 | - $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1773 | - } else $alldata[$icao] = $value; |
|
| 1774 | - } |
|
| 1775 | - $count = array(); |
|
| 1776 | - foreach ($alldata as $key => $row) { |
|
| 1777 | - $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1778 | - } |
|
| 1779 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1765 | + foreach ($pall as $value) { |
|
| 1766 | + $icao = $value['airport_arrival_icao']; |
|
| 1767 | + $alldata[$icao] = $value; |
|
| 1768 | + } |
|
| 1769 | + foreach ($dall as $value) { |
|
| 1770 | + $icao = $value['airport_arrival_icao']; |
|
| 1771 | + if (isset($alldata[$icao])) { |
|
| 1772 | + $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
|
| 1773 | + } else $alldata[$icao] = $value; |
|
| 1774 | + } |
|
| 1775 | + $count = array(); |
|
| 1776 | + foreach ($alldata as $key => $row) { |
|
| 1777 | + $count[$key] = $row['airport_arrival_icao_count']; |
|
| 1778 | + } |
|
| 1779 | + array_multisort($count,SORT_DESC,$alldata); |
|
| 1780 | 1780 | foreach ($alldata as $number) { |
| 1781 | 1781 | 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); |
| 1782 | 1782 | } |
@@ -1809,45 +1809,45 @@ discard block |
||
| 1809 | 1809 | } |
| 1810 | 1810 | echo '...Departure'."\n"; |
| 1811 | 1811 | $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
| 1812 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 1812 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 1813 | 1813 | foreach ($dall as $value) { |
| 1814 | - $icao = $value['departure_airport_icao']; |
|
| 1815 | - $ddate = $value['date']; |
|
| 1816 | - $find = false; |
|
| 1817 | - foreach ($pall as $pvalue) { |
|
| 1818 | - if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1819 | - $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1820 | - $find = true; |
|
| 1821 | - break; |
|
| 1822 | - } |
|
| 1823 | - } |
|
| 1824 | - if ($find === false) { |
|
| 1825 | - $pall[] = $value; |
|
| 1826 | - } |
|
| 1827 | - } |
|
| 1828 | - $alldata = $pall; |
|
| 1814 | + $icao = $value['departure_airport_icao']; |
|
| 1815 | + $ddate = $value['date']; |
|
| 1816 | + $find = false; |
|
| 1817 | + foreach ($pall as $pvalue) { |
|
| 1818 | + if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1819 | + $pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count']; |
|
| 1820 | + $find = true; |
|
| 1821 | + break; |
|
| 1822 | + } |
|
| 1823 | + } |
|
| 1824 | + if ($find === false) { |
|
| 1825 | + $pall[] = $value; |
|
| 1826 | + } |
|
| 1827 | + } |
|
| 1828 | + $alldata = $pall; |
|
| 1829 | 1829 | foreach ($alldata as $number) { |
| 1830 | 1830 | $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); |
| 1831 | 1831 | } |
| 1832 | 1832 | echo '...Arrival'."\n"; |
| 1833 | 1833 | $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
| 1834 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 1834 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 1835 | 1835 | foreach ($dall as $value) { |
| 1836 | 1836 | $icao = $value['arrival_airport_icao']; |
| 1837 | 1837 | $ddate = $value['date']; |
| 1838 | - $find = false; |
|
| 1838 | + $find = false; |
|
| 1839 | 1839 | foreach ($pall as $pvalue) { |
| 1840 | - if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1841 | - $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1842 | - $find = true; |
|
| 1843 | - break; |
|
| 1844 | - } |
|
| 1845 | - } |
|
| 1846 | - if ($find === false) { |
|
| 1847 | - $pall[] = $value; |
|
| 1848 | - } |
|
| 1849 | - } |
|
| 1850 | - $alldata = $pall; |
|
| 1840 | + if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) { |
|
| 1841 | + $pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count']; |
|
| 1842 | + $find = true; |
|
| 1843 | + break; |
|
| 1844 | + } |
|
| 1845 | + } |
|
| 1846 | + if ($find === false) { |
|
| 1847 | + $pall[] = $value; |
|
| 1848 | + } |
|
| 1849 | + } |
|
| 1850 | + $alldata = $pall; |
|
| 1851 | 1851 | foreach ($alldata as $number) { |
| 1852 | 1852 | $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); |
| 1853 | 1853 | } |
@@ -12,7 +12,9 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | public function __construct($dbc = null) { |
| 14 | 14 | global $globalFilterName; |
| 15 | - if (isset($globalFilterName)) $this->filter_name = $globalFilterName; |
|
| 15 | + if (isset($globalFilterName)) { |
|
| 16 | + $this->filter_name = $globalFilterName; |
|
| 17 | + } |
|
| 16 | 18 | $Connection = new Connection($dbc); |
| 17 | 19 | $this->db = $Connection->db(); |
| 18 | 20 | } |
@@ -77,7 +79,9 @@ discard block |
||
| 77 | 79 | } |
| 78 | 80 | } |
| 79 | 81 | public function getAllAirlineNames($filter_name = '') { |
| 80 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 82 | + if ($filter_name == '') { |
|
| 83 | + $filter_name = $this->filter_name; |
|
| 84 | + } |
|
| 81 | 85 | $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC"; |
| 82 | 86 | try { |
| 83 | 87 | $sth = $this->db->prepare($query); |
@@ -89,7 +93,9 @@ discard block |
||
| 89 | 93 | return $all; |
| 90 | 94 | } |
| 91 | 95 | public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
| 92 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 96 | + if ($filter_name == '') { |
|
| 97 | + $filter_name = $this->filter_name; |
|
| 98 | + } |
|
| 93 | 99 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 94 | 100 | try { |
| 95 | 101 | $sth = $this->db->prepare($query); |
@@ -101,7 +107,9 @@ discard block |
||
| 101 | 107 | return $all; |
| 102 | 108 | } |
| 103 | 109 | public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
| 104 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 110 | + if ($filter_name == '') { |
|
| 111 | + $filter_name = $this->filter_name; |
|
| 112 | + } |
|
| 105 | 113 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 106 | 114 | try { |
| 107 | 115 | $sth = $this->db->prepare($query); |
@@ -113,7 +121,9 @@ discard block |
||
| 113 | 121 | return $all; |
| 114 | 122 | } |
| 115 | 123 | public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
| 116 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 124 | + if ($filter_name == '') { |
|
| 125 | + $filter_name = $this->filter_name; |
|
| 126 | + } |
|
| 117 | 127 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 118 | 128 | try { |
| 119 | 129 | $sth = $this->db->prepare($query); |
@@ -128,9 +138,14 @@ discard block |
||
| 128 | 138 | |
| 129 | 139 | public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '') { |
| 130 | 140 | global $globalStatsFilters; |
| 131 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 132 | - if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
|
| 133 | - else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
|
| 141 | + if ($filter_name == '') { |
|
| 142 | + $filter_name = $this->filter_name; |
|
| 143 | + } |
|
| 144 | + if ($limit) { |
|
| 145 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
|
| 146 | + } else { |
|
| 147 | + $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
|
| 148 | + } |
|
| 134 | 149 | try { |
| 135 | 150 | $sth = $this->db->prepare($query); |
| 136 | 151 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -150,9 +165,14 @@ discard block |
||
| 150 | 165 | } |
| 151 | 166 | public function countAllAirlineCountries($limit = true,$filter_name = '') { |
| 152 | 167 | global $globalStatsFilters; |
| 153 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 154 | - if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 155 | - else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC"; |
|
| 168 | + if ($filter_name == '') { |
|
| 169 | + $filter_name = $this->filter_name; |
|
| 170 | + } |
|
| 171 | + if ($limit) { |
|
| 172 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 173 | + } else { |
|
| 174 | + $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC"; |
|
| 175 | + } |
|
| 156 | 176 | try { |
| 157 | 177 | $sth = $this->db->prepare($query); |
| 158 | 178 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -172,9 +192,14 @@ discard block |
||
| 172 | 192 | } |
| 173 | 193 | public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') { |
| 174 | 194 | global $globalStatsFilters; |
| 175 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 176 | - 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"; |
|
| 177 | - 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"; |
|
| 195 | + if ($filter_name == '') { |
|
| 196 | + $filter_name = $this->filter_name; |
|
| 197 | + } |
|
| 198 | + if ($limit) { |
|
| 199 | + $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"; |
|
| 200 | + } else { |
|
| 201 | + $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"; |
|
| 202 | + } |
|
| 178 | 203 | try { |
| 179 | 204 | $sth = $this->db->prepare($query); |
| 180 | 205 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -195,9 +220,14 @@ discard block |
||
| 195 | 220 | |
| 196 | 221 | public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '') { |
| 197 | 222 | global $globalStatsFilters; |
| 198 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 199 | - if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 200 | - else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
|
| 223 | + if ($filter_name == '') { |
|
| 224 | + $filter_name = $this->filter_name; |
|
| 225 | + } |
|
| 226 | + if ($limit) { |
|
| 227 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 228 | + } else { |
|
| 229 | + $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
|
| 230 | + } |
|
| 201 | 231 | try { |
| 202 | 232 | $sth = $this->db->prepare($query); |
| 203 | 233 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -217,9 +247,14 @@ discard block |
||
| 217 | 247 | } |
| 218 | 248 | public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '') { |
| 219 | 249 | global $globalStatsFilters; |
| 220 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 221 | - if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 222 | - else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
|
| 250 | + if ($filter_name == '') { |
|
| 251 | + $filter_name = $this->filter_name; |
|
| 252 | + } |
|
| 253 | + if ($limit) { |
|
| 254 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0"; |
|
| 255 | + } else { |
|
| 256 | + $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
|
| 257 | + } |
|
| 223 | 258 | try { |
| 224 | 259 | $sth = $this->db->prepare($query); |
| 225 | 260 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -240,9 +275,14 @@ discard block |
||
| 240 | 275 | |
| 241 | 276 | public function countAllAirlines($limit = true,$filter_name = '') { |
| 242 | 277 | global $globalStatsFilters; |
| 243 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 244 | - if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 245 | - else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC"; |
|
| 278 | + if ($filter_name == '') { |
|
| 279 | + $filter_name = $this->filter_name; |
|
| 280 | + } |
|
| 281 | + if ($limit) { |
|
| 282 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
|
| 283 | + } else { |
|
| 284 | + $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC"; |
|
| 285 | + } |
|
| 246 | 286 | try { |
| 247 | 287 | $sth = $this->db->prepare($query); |
| 248 | 288 | $sth->execute(array(':filter_name' => $filter_name)); |
@@ -263,9 +303,14 @@ discard block |
||
| 263 | 303 | } |
| 264 | 304 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') { |
| 265 | 305 | global $globalStatsFilters; |
| 266 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 267 | - 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"; |
|
| 268 | - else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
|
| 306 | + if ($filter_name == '') { |
|
| 307 | + $filter_name = $this->filter_name; |
|
| 308 | + } |
|
| 309 | + if ($limit) { |
|
| 310 | + $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"; |
|
| 311 | + } else { |
|
| 312 | + $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"; |
|
| 313 | + } |
|
| 269 | 314 | try { |
| 270 | 315 | $sth = $this->db->prepare($query); |
| 271 | 316 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -285,9 +330,14 @@ discard block |
||
| 285 | 330 | } |
| 286 | 331 | public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') { |
| 287 | 332 | global $globalStatsFilters; |
| 288 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 289 | - 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"; |
|
| 290 | - 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"; |
|
| 333 | + if ($filter_name == '') { |
|
| 334 | + $filter_name = $this->filter_name; |
|
| 335 | + } |
|
| 336 | + if ($limit) { |
|
| 337 | + $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"; |
|
| 338 | + } else { |
|
| 339 | + $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"; |
|
| 340 | + } |
|
| 291 | 341 | try { |
| 292 | 342 | $sth = $this->db->prepare($query); |
| 293 | 343 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -307,10 +357,15 @@ discard block |
||
| 307 | 357 | } |
| 308 | 358 | public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') { |
| 309 | 359 | $Connection = new Connection(); |
| 310 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 360 | + if ($filter_name == '') { |
|
| 361 | + $filter_name = $this->filter_name; |
|
| 362 | + } |
|
| 311 | 363 | if ($Connection->tableExists('countries')) { |
| 312 | - 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"; |
|
| 313 | - 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"; |
|
| 364 | + if ($limit) { |
|
| 365 | + $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"; |
|
| 366 | + } else { |
|
| 367 | + $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"; |
|
| 368 | + } |
|
| 314 | 369 | try { |
| 315 | 370 | $sth = $this->db->prepare($query); |
| 316 | 371 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -331,9 +386,14 @@ discard block |
||
| 331 | 386 | } |
| 332 | 387 | public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') { |
| 333 | 388 | global $globalStatsFilters; |
| 334 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 335 | - 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"; |
|
| 336 | - 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"; |
|
| 389 | + if ($filter_name == '') { |
|
| 390 | + $filter_name = $this->filter_name; |
|
| 391 | + } |
|
| 392 | + if ($limit) { |
|
| 393 | + $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"; |
|
| 394 | + } else { |
|
| 395 | + $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"; |
|
| 396 | + } |
|
| 337 | 397 | try { |
| 338 | 398 | $sth = $this->db->prepare($query); |
| 339 | 399 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -353,9 +413,14 @@ discard block |
||
| 353 | 413 | } |
| 354 | 414 | public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') { |
| 355 | 415 | global $globalStatsFilters; |
| 356 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 357 | - 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"; |
|
| 358 | - 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"; |
|
| 416 | + if ($filter_name == '') { |
|
| 417 | + $filter_name = $this->filter_name; |
|
| 418 | + } |
|
| 419 | + if ($limit) { |
|
| 420 | + $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"; |
|
| 421 | + } else { |
|
| 422 | + $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"; |
|
| 423 | + } |
|
| 359 | 424 | try { |
| 360 | 425 | $sth = $this->db->prepare($query); |
| 361 | 426 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -375,9 +440,14 @@ discard block |
||
| 375 | 440 | } |
| 376 | 441 | public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') { |
| 377 | 442 | global $globalStatsFilters; |
| 378 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 379 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 380 | - else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 443 | + if ($filter_name == '') { |
|
| 444 | + $filter_name = $this->filter_name; |
|
| 445 | + } |
|
| 446 | + if ($limit) { |
|
| 447 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 448 | + } else { |
|
| 449 | + $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
|
| 450 | + } |
|
| 381 | 451 | try { |
| 382 | 452 | $sth = $this->db->prepare($query); |
| 383 | 453 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -403,7 +473,9 @@ discard block |
||
| 403 | 473 | $icao = $value['airport_departure_icao']; |
| 404 | 474 | if (isset($all[$icao])) { |
| 405 | 475 | $all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 406 | - } else $all[$icao] = $value; |
|
| 476 | + } else { |
|
| 477 | + $all[$icao] = $value; |
|
| 478 | + } |
|
| 407 | 479 | } |
| 408 | 480 | $count = array(); |
| 409 | 481 | foreach ($all as $key => $row) { |
@@ -415,9 +487,14 @@ discard block |
||
| 415 | 487 | } |
| 416 | 488 | public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') { |
| 417 | 489 | global $globalStatsFilters; |
| 418 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 419 | - if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 420 | - else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 490 | + if ($filter_name == '') { |
|
| 491 | + $filter_name = $this->filter_name; |
|
| 492 | + } |
|
| 493 | + if ($limit) { |
|
| 494 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
|
| 495 | + } else { |
|
| 496 | + $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
|
| 497 | + } |
|
| 421 | 498 | try { |
| 422 | 499 | $sth = $this->db->prepare($query); |
| 423 | 500 | $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
@@ -443,7 +520,9 @@ discard block |
||
| 443 | 520 | $icao = $value['airport_arrival_icao']; |
| 444 | 521 | if (isset($all[$icao])) { |
| 445 | 522 | $all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 446 | - } else $all[$icao] = $value; |
|
| 523 | + } else { |
|
| 524 | + $all[$icao] = $value; |
|
| 525 | + } |
|
| 447 | 526 | } |
| 448 | 527 | $count = array(); |
| 449 | 528 | foreach ($all as $key => $row) { |
@@ -456,13 +535,21 @@ discard block |
||
| 456 | 535 | } |
| 457 | 536 | public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
| 458 | 537 | global $globalDBdriver, $globalStatsFilters; |
| 459 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 538 | + if ($filter_name == '') { |
|
| 539 | + $filter_name = $this->filter_name; |
|
| 540 | + } |
|
| 460 | 541 | if ($globalDBdriver == 'mysql') { |
| 461 | - 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"; |
|
| 462 | - 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"; |
|
| 542 | + if ($limit) { |
|
| 543 | + $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"; |
|
| 544 | + } else { |
|
| 545 | + $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"; |
|
| 546 | + } |
|
| 463 | 547 | } else { |
| 464 | - 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"; |
|
| 465 | - 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"; |
|
| 548 | + if ($limit) { |
|
| 549 | + $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"; |
|
| 550 | + } else { |
|
| 551 | + $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"; |
|
| 552 | + } |
|
| 466 | 553 | } |
| 467 | 554 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 468 | 555 | try { |
@@ -486,7 +573,9 @@ discard block |
||
| 486 | 573 | |
| 487 | 574 | public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
| 488 | 575 | global $globalStatsFilters; |
| 489 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 576 | + if ($filter_name == '') { |
|
| 577 | + $filter_name = $this->filter_name; |
|
| 578 | + } |
|
| 490 | 579 | $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"; |
| 491 | 580 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 492 | 581 | try { |
@@ -508,7 +597,9 @@ discard block |
||
| 508 | 597 | } |
| 509 | 598 | public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
| 510 | 599 | global $globalDBdriver, $globalStatsFilters; |
| 511 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 600 | + if ($filter_name == '') { |
|
| 601 | + $filter_name = $this->filter_name; |
|
| 602 | + } |
|
| 512 | 603 | if ($globalDBdriver == 'mysql') { |
| 513 | 604 | $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"; |
| 514 | 605 | } else { |
@@ -534,7 +625,9 @@ discard block |
||
| 534 | 625 | } |
| 535 | 626 | public function countAllDates($stats_airline = '',$filter_name = '') { |
| 536 | 627 | global $globalStatsFilters; |
| 537 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 628 | + if ($filter_name == '') { |
|
| 629 | + $filter_name = $this->filter_name; |
|
| 630 | + } |
|
| 538 | 631 | $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"; |
| 539 | 632 | $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 540 | 633 | try { |
@@ -556,7 +649,9 @@ discard block |
||
| 556 | 649 | } |
| 557 | 650 | public function countAllDatesByAirlines($filter_name = '') { |
| 558 | 651 | global $globalStatsFilters; |
| 559 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 652 | + if ($filter_name == '') { |
|
| 653 | + $filter_name = $this->filter_name; |
|
| 654 | + } |
|
| 560 | 655 | $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"; |
| 561 | 656 | $query_data = array('filter_name' => $filter_name); |
| 562 | 657 | try { |
@@ -578,7 +673,9 @@ discard block |
||
| 578 | 673 | } |
| 579 | 674 | public function countAllMonths($stats_airline = '',$filter_name = '') { |
| 580 | 675 | global $globalStatsFilters; |
| 581 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 676 | + if ($filter_name == '') { |
|
| 677 | + $filter_name = $this->filter_name; |
|
| 678 | + } |
|
| 582 | 679 | $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"; |
| 583 | 680 | try { |
| 584 | 681 | $sth = $this->db->prepare($query); |
@@ -599,7 +696,9 @@ discard block |
||
| 599 | 696 | } |
| 600 | 697 | public function countAllMilitaryMonths($filter_name = '') { |
| 601 | 698 | global $globalStatsFilters; |
| 602 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 699 | + if ($filter_name == '') { |
|
| 700 | + $filter_name = $this->filter_name; |
|
| 701 | + } |
|
| 603 | 702 | $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"; |
| 604 | 703 | try { |
| 605 | 704 | $sth = $this->db->prepare($query); |
@@ -620,9 +719,14 @@ discard block |
||
| 620 | 719 | } |
| 621 | 720 | public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
| 622 | 721 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 623 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 624 | - 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"; |
|
| 625 | - 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"; |
|
| 722 | + if ($filter_name == '') { |
|
| 723 | + $filter_name = $this->filter_name; |
|
| 724 | + } |
|
| 725 | + if ($limit) { |
|
| 726 | + $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"; |
|
| 727 | + } else { |
|
| 728 | + $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"; |
|
| 729 | + } |
|
| 626 | 730 | if ($orderby == 'hour') { |
| 627 | 731 | /* |
| 628 | 732 | if ($globalDBdriver == 'mysql') { |
@@ -631,7 +735,9 @@ discard block |
||
| 631 | 735 | */ |
| 632 | 736 | $query .= " ORDER BY CAST(flight_date AS integer) ASC"; |
| 633 | 737 | } |
| 634 | - if ($orderby == 'count') $query .= " ORDER BY hour_count DESC"; |
|
| 738 | + if ($orderby == 'count') { |
|
| 739 | + $query .= " ORDER BY hour_count DESC"; |
|
| 740 | + } |
|
| 635 | 741 | try { |
| 636 | 742 | $sth = $this->db->prepare($query); |
| 637 | 743 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
@@ -652,7 +758,9 @@ discard block |
||
| 652 | 758 | |
| 653 | 759 | public function countOverallFlights($stats_airline = '', $filter_name = '') { |
| 654 | 760 | global $globalStatsFilters; |
| 655 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 761 | + if ($filter_name == '') { |
|
| 762 | + $filter_name = $this->filter_name; |
|
| 763 | + } |
|
| 656 | 764 | $all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name); |
| 657 | 765 | if (empty($all)) { |
| 658 | 766 | $filters = array('airlines' => array($stats_airline)); |
@@ -666,7 +774,9 @@ discard block |
||
| 666 | 774 | } |
| 667 | 775 | public function countOverallMilitaryFlights($filter_name = '') { |
| 668 | 776 | global $globalStatsFilters; |
| 669 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 777 | + if ($filter_name == '') { |
|
| 778 | + $filter_name = $this->filter_name; |
|
| 779 | + } |
|
| 670 | 780 | $all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name); |
| 671 | 781 | if (empty($all)) { |
| 672 | 782 | $filters = array(); |
@@ -680,7 +790,9 @@ discard block |
||
| 680 | 790 | } |
| 681 | 791 | public function countOverallArrival($stats_airline = '',$filter_name = '') { |
| 682 | 792 | global $globalStatsFilters; |
| 683 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 793 | + if ($filter_name == '') { |
|
| 794 | + $filter_name = $this->filter_name; |
|
| 795 | + } |
|
| 684 | 796 | $all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name); |
| 685 | 797 | if (empty($all)) { |
| 686 | 798 | $filters = array('airlines' => array($stats_airline)); |
@@ -694,7 +806,9 @@ discard block |
||
| 694 | 806 | } |
| 695 | 807 | public function countOverallAircrafts($stats_airline = '',$filter_name = '') { |
| 696 | 808 | global $globalStatsFilters; |
| 697 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 809 | + if ($filter_name == '') { |
|
| 810 | + $filter_name = $this->filter_name; |
|
| 811 | + } |
|
| 698 | 812 | $all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name); |
| 699 | 813 | if (empty($all)) { |
| 700 | 814 | $filters = array('airlines' => array($stats_airline)); |
@@ -708,7 +822,9 @@ discard block |
||
| 708 | 822 | } |
| 709 | 823 | public function countOverallAirlines($filter_name = '') { |
| 710 | 824 | global $globalStatsFilters; |
| 711 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 825 | + if ($filter_name == '') { |
|
| 826 | + $filter_name = $this->filter_name; |
|
| 827 | + } |
|
| 712 | 828 | $query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name"; |
| 713 | 829 | try { |
| 714 | 830 | $sth = $this->db->prepare($query); |
@@ -731,7 +847,9 @@ discard block |
||
| 731 | 847 | } |
| 732 | 848 | public function countOverallOwners($stats_airline = '',$filter_name = '') { |
| 733 | 849 | global $globalStatsFilters; |
| 734 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 850 | + if ($filter_name == '') { |
|
| 851 | + $filter_name = $this->filter_name; |
|
| 852 | + } |
|
| 735 | 853 | /* |
| 736 | 854 | $query = "SELECT COUNT(*) AS nb_owner FROM stats_owner"; |
| 737 | 855 | try { |
@@ -756,7 +874,9 @@ discard block |
||
| 756 | 874 | } |
| 757 | 875 | public function countOverallPilots($stats_airline = '',$filter_name = '') { |
| 758 | 876 | global $globalStatsFilters; |
| 759 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 877 | + if ($filter_name == '') { |
|
| 878 | + $filter_name = $this->filter_name; |
|
| 879 | + } |
|
| 760 | 880 | $all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name); |
| 761 | 881 | if (empty($all)) { |
| 762 | 882 | $filters = array('airlines' => array($stats_airline)); |
@@ -770,7 +890,9 @@ discard block |
||
| 770 | 890 | } |
| 771 | 891 | |
| 772 | 892 | public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
| 773 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 893 | + if ($filter_name == '') { |
|
| 894 | + $filter_name = $this->filter_name; |
|
| 895 | + } |
|
| 774 | 896 | $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"; |
| 775 | 897 | $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
| 776 | 898 | try { |
@@ -783,7 +905,9 @@ discard block |
||
| 783 | 905 | return $all; |
| 784 | 906 | } |
| 785 | 907 | public function getStats($type,$stats_airline = '', $filter_name = '') { |
| 786 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 908 | + if ($filter_name == '') { |
|
| 909 | + $filter_name = $this->filter_name; |
|
| 910 | + } |
|
| 787 | 911 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 788 | 912 | $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
| 789 | 913 | try { |
@@ -796,7 +920,9 @@ discard block |
||
| 796 | 920 | return $all; |
| 797 | 921 | } |
| 798 | 922 | public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') { |
| 799 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 923 | + if ($filter_name == '') { |
|
| 924 | + $filter_name = $this->filter_name; |
|
| 925 | + } |
|
| 800 | 926 | global $globalArchiveMonths, $globalDBdriver; |
| 801 | 927 | if ($globalDBdriver == 'mysql') { |
| 802 | 928 | $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"; |
@@ -815,7 +941,9 @@ discard block |
||
| 815 | 941 | } |
| 816 | 942 | public function getStatsTotal($type, $stats_airline = '', $filter_name = '') { |
| 817 | 943 | global $globalArchiveMonths, $globalDBdriver; |
| 818 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 944 | + if ($filter_name == '') { |
|
| 945 | + $filter_name = $this->filter_name; |
|
| 946 | + } |
|
| 819 | 947 | if ($globalDBdriver == 'mysql') { |
| 820 | 948 | $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"; |
| 821 | 949 | } else { |
@@ -833,7 +961,9 @@ discard block |
||
| 833 | 961 | } |
| 834 | 962 | public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') { |
| 835 | 963 | global $globalArchiveMonths, $globalDBdriver; |
| 836 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 964 | + if ($filter_name == '') { |
|
| 965 | + $filter_name = $this->filter_name; |
|
| 966 | + } |
|
| 837 | 967 | if ($globalDBdriver == 'mysql') { |
| 838 | 968 | $query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 839 | 969 | } else { |
@@ -850,7 +980,9 @@ discard block |
||
| 850 | 980 | } |
| 851 | 981 | public function getStatsAirlineTotal($filter_name = '') { |
| 852 | 982 | global $globalArchiveMonths, $globalDBdriver; |
| 853 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 983 | + if ($filter_name == '') { |
|
| 984 | + $filter_name = $this->filter_name; |
|
| 985 | + } |
|
| 854 | 986 | if ($globalDBdriver == 'mysql') { |
| 855 | 987 | $query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name"; |
| 856 | 988 | } else { |
@@ -867,7 +999,9 @@ discard block |
||
| 867 | 999 | } |
| 868 | 1000 | public function getStatsOwnerTotal($filter_name = '') { |
| 869 | 1001 | global $globalArchiveMonths, $globalDBdriver; |
| 870 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1002 | + if ($filter_name == '') { |
|
| 1003 | + $filter_name = $this->filter_name; |
|
| 1004 | + } |
|
| 871 | 1005 | if ($globalDBdriver == 'mysql') { |
| 872 | 1006 | $query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name"; |
| 873 | 1007 | } else { |
@@ -884,7 +1018,9 @@ discard block |
||
| 884 | 1018 | } |
| 885 | 1019 | public function getStatsPilotTotal($filter_name = '') { |
| 886 | 1020 | global $globalArchiveMonths, $globalDBdriver; |
| 887 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1021 | + if ($filter_name == '') { |
|
| 1022 | + $filter_name = $this->filter_name; |
|
| 1023 | + } |
|
| 888 | 1024 | if ($globalDBdriver == 'mysql') { |
| 889 | 1025 | $query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name"; |
| 890 | 1026 | } else { |
@@ -902,7 +1038,9 @@ discard block |
||
| 902 | 1038 | |
| 903 | 1039 | public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 904 | 1040 | global $globalDBdriver; |
| 905 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1041 | + if ($filter_name == '') { |
|
| 1042 | + $filter_name = $this->filter_name; |
|
| 1043 | + } |
|
| 906 | 1044 | if ($globalDBdriver == 'mysql') { |
| 907 | 1045 | $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"; |
| 908 | 1046 | } else { |
@@ -918,7 +1056,9 @@ discard block |
||
| 918 | 1056 | } |
| 919 | 1057 | public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
| 920 | 1058 | global $globalDBdriver; |
| 921 | - if ($filter_name == '') $filter_name = $this->filter_name; |
|
| 1059 | + if ($filter_name == '') { |
|
| 1060 | + $filter_name = $this->filter_name; |
|
| 1061 | + } |
|
| 922 | 1062 | if ($globalDBdriver == 'mysql') { |
| 923 | 1063 | $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"; |
| 924 | 1064 | } else { |
@@ -1259,10 +1399,14 @@ discard block |
||
| 1259 | 1399 | $Connection = new Connection(); |
| 1260 | 1400 | date_default_timezone_set('UTC'); |
| 1261 | 1401 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 1262 | - if ($globalDebug) echo 'Update stats !'."\n"; |
|
| 1402 | + if ($globalDebug) { |
|
| 1403 | + echo 'Update stats !'."\n"; |
|
| 1404 | + } |
|
| 1263 | 1405 | if (isset($last_update[0]['value'])) { |
| 1264 | 1406 | $last_update_day = $last_update[0]['value']; |
| 1265 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 1407 | + } else { |
|
| 1408 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 1409 | + } |
|
| 1266 | 1410 | $reset = false; |
| 1267 | 1411 | if ($globalStatsResetYear) { |
| 1268 | 1412 | $reset = true; |
@@ -1270,42 +1414,60 @@ discard block |
||
| 1270 | 1414 | } |
| 1271 | 1415 | $Spotter = new Spotter($this->db); |
| 1272 | 1416 | |
| 1273 | - if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
|
| 1417 | + if ($globalDebug) { |
|
| 1418 | + echo 'Count all aircraft types...'."\n"; |
|
| 1419 | + } |
|
| 1274 | 1420 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
| 1275 | 1421 | foreach ($alldata as $number) { |
| 1276 | 1422 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
| 1277 | 1423 | } |
| 1278 | - if ($globalDebug) echo 'Count all airlines...'."\n"; |
|
| 1424 | + if ($globalDebug) { |
|
| 1425 | + echo 'Count all airlines...'."\n"; |
|
| 1426 | + } |
|
| 1279 | 1427 | $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
| 1280 | 1428 | foreach ($alldata as $number) { |
| 1281 | 1429 | $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
| 1282 | 1430 | } |
| 1283 | - if ($globalDebug) echo 'Count all registrations...'."\n"; |
|
| 1431 | + if ($globalDebug) { |
|
| 1432 | + echo 'Count all registrations...'."\n"; |
|
| 1433 | + } |
|
| 1284 | 1434 | $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
| 1285 | 1435 | foreach ($alldata as $number) { |
| 1286 | 1436 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
| 1287 | 1437 | } |
| 1288 | - if ($globalDebug) echo 'Count all callsigns...'."\n"; |
|
| 1438 | + if ($globalDebug) { |
|
| 1439 | + echo 'Count all callsigns...'."\n"; |
|
| 1440 | + } |
|
| 1289 | 1441 | $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
| 1290 | 1442 | foreach ($alldata as $number) { |
| 1291 | 1443 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1292 | 1444 | } |
| 1293 | - if ($globalDebug) echo 'Count all owners...'."\n"; |
|
| 1445 | + if ($globalDebug) { |
|
| 1446 | + echo 'Count all owners...'."\n"; |
|
| 1447 | + } |
|
| 1294 | 1448 | $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
| 1295 | 1449 | foreach ($alldata as $number) { |
| 1296 | 1450 | $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
| 1297 | 1451 | } |
| 1298 | - if ($globalDebug) echo 'Count all pilots...'."\n"; |
|
| 1452 | + if ($globalDebug) { |
|
| 1453 | + echo 'Count all pilots...'."\n"; |
|
| 1454 | + } |
|
| 1299 | 1455 | $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
| 1300 | 1456 | foreach ($alldata as $number) { |
| 1301 | 1457 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
| 1302 | 1458 | } |
| 1303 | 1459 | |
| 1304 | - if ($globalDebug) echo 'Count all departure airports...'."\n"; |
|
| 1460 | + if ($globalDebug) { |
|
| 1461 | + echo 'Count all departure airports...'."\n"; |
|
| 1462 | + } |
|
| 1305 | 1463 | $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
| 1306 | - if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
|
| 1464 | + if ($globalDebug) { |
|
| 1465 | + echo 'Count all detected departure airports...'."\n"; |
|
| 1466 | + } |
|
| 1307 | 1467 | $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
| 1308 | - if ($globalDebug) echo 'Order departure airports...'."\n"; |
|
| 1468 | + if ($globalDebug) { |
|
| 1469 | + echo 'Order departure airports...'."\n"; |
|
| 1470 | + } |
|
| 1309 | 1471 | $alldata = array(); |
| 1310 | 1472 | |
| 1311 | 1473 | foreach ($pall as $value) { |
@@ -1316,7 +1478,9 @@ discard block |
||
| 1316 | 1478 | $icao = $value['airport_departure_icao']; |
| 1317 | 1479 | if (isset($alldata[$icao])) { |
| 1318 | 1480 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 1319 | - } else $alldata[$icao] = $value; |
|
| 1481 | + } else { |
|
| 1482 | + $alldata[$icao] = $value; |
|
| 1483 | + } |
|
| 1320 | 1484 | } |
| 1321 | 1485 | $count = array(); |
| 1322 | 1486 | foreach ($alldata as $key => $row) { |
@@ -1326,11 +1490,17 @@ discard block |
||
| 1326 | 1490 | foreach ($alldata as $number) { |
| 1327 | 1491 | 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); |
| 1328 | 1492 | } |
| 1329 | - if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
|
| 1493 | + if ($globalDebug) { |
|
| 1494 | + echo 'Count all arrival airports...'."\n"; |
|
| 1495 | + } |
|
| 1330 | 1496 | $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
| 1331 | - if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
|
| 1497 | + if ($globalDebug) { |
|
| 1498 | + echo 'Count all detected arrival airports...'."\n"; |
|
| 1499 | + } |
|
| 1332 | 1500 | $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
| 1333 | - if ($globalDebug) echo 'Order arrival airports...'."\n"; |
|
| 1501 | + if ($globalDebug) { |
|
| 1502 | + echo 'Order arrival airports...'."\n"; |
|
| 1503 | + } |
|
| 1334 | 1504 | $alldata = array(); |
| 1335 | 1505 | foreach ($pall as $value) { |
| 1336 | 1506 | $icao = $value['airport_arrival_icao']; |
@@ -1340,7 +1510,9 @@ discard block |
||
| 1340 | 1510 | $icao = $value['airport_arrival_icao']; |
| 1341 | 1511 | if (isset($alldata[$icao])) { |
| 1342 | 1512 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 1343 | - } else $alldata[$icao] = $value; |
|
| 1513 | + } else { |
|
| 1514 | + $alldata[$icao] = $value; |
|
| 1515 | + } |
|
| 1344 | 1516 | } |
| 1345 | 1517 | $count = array(); |
| 1346 | 1518 | foreach ($alldata as $key => $row) { |
@@ -1351,7 +1523,9 @@ discard block |
||
| 1351 | 1523 | 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); |
| 1352 | 1524 | } |
| 1353 | 1525 | if ($Connection->tableExists('countries')) { |
| 1354 | - if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
|
| 1526 | + if ($globalDebug) { |
|
| 1527 | + echo 'Count all flights by countries...'."\n"; |
|
| 1528 | + } |
|
| 1355 | 1529 | $SpotterArchive = new SpotterArchive(); |
| 1356 | 1530 | $alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 1357 | 1531 | foreach ($alldata as $number) { |
@@ -1363,46 +1537,66 @@ discard block |
||
| 1363 | 1537 | // Add by month using getstat if month finish... |
| 1364 | 1538 | |
| 1365 | 1539 | //if (date('m',strtotime($last_update_day)) != date('m')) { |
| 1366 | - if ($globalDebug) echo 'Count all flights by months...'."\n"; |
|
| 1540 | + if ($globalDebug) { |
|
| 1541 | + echo 'Count all flights by months...'."\n"; |
|
| 1542 | + } |
|
| 1367 | 1543 | $Spotter = new Spotter($this->db); |
| 1368 | 1544 | $alldata = $Spotter->countAllMonths(); |
| 1369 | 1545 | $lastyear = false; |
| 1370 | 1546 | foreach ($alldata as $number) { |
| 1371 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 1547 | + if ($number['year_name'] != date('Y')) { |
|
| 1548 | + $lastyear = true; |
|
| 1549 | + } |
|
| 1372 | 1550 | $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']))); |
| 1373 | 1551 | } |
| 1374 | - if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
|
| 1552 | + if ($globalDebug) { |
|
| 1553 | + echo 'Count all military flights by months...'."\n"; |
|
| 1554 | + } |
|
| 1375 | 1555 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1376 | 1556 | foreach ($alldata as $number) { |
| 1377 | 1557 | $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']))); |
| 1378 | 1558 | } |
| 1379 | - if ($globalDebug) echo 'Count all owners by months...'."\n"; |
|
| 1559 | + if ($globalDebug) { |
|
| 1560 | + echo 'Count all owners by months...'."\n"; |
|
| 1561 | + } |
|
| 1380 | 1562 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1381 | 1563 | foreach ($alldata as $number) { |
| 1382 | 1564 | $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']))); |
| 1383 | 1565 | } |
| 1384 | - if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
|
| 1566 | + if ($globalDebug) { |
|
| 1567 | + echo 'Count all pilots by months...'."\n"; |
|
| 1568 | + } |
|
| 1385 | 1569 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1386 | 1570 | foreach ($alldata as $number) { |
| 1387 | 1571 | $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']))); |
| 1388 | 1572 | } |
| 1389 | - if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
|
| 1573 | + if ($globalDebug) { |
|
| 1574 | + echo 'Count all airlines by months...'."\n"; |
|
| 1575 | + } |
|
| 1390 | 1576 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1391 | 1577 | foreach ($alldata as $number) { |
| 1392 | 1578 | $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']))); |
| 1393 | 1579 | } |
| 1394 | - if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
|
| 1580 | + if ($globalDebug) { |
|
| 1581 | + echo 'Count all aircrafts by months...'."\n"; |
|
| 1582 | + } |
|
| 1395 | 1583 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1396 | 1584 | foreach ($alldata as $number) { |
| 1397 | 1585 | $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']))); |
| 1398 | 1586 | } |
| 1399 | - if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
|
| 1587 | + if ($globalDebug) { |
|
| 1588 | + echo 'Count all real arrivals by months...'."\n"; |
|
| 1589 | + } |
|
| 1400 | 1590 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1401 | 1591 | foreach ($alldata as $number) { |
| 1402 | 1592 | $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']))); |
| 1403 | 1593 | } |
| 1404 | - if ($globalDebug) echo 'Airports data...'."\n"; |
|
| 1405 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 1594 | + if ($globalDebug) { |
|
| 1595 | + echo 'Airports data...'."\n"; |
|
| 1596 | + } |
|
| 1597 | + if ($globalDebug) { |
|
| 1598 | + echo '...Departure'."\n"; |
|
| 1599 | + } |
|
| 1406 | 1600 | $this->deleteStatAirport('daily'); |
| 1407 | 1601 | // $pall = $Spotter->getLast7DaysAirportsDeparture(); |
| 1408 | 1602 | // $dall = $Spotter->getLast7DaysDetectedAirportsDeparture(); |
@@ -1522,37 +1716,53 @@ discard block |
||
| 1522 | 1716 | |
| 1523 | 1717 | // Count by airlines |
| 1524 | 1718 | echo '--- Stats by airlines ---'."\n"; |
| 1525 | - if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
|
| 1719 | + if ($globalDebug) { |
|
| 1720 | + echo 'Count all aircraft types by airlines...'."\n"; |
|
| 1721 | + } |
|
| 1526 | 1722 | $Spotter = new Spotter($this->db); |
| 1527 | 1723 | $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
| 1528 | 1724 | foreach ($alldata as $number) { |
| 1529 | 1725 | $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
| 1530 | 1726 | } |
| 1531 | - if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 1727 | + if ($globalDebug) { |
|
| 1728 | + echo 'Count all aircraft registrations by airlines...'."\n"; |
|
| 1729 | + } |
|
| 1532 | 1730 | $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
| 1533 | 1731 | foreach ($alldata as $number) { |
| 1534 | 1732 | $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
| 1535 | 1733 | } |
| 1536 | - if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
|
| 1734 | + if ($globalDebug) { |
|
| 1735 | + echo 'Count all callsigns by airlines...'."\n"; |
|
| 1736 | + } |
|
| 1537 | 1737 | $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
| 1538 | 1738 | foreach ($alldata as $number) { |
| 1539 | 1739 | $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
| 1540 | 1740 | } |
| 1541 | - if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
|
| 1741 | + if ($globalDebug) { |
|
| 1742 | + echo 'Count all owners by airlines...'."\n"; |
|
| 1743 | + } |
|
| 1542 | 1744 | $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
| 1543 | 1745 | foreach ($alldata as $number) { |
| 1544 | 1746 | $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
| 1545 | 1747 | } |
| 1546 | - if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
|
| 1748 | + if ($globalDebug) { |
|
| 1749 | + echo 'Count all pilots by airlines...'."\n"; |
|
| 1750 | + } |
|
| 1547 | 1751 | $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
| 1548 | 1752 | foreach ($alldata as $number) { |
| 1549 | 1753 | $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
| 1550 | 1754 | } |
| 1551 | - if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
|
| 1755 | + if ($globalDebug) { |
|
| 1756 | + echo 'Count all departure airports by airlines...'."\n"; |
|
| 1757 | + } |
|
| 1552 | 1758 | $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1553 | - if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 1759 | + if ($globalDebug) { |
|
| 1760 | + echo 'Count all detected departure airports by airlines...'."\n"; |
|
| 1761 | + } |
|
| 1554 | 1762 | $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
| 1555 | - if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
|
| 1763 | + if ($globalDebug) { |
|
| 1764 | + echo 'Order detected departure airports by airlines...'."\n"; |
|
| 1765 | + } |
|
| 1556 | 1766 | //$alldata = array(); |
| 1557 | 1767 | foreach ($dall as $value) { |
| 1558 | 1768 | $icao = $value['airport_departure_icao']; |
@@ -1573,11 +1783,17 @@ discard block |
||
| 1573 | 1783 | foreach ($alldata as $number) { |
| 1574 | 1784 | 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); |
| 1575 | 1785 | } |
| 1576 | - if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
|
| 1786 | + if ($globalDebug) { |
|
| 1787 | + echo 'Count all arrival airports by airlines...'."\n"; |
|
| 1788 | + } |
|
| 1577 | 1789 | $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1578 | - if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 1790 | + if ($globalDebug) { |
|
| 1791 | + echo 'Count all detected arrival airports by airlines...'."\n"; |
|
| 1792 | + } |
|
| 1579 | 1793 | $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
| 1580 | - if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
|
| 1794 | + if ($globalDebug) { |
|
| 1795 | + echo 'Order arrival airports by airlines...'."\n"; |
|
| 1796 | + } |
|
| 1581 | 1797 | //$alldata = array(); |
| 1582 | 1798 | foreach ($dall as $value) { |
| 1583 | 1799 | $icao = $value['airport_arrival_icao']; |
@@ -1596,37 +1812,53 @@ discard block |
||
| 1596 | 1812 | } |
| 1597 | 1813 | $alldata = $pall; |
| 1598 | 1814 | foreach ($alldata as $number) { |
| 1599 | - 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); |
|
| 1815 | + if ($number['airline_icao'] != '') { |
|
| 1816 | + 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); |
|
| 1817 | + } |
|
| 1818 | + } |
|
| 1819 | + if ($globalDebug) { |
|
| 1820 | + echo 'Count all flights by months by airlines...'."\n"; |
|
| 1600 | 1821 | } |
| 1601 | - if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
|
| 1602 | 1822 | $Spotter = new Spotter($this->db); |
| 1603 | 1823 | $alldata = $Spotter->countAllMonthsByAirlines(); |
| 1604 | 1824 | $lastyear = false; |
| 1605 | 1825 | foreach ($alldata as $number) { |
| 1606 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 1826 | + if ($number['year_name'] != date('Y')) { |
|
| 1827 | + $lastyear = true; |
|
| 1828 | + } |
|
| 1607 | 1829 | $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']); |
| 1608 | 1830 | } |
| 1609 | - if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
|
| 1831 | + if ($globalDebug) { |
|
| 1832 | + echo 'Count all owners by months by airlines...'."\n"; |
|
| 1833 | + } |
|
| 1610 | 1834 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1611 | 1835 | foreach ($alldata as $number) { |
| 1612 | 1836 | $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']); |
| 1613 | 1837 | } |
| 1614 | - if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
|
| 1838 | + if ($globalDebug) { |
|
| 1839 | + echo 'Count all pilots by months by airlines...'."\n"; |
|
| 1840 | + } |
|
| 1615 | 1841 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1616 | 1842 | foreach ($alldata as $number) { |
| 1617 | 1843 | $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']); |
| 1618 | 1844 | } |
| 1619 | - if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 1845 | + if ($globalDebug) { |
|
| 1846 | + echo 'Count all aircrafts by months by airlines...'."\n"; |
|
| 1847 | + } |
|
| 1620 | 1848 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1621 | 1849 | foreach ($alldata as $number) { |
| 1622 | 1850 | $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']); |
| 1623 | 1851 | } |
| 1624 | - if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 1852 | + if ($globalDebug) { |
|
| 1853 | + echo 'Count all real arrivals by months by airlines...'."\n"; |
|
| 1854 | + } |
|
| 1625 | 1855 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1626 | 1856 | foreach ($alldata as $number) { |
| 1627 | 1857 | $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']); |
| 1628 | 1858 | } |
| 1629 | - if ($globalDebug) echo '...Departure'."\n"; |
|
| 1859 | + if ($globalDebug) { |
|
| 1860 | + echo '...Departure'."\n"; |
|
| 1861 | + } |
|
| 1630 | 1862 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
| 1631 | 1863 | $dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines(); |
| 1632 | 1864 | foreach ($dall as $value) { |
@@ -1649,7 +1881,9 @@ discard block |
||
| 1649 | 1881 | foreach ($alldata as $number) { |
| 1650 | 1882 | $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']); |
| 1651 | 1883 | } |
| 1652 | - if ($globalDebug) echo '...Arrival'."\n"; |
|
| 1884 | + if ($globalDebug) { |
|
| 1885 | + echo '...Arrival'."\n"; |
|
| 1886 | + } |
|
| 1653 | 1887 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
| 1654 | 1888 | $dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines(); |
| 1655 | 1889 | foreach ($dall as $value) { |
@@ -1673,13 +1907,19 @@ discard block |
||
| 1673 | 1907 | $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']); |
| 1674 | 1908 | } |
| 1675 | 1909 | |
| 1676 | - if ($globalDebug) echo 'Flights data...'."\n"; |
|
| 1677 | - if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
|
| 1910 | + if ($globalDebug) { |
|
| 1911 | + echo 'Flights data...'."\n"; |
|
| 1912 | + } |
|
| 1913 | + if ($globalDebug) { |
|
| 1914 | + echo '-> countAllDatesLastMonth...'."\n"; |
|
| 1915 | + } |
|
| 1678 | 1916 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1679 | 1917 | foreach ($alldata as $number) { |
| 1680 | 1918 | $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
| 1681 | 1919 | } |
| 1682 | - if ($globalDebug) echo '-> countAllDates...'."\n"; |
|
| 1920 | + if ($globalDebug) { |
|
| 1921 | + echo '-> countAllDates...'."\n"; |
|
| 1922 | + } |
|
| 1683 | 1923 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1684 | 1924 | $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
| 1685 | 1925 | $values = array(); |
@@ -1692,7 +1932,9 @@ discard block |
||
| 1692 | 1932 | $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
| 1693 | 1933 | } |
| 1694 | 1934 | |
| 1695 | - if ($globalDebug) echo '-> countAllHours...'."\n"; |
|
| 1935 | + if ($globalDebug) { |
|
| 1936 | + echo '-> countAllHours...'."\n"; |
|
| 1937 | + } |
|
| 1696 | 1938 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1697 | 1939 | foreach ($alldata as $number) { |
| 1698 | 1940 | $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
@@ -1700,7 +1942,9 @@ discard block |
||
| 1700 | 1942 | |
| 1701 | 1943 | |
| 1702 | 1944 | // Stats by filters |
| 1703 | - if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array(); |
|
| 1945 | + if (!isset($globalStatsFilters) || $globalStatsFilters == '') { |
|
| 1946 | + $globalStatsFilters = array(); |
|
| 1947 | + } |
|
| 1704 | 1948 | foreach ($globalStatsFilters as $name => $filter) { |
| 1705 | 1949 | //$filter_name = $filter['name']; |
| 1706 | 1950 | $filter_name = $name; |
@@ -1708,11 +1952,15 @@ discard block |
||
| 1708 | 1952 | $last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name); |
| 1709 | 1953 | if (isset($last_update[0]['value'])) { |
| 1710 | 1954 | $last_update_day = $last_update[0]['value']; |
| 1711 | - } else $last_update_day = '2012-12-12 12:12:12'; |
|
| 1955 | + } else { |
|
| 1956 | + $last_update_day = '2012-12-12 12:12:12'; |
|
| 1957 | + } |
|
| 1712 | 1958 | $reset = false; |
| 1713 | 1959 | |
| 1714 | 1960 | // Count by filter |
| 1715 | - if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 1961 | + if ($globalDebug) { |
|
| 1962 | + echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
|
| 1963 | + } |
|
| 1716 | 1964 | $Spotter = new Spotter($this->db); |
| 1717 | 1965 | $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
| 1718 | 1966 | foreach ($alldata as $number) { |
@@ -1749,7 +1997,9 @@ discard block |
||
| 1749 | 1997 | $icao = $value['airport_departure_icao']; |
| 1750 | 1998 | if (isset($alldata[$icao])) { |
| 1751 | 1999 | $alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count']; |
| 1752 | - } else $alldata[$icao] = $value; |
|
| 2000 | + } else { |
|
| 2001 | + $alldata[$icao] = $value; |
|
| 2002 | + } |
|
| 1753 | 2003 | } |
| 1754 | 2004 | $count = array(); |
| 1755 | 2005 | foreach ($alldata as $key => $row) { |
@@ -1770,7 +2020,9 @@ discard block |
||
| 1770 | 2020 | $icao = $value['airport_arrival_icao']; |
| 1771 | 2021 | if (isset($alldata[$icao])) { |
| 1772 | 2022 | $alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count']; |
| 1773 | - } else $alldata[$icao] = $value; |
|
| 2023 | + } else { |
|
| 2024 | + $alldata[$icao] = $value; |
|
| 2025 | + } |
|
| 1774 | 2026 | } |
| 1775 | 2027 | $count = array(); |
| 1776 | 2028 | foreach ($alldata as $key => $row) { |
@@ -1784,7 +2036,9 @@ discard block |
||
| 1784 | 2036 | $alldata = $Spotter->countAllMonths($filter); |
| 1785 | 2037 | $lastyear = false; |
| 1786 | 2038 | foreach ($alldata as $number) { |
| 1787 | - if ($number['year_name'] != date('Y')) $lastyear = true; |
|
| 2039 | + if ($number['year_name'] != date('Y')) { |
|
| 2040 | + $lastyear = true; |
|
| 2041 | + } |
|
| 1788 | 2042 | $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); |
| 1789 | 2043 | } |
| 1790 | 2044 | $alldata = $Spotter->countAllMonthsOwners($filter); |
@@ -17,14 +17,14 @@ discard block |
||
| 17 | 17 | $this->db = $Connection->db(); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 20 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 21 | 21 | $query = "DELETE FROM config WHERE name = :type; |
| 22 | 22 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 23 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 23 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 24 | 24 | try { |
| 25 | 25 | $sth = $this->db->prepare($query); |
| 26 | 26 | $sth->execute($query_values); |
| 27 | - } catch(PDOException $e) { |
|
| 27 | + } catch (PDOException $e) { |
|
| 28 | 28 | return "error : ".$e->getMessage(); |
| 29 | 29 | } |
| 30 | 30 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | try { |
| 35 | 35 | $sth = $this->db->prepare($query); |
| 36 | 36 | $sth->execute(array(':type' => $type)); |
| 37 | - } catch(PDOException $e) { |
|
| 37 | + } catch (PDOException $e) { |
|
| 38 | 38 | echo "error : ".$e->getMessage(); |
| 39 | 39 | } |
| 40 | 40 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | try { |
| 55 | 55 | $sth = $this->db->prepare($query); |
| 56 | 56 | $sth->execute(array(':filter_name' => $filter_name)); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | try { |
| 65 | 65 | $sth = $this->db->prepare($query); |
| 66 | 66 | $sth->execute(); |
| 67 | - } catch(PDOException $e) { |
|
| 67 | + } catch (PDOException $e) { |
|
| 68 | 68 | return "error : ".$e->getMessage(); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | try { |
| 73 | 73 | $sth = $this->db->prepare($query); |
| 74 | 74 | $sth->execute(array(':filter_name' => $filter_name)); |
| 75 | - } catch(PDOException $e) { |
|
| 75 | + } catch (PDOException $e) { |
|
| 76 | 76 | return "error : ".$e->getMessage(); |
| 77 | 77 | } |
| 78 | 78 | } |
@@ -82,43 +82,43 @@ discard block |
||
| 82 | 82 | try { |
| 83 | 83 | $sth = $this->db->prepare($query); |
| 84 | 84 | $sth->execute(array(':filter_name' => $filter_name)); |
| 85 | - } catch(PDOException $e) { |
|
| 85 | + } catch (PDOException $e) { |
|
| 86 | 86 | echo "error : ".$e->getMessage(); |
| 87 | 87 | } |
| 88 | 88 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 89 | 89 | return $all; |
| 90 | 90 | } |
| 91 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 91 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 92 | 92 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 93 | 93 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 94 | 94 | try { |
| 95 | 95 | $sth = $this->db->prepare($query); |
| 96 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 97 | - } catch(PDOException $e) { |
|
| 96 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 97 | + } catch (PDOException $e) { |
|
| 98 | 98 | echo "error : ".$e->getMessage(); |
| 99 | 99 | } |
| 100 | 100 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 101 | 101 | return $all; |
| 102 | 102 | } |
| 103 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 103 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 104 | 104 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 105 | 105 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 106 | 106 | try { |
| 107 | 107 | $sth = $this->db->prepare($query); |
| 108 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 109 | - } catch(PDOException $e) { |
|
| 108 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 109 | + } catch (PDOException $e) { |
|
| 110 | 110 | echo "error : ".$e->getMessage(); |
| 111 | 111 | } |
| 112 | 112 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 113 | 113 | return $all; |
| 114 | 114 | } |
| 115 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 115 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 116 | 116 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 117 | 117 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 118 | 118 | try { |
| 119 | 119 | $sth = $this->db->prepare($query); |
| 120 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 121 | - } catch(PDOException $e) { |
|
| 120 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 121 | + } catch (PDOException $e) { |
|
| 122 | 122 | echo "error : ".$e->getMessage(); |
| 123 | 123 | } |
| 124 | 124 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -133,22 +133,22 @@ discard block |
||
| 133 | 133 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name 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"; |
| 134 | 134 | try { |
| 135 | 135 | $sth = $this->db->prepare($query); |
| 136 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 137 | - } catch(PDOException $e) { |
|
| 136 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | echo "error : ".$e->getMessage(); |
| 139 | 139 | } |
| 140 | 140 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 141 | 141 | if (empty($all)) { |
| 142 | 142 | $filters = array('airlines' => array($stats_airline)); |
| 143 | 143 | if ($filter_name != '') { |
| 144 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 144 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 145 | 145 | } |
| 146 | 146 | $Spotter = new Spotter($this->db); |
| 147 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 147 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 148 | 148 | } |
| 149 | 149 | return $all; |
| 150 | 150 | } |
| 151 | - public function countAllAirlineCountries($limit = true,$filter_name = '') { |
|
| 151 | + public function countAllAirlineCountries($limit = true, $filter_name = '') { |
|
| 152 | 152 | global $globalStatsFilters; |
| 153 | 153 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 154 | 154 | if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0"; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | try { |
| 157 | 157 | $sth = $this->db->prepare($query); |
| 158 | 158 | $sth->execute(array(':filter_name' => $filter_name)); |
| 159 | - } catch(PDOException $e) { |
|
| 159 | + } catch (PDOException $e) { |
|
| 160 | 160 | echo "error : ".$e->getMessage(); |
| 161 | 161 | } |
| 162 | 162 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -164,28 +164,28 @@ discard block |
||
| 164 | 164 | $Spotter = new Spotter($this->db); |
| 165 | 165 | $filters = array(); |
| 166 | 166 | if ($filter_name != '') { |
| 167 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 167 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 168 | 168 | } |
| 169 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 169 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 170 | 170 | } |
| 171 | 171 | return $all; |
| 172 | 172 | } |
| 173 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') { |
|
| 173 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 174 | 174 | global $globalStatsFilters; |
| 175 | 175 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 176 | 176 | 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"; |
| 177 | 177 | 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"; |
| 178 | 178 | try { |
| 179 | 179 | $sth = $this->db->prepare($query); |
| 180 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 181 | - } catch(PDOException $e) { |
|
| 180 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 181 | + } catch (PDOException $e) { |
|
| 182 | 182 | echo "error : ".$e->getMessage(); |
| 183 | 183 | } |
| 184 | 184 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 185 | 185 | if (empty($all)) { |
| 186 | 186 | $filters = array('airlines' => array($stats_airline)); |
| 187 | 187 | if ($filter_name != '') { |
| 188 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 188 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 189 | 189 | } |
| 190 | 190 | $Spotter = new Spotter($this->db); |
| 191 | 191 | $all = $Spotter->countAllAircraftManufacturers($filters); |
@@ -200,18 +200,18 @@ discard block |
||
| 200 | 200 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC"; |
| 201 | 201 | try { |
| 202 | 202 | $sth = $this->db->prepare($query); |
| 203 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 204 | - } catch(PDOException $e) { |
|
| 203 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 204 | + } catch (PDOException $e) { |
|
| 205 | 205 | echo "error : ".$e->getMessage(); |
| 206 | 206 | } |
| 207 | 207 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 208 | 208 | if (empty($all)) { |
| 209 | 209 | $filters = array('airlines' => array($stats_airline)); |
| 210 | 210 | if ($filter_name != '') { |
| 211 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 211 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 212 | 212 | } |
| 213 | 213 | $Spotter = new Spotter($this->db); |
| 214 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 214 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 215 | 215 | } |
| 216 | 216 | return $all; |
| 217 | 217 | } |
@@ -222,15 +222,15 @@ discard block |
||
| 222 | 222 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC"; |
| 223 | 223 | try { |
| 224 | 224 | $sth = $this->db->prepare($query); |
| 225 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 226 | - } catch(PDOException $e) { |
|
| 225 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 226 | + } catch (PDOException $e) { |
|
| 227 | 227 | echo "error : ".$e->getMessage(); |
| 228 | 228 | } |
| 229 | 229 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 230 | 230 | if (empty($all)) { |
| 231 | 231 | $filters = array('airlines' => array($stats_airline)); |
| 232 | 232 | if ($filter_name != '') { |
| 233 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 233 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 234 | 234 | } |
| 235 | 235 | $Spotter = new Spotter($this->db); |
| 236 | 236 | $all = $Spotter->countAllDepartureCountries($filters); |
@@ -238,7 +238,7 @@ discard block |
||
| 238 | 238 | return $all; |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | - public function countAllAirlines($limit = true,$filter_name = '') { |
|
| 241 | + public function countAllAirlines($limit = true, $filter_name = '') { |
|
| 242 | 242 | global $globalStatsFilters; |
| 243 | 243 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 244 | 244 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | try { |
| 247 | 247 | $sth = $this->db->prepare($query); |
| 248 | 248 | $sth->execute(array(':filter_name' => $filter_name)); |
| 249 | - } catch(PDOException $e) { |
|
| 249 | + } catch (PDOException $e) { |
|
| 250 | 250 | echo "error : ".$e->getMessage(); |
| 251 | 251 | } |
| 252 | 252 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -254,58 +254,58 @@ discard block |
||
| 254 | 254 | $Spotter = new Spotter($this->db); |
| 255 | 255 | $filters = array(); |
| 256 | 256 | if ($filter_name != '') { |
| 257 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 257 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 258 | 258 | } |
| 259 | 259 | |
| 260 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 260 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 261 | 261 | } |
| 262 | 262 | return $all; |
| 263 | 263 | } |
| 264 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 264 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 265 | 265 | global $globalStatsFilters; |
| 266 | 266 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 267 | 267 | 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"; |
| 268 | 268 | 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"; |
| 269 | 269 | try { |
| 270 | 270 | $sth = $this->db->prepare($query); |
| 271 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 272 | - } catch(PDOException $e) { |
|
| 271 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 272 | + } catch (PDOException $e) { |
|
| 273 | 273 | echo "error : ".$e->getMessage(); |
| 274 | 274 | } |
| 275 | 275 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 276 | 276 | if (empty($all)) { |
| 277 | 277 | $filters = array('airlines' => array($stats_airline)); |
| 278 | 278 | if ($filter_name != '') { |
| 279 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 279 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 280 | 280 | } |
| 281 | 281 | $Spotter = new Spotter($this->db); |
| 282 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 282 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 283 | 283 | } |
| 284 | 284 | return $all; |
| 285 | 285 | } |
| 286 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 286 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 287 | 287 | global $globalStatsFilters; |
| 288 | 288 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 289 | 289 | 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"; |
| 290 | 290 | 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"; |
| 291 | 291 | try { |
| 292 | 292 | $sth = $this->db->prepare($query); |
| 293 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 294 | - } catch(PDOException $e) { |
|
| 293 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 294 | + } catch (PDOException $e) { |
|
| 295 | 295 | echo "error : ".$e->getMessage(); |
| 296 | 296 | } |
| 297 | 297 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 298 | 298 | if (empty($all)) { |
| 299 | 299 | $filters = array('airlines' => array($stats_airline)); |
| 300 | 300 | if ($filter_name != '') { |
| 301 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 301 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 302 | 302 | } |
| 303 | 303 | $Spotter = new Spotter($this->db); |
| 304 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 304 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 305 | 305 | } |
| 306 | 306 | return $all; |
| 307 | 307 | } |
| 308 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') { |
|
| 308 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 309 | 309 | $Connection = new Connection(); |
| 310 | 310 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 311 | 311 | if ($Connection->tableExists('countries')) { |
@@ -313,8 +313,8 @@ discard block |
||
| 313 | 313 | 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"; |
| 314 | 314 | try { |
| 315 | 315 | $sth = $this->db->prepare($query); |
| 316 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 317 | - } catch(PDOException $e) { |
|
| 316 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 317 | + } catch (PDOException $e) { |
|
| 318 | 318 | echo "error : ".$e->getMessage(); |
| 319 | 319 | } |
| 320 | 320 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -329,70 +329,70 @@ discard block |
||
| 329 | 329 | return array(); |
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 332 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 333 | 333 | global $globalStatsFilters; |
| 334 | 334 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 335 | 335 | 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"; |
| 336 | 336 | 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"; |
| 337 | 337 | try { |
| 338 | 338 | $sth = $this->db->prepare($query); |
| 339 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 340 | - } catch(PDOException $e) { |
|
| 339 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 340 | + } catch (PDOException $e) { |
|
| 341 | 341 | echo "error : ".$e->getMessage(); |
| 342 | 342 | } |
| 343 | 343 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 344 | 344 | if (empty($all)) { |
| 345 | 345 | $filters = array('airlines' => array($stats_airline)); |
| 346 | 346 | if ($filter_name != '') { |
| 347 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 347 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 348 | 348 | } |
| 349 | 349 | $Spotter = new Spotter($this->db); |
| 350 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 350 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 351 | 351 | } |
| 352 | 352 | return $all; |
| 353 | 353 | } |
| 354 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') { |
|
| 354 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 355 | 355 | global $globalStatsFilters; |
| 356 | 356 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 357 | 357 | 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"; |
| 358 | 358 | 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"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $this->db->prepare($query); |
| 361 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 362 | - } catch(PDOException $e) { |
|
| 361 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | echo "error : ".$e->getMessage(); |
| 364 | 364 | } |
| 365 | 365 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 366 | 366 | if (empty($all)) { |
| 367 | 367 | $filters = array('airlines' => array($stats_airline)); |
| 368 | 368 | if ($filter_name != '') { |
| 369 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 369 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 370 | 370 | } |
| 371 | 371 | $Spotter = new Spotter($this->db); |
| 372 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 372 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 373 | 373 | } |
| 374 | 374 | return $all; |
| 375 | 375 | } |
| 376 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 376 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 377 | 377 | global $globalStatsFilters; |
| 378 | 378 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 379 | 379 | if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0"; |
| 380 | 380 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 381 | 381 | try { |
| 382 | 382 | $sth = $this->db->prepare($query); |
| 383 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 384 | - } catch(PDOException $e) { |
|
| 383 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 384 | + } catch (PDOException $e) { |
|
| 385 | 385 | echo "error : ".$e->getMessage(); |
| 386 | 386 | } |
| 387 | 387 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 388 | 388 | if (empty($all)) { |
| 389 | 389 | $filters = array('airlines' => array($stats_airline)); |
| 390 | 390 | if ($filter_name != '') { |
| 391 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 391 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 392 | 392 | } |
| 393 | 393 | $Spotter = new Spotter($this->db); |
| 394 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 395 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 394 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 395 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 396 | 396 | $all = array(); |
| 397 | 397 | foreach ($pall as $value) { |
| 398 | 398 | $icao = $value['airport_departure_icao']; |
@@ -409,30 +409,30 @@ discard block |
||
| 409 | 409 | foreach ($all as $key => $row) { |
| 410 | 410 | $count[$key] = $row['airport_departure_icao_count']; |
| 411 | 411 | } |
| 412 | - array_multisort($count,SORT_DESC,$all); |
|
| 412 | + array_multisort($count, SORT_DESC, $all); |
|
| 413 | 413 | } |
| 414 | 414 | return $all; |
| 415 | 415 | } |
| 416 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 416 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 417 | 417 | global $globalStatsFilters; |
| 418 | 418 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 419 | 419 | if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0"; |
| 420 | 420 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 421 | 421 | try { |
| 422 | 422 | $sth = $this->db->prepare($query); |
| 423 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 424 | - } catch(PDOException $e) { |
|
| 423 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | echo "error : ".$e->getMessage(); |
| 426 | 426 | } |
| 427 | 427 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 428 | 428 | if (empty($all)) { |
| 429 | 429 | $filters = array('airlines' => array($stats_airline)); |
| 430 | 430 | if ($filter_name != '') { |
| 431 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 431 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 432 | 432 | } |
| 433 | 433 | $Spotter = new Spotter($this->db); |
| 434 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 435 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 434 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 435 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 436 | 436 | $all = array(); |
| 437 | 437 | foreach ($pall as $value) { |
| 438 | 438 | $icao = $value['airport_arrival_icao']; |
@@ -449,12 +449,12 @@ discard block |
||
| 449 | 449 | foreach ($all as $key => $row) { |
| 450 | 450 | $count[$key] = $row['airport_arrival_icao_count']; |
| 451 | 451 | } |
| 452 | - array_multisort($count,SORT_DESC,$all); |
|
| 452 | + array_multisort($count, SORT_DESC, $all); |
|
| 453 | 453 | } |
| 454 | 454 | |
| 455 | 455 | return $all; |
| 456 | 456 | } |
| 457 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 457 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 458 | 458 | global $globalDBdriver, $globalStatsFilters; |
| 459 | 459 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 460 | 460 | if ($globalDBdriver == 'mysql') { |
@@ -464,18 +464,18 @@ discard block |
||
| 464 | 464 | 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"; |
| 465 | 465 | 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"; |
| 466 | 466 | } |
| 467 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 467 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 468 | 468 | try { |
| 469 | 469 | $sth = $this->db->prepare($query); |
| 470 | 470 | $sth->execute($query_data); |
| 471 | - } catch(PDOException $e) { |
|
| 471 | + } catch (PDOException $e) { |
|
| 472 | 472 | echo "error : ".$e->getMessage(); |
| 473 | 473 | } |
| 474 | 474 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 475 | 475 | if (empty($all)) { |
| 476 | 476 | $filters = array('airlines' => array($stats_airline)); |
| 477 | 477 | if ($filter_name != '') { |
| 478 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 478 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 479 | 479 | } |
| 480 | 480 | $Spotter = new Spotter($this->db); |
| 481 | 481 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -484,29 +484,29 @@ discard block |
||
| 484 | 484 | return $all; |
| 485 | 485 | } |
| 486 | 486 | |
| 487 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 487 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 488 | 488 | global $globalStatsFilters; |
| 489 | 489 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 490 | 490 | $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"; |
| 491 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 491 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 492 | 492 | try { |
| 493 | 493 | $sth = $this->db->prepare($query); |
| 494 | 494 | $sth->execute($query_data); |
| 495 | - } catch(PDOException $e) { |
|
| 495 | + } catch (PDOException $e) { |
|
| 496 | 496 | echo "error : ".$e->getMessage(); |
| 497 | 497 | } |
| 498 | 498 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 499 | 499 | if (empty($all)) { |
| 500 | 500 | $filters = array('airlines' => array($stats_airline)); |
| 501 | 501 | if ($filter_name != '') { |
| 502 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 502 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 503 | 503 | } |
| 504 | 504 | $Spotter = new Spotter($this->db); |
| 505 | 505 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 506 | 506 | } |
| 507 | 507 | return $all; |
| 508 | 508 | } |
| 509 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 509 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 510 | 510 | global $globalDBdriver, $globalStatsFilters; |
| 511 | 511 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 512 | 512 | if ($globalDBdriver == 'mysql') { |
@@ -514,40 +514,40 @@ discard block |
||
| 514 | 514 | } else { |
| 515 | 515 | $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"; |
| 516 | 516 | } |
| 517 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 517 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 518 | 518 | try { |
| 519 | 519 | $sth = $this->db->prepare($query); |
| 520 | 520 | $sth->execute($query_data); |
| 521 | - } catch(PDOException $e) { |
|
| 521 | + } catch (PDOException $e) { |
|
| 522 | 522 | echo "error : ".$e->getMessage(); |
| 523 | 523 | } |
| 524 | 524 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 525 | 525 | if (empty($all)) { |
| 526 | 526 | $filters = array('airlines' => array($stats_airline)); |
| 527 | 527 | if ($filter_name != '') { |
| 528 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 528 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 529 | 529 | } |
| 530 | 530 | $Spotter = new Spotter($this->db); |
| 531 | 531 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 532 | 532 | } |
| 533 | 533 | return $all; |
| 534 | 534 | } |
| 535 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 535 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 536 | 536 | global $globalStatsFilters; |
| 537 | 537 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 538 | 538 | $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"; |
| 539 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 539 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 540 | 540 | try { |
| 541 | 541 | $sth = $this->db->prepare($query); |
| 542 | 542 | $sth->execute($query_data); |
| 543 | - } catch(PDOException $e) { |
|
| 543 | + } catch (PDOException $e) { |
|
| 544 | 544 | echo "error : ".$e->getMessage(); |
| 545 | 545 | } |
| 546 | 546 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 547 | 547 | if (empty($all)) { |
| 548 | 548 | $filters = array('airlines' => array($stats_airline)); |
| 549 | 549 | if ($filter_name != '') { |
| 550 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 550 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 551 | 551 | } |
| 552 | 552 | $Spotter = new Spotter($this->db); |
| 553 | 553 | $all = $Spotter->countAllDates($filters); |
@@ -562,35 +562,35 @@ discard block |
||
| 562 | 562 | try { |
| 563 | 563 | $sth = $this->db->prepare($query); |
| 564 | 564 | $sth->execute($query_data); |
| 565 | - } catch(PDOException $e) { |
|
| 565 | + } catch (PDOException $e) { |
|
| 566 | 566 | echo "error : ".$e->getMessage(); |
| 567 | 567 | } |
| 568 | 568 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 569 | 569 | if (empty($all)) { |
| 570 | 570 | $filters = array(); |
| 571 | 571 | if ($filter_name != '') { |
| 572 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 572 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 573 | 573 | } |
| 574 | 574 | $Spotter = new Spotter($this->db); |
| 575 | 575 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 576 | 576 | } |
| 577 | 577 | return $all; |
| 578 | 578 | } |
| 579 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 579 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 580 | 580 | global $globalStatsFilters; |
| 581 | 581 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 582 | 582 | $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"; |
| 583 | 583 | try { |
| 584 | 584 | $sth = $this->db->prepare($query); |
| 585 | 585 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 586 | - } catch(PDOException $e) { |
|
| 586 | + } catch (PDOException $e) { |
|
| 587 | 587 | echo "error : ".$e->getMessage(); |
| 588 | 588 | } |
| 589 | 589 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 590 | 590 | if (empty($all)) { |
| 591 | 591 | $filters = array('airlines' => array($stats_airline)); |
| 592 | 592 | if ($filter_name != '') { |
| 593 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 593 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 594 | 594 | } |
| 595 | 595 | $Spotter = new Spotter($this->db); |
| 596 | 596 | $all = $Spotter->countAllMonths($filters); |
@@ -604,21 +604,21 @@ discard block |
||
| 604 | 604 | try { |
| 605 | 605 | $sth = $this->db->prepare($query); |
| 606 | 606 | $sth->execute(array(':filter_name' => $filter_name)); |
| 607 | - } catch(PDOException $e) { |
|
| 607 | + } catch (PDOException $e) { |
|
| 608 | 608 | echo "error : ".$e->getMessage(); |
| 609 | 609 | } |
| 610 | 610 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 611 | 611 | if (empty($all)) { |
| 612 | 612 | $filters = array(); |
| 613 | 613 | if ($filter_name != '') { |
| 614 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 614 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 615 | 615 | } |
| 616 | 616 | $Spotter = new Spotter($this->db); |
| 617 | 617 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 618 | 618 | } |
| 619 | 619 | return $all; |
| 620 | 620 | } |
| 621 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 621 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 622 | 622 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 623 | 623 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 624 | 624 | 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"; |
@@ -635,17 +635,17 @@ discard block |
||
| 635 | 635 | try { |
| 636 | 636 | $sth = $this->db->prepare($query); |
| 637 | 637 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 638 | - } catch(PDOException $e) { |
|
| 638 | + } catch (PDOException $e) { |
|
| 639 | 639 | echo "error : ".$e->getMessage(); |
| 640 | 640 | } |
| 641 | 641 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 642 | 642 | if (empty($all)) { |
| 643 | 643 | $filters = array('airlines' => array($stats_airline)); |
| 644 | 644 | if ($filter_name != '') { |
| 645 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 645 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 646 | 646 | } |
| 647 | 647 | $Spotter = new Spotter($this->db); |
| 648 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 648 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 649 | 649 | } |
| 650 | 650 | return $all; |
| 651 | 651 | } |
@@ -653,11 +653,11 @@ discard block |
||
| 653 | 653 | public function countOverallFlights($stats_airline = '', $filter_name = '') { |
| 654 | 654 | global $globalStatsFilters; |
| 655 | 655 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 656 | - $all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name); |
|
| 656 | + $all = $this->getSumStats('flights_bymonth', date('Y'), $stats_airline, $filter_name); |
|
| 657 | 657 | if (empty($all)) { |
| 658 | 658 | $filters = array('airlines' => array($stats_airline)); |
| 659 | 659 | if ($filter_name != '') { |
| 660 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 660 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 661 | 661 | } |
| 662 | 662 | $Spotter = new Spotter($this->db); |
| 663 | 663 | $all = $Spotter->countOverallFlights($filters); |
@@ -667,39 +667,39 @@ discard block |
||
| 667 | 667 | public function countOverallMilitaryFlights($filter_name = '') { |
| 668 | 668 | global $globalStatsFilters; |
| 669 | 669 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 670 | - $all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name); |
|
| 670 | + $all = $this->getSumStats('military_flights_bymonth', date('Y'), '', $filter_name); |
|
| 671 | 671 | if (empty($all)) { |
| 672 | 672 | $filters = array(); |
| 673 | 673 | if ($filter_name != '') { |
| 674 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 674 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 675 | 675 | } |
| 676 | 676 | $Spotter = new Spotter($this->db); |
| 677 | 677 | $all = $Spotter->countOverallMilitaryFlights($filters); |
| 678 | 678 | } |
| 679 | 679 | return $all; |
| 680 | 680 | } |
| 681 | - public function countOverallArrival($stats_airline = '',$filter_name = '') { |
|
| 681 | + public function countOverallArrival($stats_airline = '', $filter_name = '') { |
|
| 682 | 682 | global $globalStatsFilters; |
| 683 | 683 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 684 | - $all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name); |
|
| 684 | + $all = $this->getSumStats('realarrivals_bymonth', date('Y'), $stats_airline, $filter_name); |
|
| 685 | 685 | if (empty($all)) { |
| 686 | 686 | $filters = array('airlines' => array($stats_airline)); |
| 687 | 687 | if ($filter_name != '') { |
| 688 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 688 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 689 | 689 | } |
| 690 | 690 | $Spotter = new Spotter($this->db); |
| 691 | 691 | $all = $Spotter->countOverallArrival($filters); |
| 692 | 692 | } |
| 693 | 693 | return $all; |
| 694 | 694 | } |
| 695 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '') { |
|
| 695 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '') { |
|
| 696 | 696 | global $globalStatsFilters; |
| 697 | 697 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 698 | - $all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name); |
|
| 698 | + $all = $this->getSumStats('aircrafts_bymonth', date('Y'), $stats_airline, $filter_name); |
|
| 699 | 699 | if (empty($all)) { |
| 700 | 700 | $filters = array('airlines' => array($stats_airline)); |
| 701 | 701 | if ($filter_name != '') { |
| 702 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 702 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 703 | 703 | } |
| 704 | 704 | $Spotter = new Spotter($this->db); |
| 705 | 705 | $all = $Spotter->countOverallAircrafts($filters); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | try { |
| 714 | 714 | $sth = $this->db->prepare($query); |
| 715 | 715 | $sth->execute(array(':filter_name' => $filter_name)); |
| 716 | - } catch(PDOException $e) { |
|
| 716 | + } catch (PDOException $e) { |
|
| 717 | 717 | echo "error : ".$e->getMessage(); |
| 718 | 718 | } |
| 719 | 719 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -722,14 +722,14 @@ discard block |
||
| 722 | 722 | if (empty($all)) { |
| 723 | 723 | $filters = array(); |
| 724 | 724 | if ($filter_name != '') { |
| 725 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 725 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 726 | 726 | } |
| 727 | 727 | $Spotter = new Spotter($this->db); |
| 728 | 728 | $all = $Spotter->countOverallAirlines($filters); |
| 729 | 729 | } |
| 730 | 730 | return $all; |
| 731 | 731 | } |
| 732 | - public function countOverallOwners($stats_airline = '',$filter_name = '') { |
|
| 732 | + public function countOverallOwners($stats_airline = '', $filter_name = '') { |
|
| 733 | 733 | global $globalStatsFilters; |
| 734 | 734 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 735 | 735 | /* |
@@ -743,25 +743,25 @@ discard block |
||
| 743 | 743 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 744 | 744 | $all = $result[0]['nb_owner']; |
| 745 | 745 | */ |
| 746 | - $all = $this->getSumStats('owners_bymonth',date('Y'),$stats_airline,$filter_name); |
|
| 746 | + $all = $this->getSumStats('owners_bymonth', date('Y'), $stats_airline, $filter_name); |
|
| 747 | 747 | if (empty($all)) { |
| 748 | 748 | $filters = array('airlines' => array($stats_airline)); |
| 749 | 749 | if ($filter_name != '') { |
| 750 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 750 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 751 | 751 | } |
| 752 | 752 | $Spotter = new Spotter($this->db); |
| 753 | 753 | $all = $Spotter->countOverallOwners($filters); |
| 754 | 754 | } |
| 755 | 755 | return $all; |
| 756 | 756 | } |
| 757 | - public function countOverallPilots($stats_airline = '',$filter_name = '') { |
|
| 757 | + public function countOverallPilots($stats_airline = '', $filter_name = '') { |
|
| 758 | 758 | global $globalStatsFilters; |
| 759 | 759 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 760 | - $all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name); |
|
| 760 | + $all = $this->getSumStats('pilots_bymonth', date('Y'), $stats_airline, $filter_name); |
|
| 761 | 761 | if (empty($all)) { |
| 762 | 762 | $filters = array('airlines' => array($stats_airline)); |
| 763 | 763 | if ($filter_name != '') { |
| 764 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 764 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 765 | 765 | } |
| 766 | 766 | $Spotter = new Spotter($this->db); |
| 767 | 767 | $all = $Spotter->countOverallPilots($filters); |
@@ -769,33 +769,33 @@ discard block |
||
| 769 | 769 | return $all; |
| 770 | 770 | } |
| 771 | 771 | |
| 772 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 772 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 773 | 773 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 774 | 774 | $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"; |
| 775 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 775 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 776 | 776 | try { |
| 777 | 777 | $sth = $this->db->prepare($query); |
| 778 | 778 | $sth->execute($query_values); |
| 779 | - } catch(PDOException $e) { |
|
| 779 | + } catch (PDOException $e) { |
|
| 780 | 780 | echo "error : ".$e->getMessage(); |
| 781 | 781 | } |
| 782 | 782 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 783 | 783 | return $all; |
| 784 | 784 | } |
| 785 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 785 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 786 | 786 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 787 | 787 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 788 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 788 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 789 | 789 | try { |
| 790 | 790 | $sth = $this->db->prepare($query); |
| 791 | 791 | $sth->execute($query_values); |
| 792 | - } catch(PDOException $e) { |
|
| 792 | + } catch (PDOException $e) { |
|
| 793 | 793 | echo "error : ".$e->getMessage(); |
| 794 | 794 | } |
| 795 | 795 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 796 | 796 | return $all; |
| 797 | 797 | } |
| 798 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') { |
|
| 798 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '') { |
|
| 799 | 799 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 800 | 800 | global $globalArchiveMonths, $globalDBdriver; |
| 801 | 801 | if ($globalDBdriver == 'mysql') { |
@@ -803,11 +803,11 @@ discard block |
||
| 803 | 803 | } else { |
| 804 | 804 | $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"; |
| 805 | 805 | } |
| 806 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 806 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 807 | 807 | try { |
| 808 | 808 | $sth = $this->db->prepare($query); |
| 809 | 809 | $sth->execute($query_values); |
| 810 | - } catch(PDOException $e) { |
|
| 810 | + } catch (PDOException $e) { |
|
| 811 | 811 | echo "error : ".$e->getMessage(); |
| 812 | 812 | } |
| 813 | 813 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -825,7 +825,7 @@ discard block |
||
| 825 | 825 | try { |
| 826 | 826 | $sth = $this->db->prepare($query); |
| 827 | 827 | $sth->execute($query_values); |
| 828 | - } catch(PDOException $e) { |
|
| 828 | + } catch (PDOException $e) { |
|
| 829 | 829 | echo "error : ".$e->getMessage(); |
| 830 | 830 | } |
| 831 | 831 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -842,7 +842,7 @@ discard block |
||
| 842 | 842 | try { |
| 843 | 843 | $sth = $this->db->prepare($query); |
| 844 | 844 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 845 | - } catch(PDOException $e) { |
|
| 845 | + } catch (PDOException $e) { |
|
| 846 | 846 | echo "error : ".$e->getMessage(); |
| 847 | 847 | } |
| 848 | 848 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -859,7 +859,7 @@ 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 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | try { |
| 877 | 877 | $sth = $this->db->prepare($query); |
| 878 | 878 | $sth->execute(array(':filter_name' => $filter_name)); |
| 879 | - } catch(PDOException $e) { |
|
| 879 | + } catch (PDOException $e) { |
|
| 880 | 880 | echo "error : ".$e->getMessage(); |
| 881 | 881 | } |
| 882 | 882 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -893,14 +893,14 @@ discard block |
||
| 893 | 893 | try { |
| 894 | 894 | $sth = $this->db->prepare($query); |
| 895 | 895 | $sth->execute(array(':filter_name' => $filter_name)); |
| 896 | - } catch(PDOException $e) { |
|
| 896 | + } catch (PDOException $e) { |
|
| 897 | 897 | echo "error : ".$e->getMessage(); |
| 898 | 898 | } |
| 899 | 899 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 900 | 900 | return $all[0]['total']; |
| 901 | 901 | } |
| 902 | 902 | |
| 903 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 903 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 904 | 904 | global $globalDBdriver; |
| 905 | 905 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 906 | 906 | if ($globalDBdriver == 'mysql') { |
@@ -908,15 +908,15 @@ discard block |
||
| 908 | 908 | } else { |
| 909 | 909 | $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);"; |
| 910 | 910 | } |
| 911 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 911 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 912 | 912 | try { |
| 913 | 913 | $sth = $this->db->prepare($query); |
| 914 | 914 | $sth->execute($query_values); |
| 915 | - } catch(PDOException $e) { |
|
| 915 | + } catch (PDOException $e) { |
|
| 916 | 916 | return "error : ".$e->getMessage(); |
| 917 | 917 | } |
| 918 | 918 | } |
| 919 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 919 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 920 | 920 | global $globalDBdriver; |
| 921 | 921 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 922 | 922 | if ($globalDBdriver == 'mysql') { |
@@ -925,58 +925,58 @@ discard block |
||
| 925 | 925 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 926 | 926 | $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);"; |
| 927 | 927 | } |
| 928 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 928 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 929 | 929 | try { |
| 930 | 930 | $sth = $this->db->prepare($query); |
| 931 | 931 | $sth->execute($query_values); |
| 932 | - } catch(PDOException $e) { |
|
| 932 | + } catch (PDOException $e) { |
|
| 933 | 933 | return "error : ".$e->getMessage(); |
| 934 | 934 | } |
| 935 | 935 | } |
| 936 | - public function getStatsSource($date,$stats_type = '') { |
|
| 936 | + public function getStatsSource($date, $stats_type = '') { |
|
| 937 | 937 | if ($stats_type == '') { |
| 938 | 938 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
| 939 | 939 | $query_values = array(':date' => $date); |
| 940 | 940 | } else { |
| 941 | 941 | $query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name"; |
| 942 | - $query_values = array(':date' => $date,':stats_type' => $stats_type); |
|
| 942 | + $query_values = array(':date' => $date, ':stats_type' => $stats_type); |
|
| 943 | 943 | } |
| 944 | 944 | try { |
| 945 | 945 | $sth = $this->db->prepare($query); |
| 946 | 946 | $sth->execute($query_values); |
| 947 | - } catch(PDOException $e) { |
|
| 947 | + } catch (PDOException $e) { |
|
| 948 | 948 | echo "error : ".$e->getMessage(); |
| 949 | 949 | } |
| 950 | 950 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 951 | 951 | return $all; |
| 952 | 952 | } |
| 953 | 953 | |
| 954 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 954 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 955 | 955 | global $globalDBdriver; |
| 956 | 956 | if ($globalDBdriver == 'mysql') { |
| 957 | 957 | $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"; |
| 958 | 958 | } else { |
| 959 | 959 | $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);"; |
| 960 | 960 | } |
| 961 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 961 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 962 | 962 | try { |
| 963 | 963 | $sth = $this->db->prepare($query); |
| 964 | 964 | $sth->execute($query_values); |
| 965 | - } catch(PDOException $e) { |
|
| 965 | + } catch (PDOException $e) { |
|
| 966 | 966 | return "error : ".$e->getMessage(); |
| 967 | 967 | } |
| 968 | 968 | } |
| 969 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 969 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 970 | 970 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 971 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 971 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 972 | 972 | try { |
| 973 | 973 | $sth = $this->db->prepare($query); |
| 974 | 974 | $sth->execute($query_values); |
| 975 | - } catch(PDOException $e) { |
|
| 975 | + } catch (PDOException $e) { |
|
| 976 | 976 | return "error : ".$e->getMessage(); |
| 977 | 977 | } |
| 978 | 978 | } |
| 979 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 979 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 980 | 980 | global $globalDBdriver; |
| 981 | 981 | if ($globalDBdriver == 'mysql') { |
| 982 | 982 | if ($reset) { |
@@ -991,15 +991,15 @@ discard block |
||
| 991 | 991 | $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);"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 994 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 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 | return "error : ".$e->getMessage(); |
| 1000 | 1000 | } |
| 1001 | 1001 | } |
| 1002 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1002 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1003 | 1003 | global $globalDBdriver; |
| 1004 | 1004 | if ($globalDBdriver == 'mysql') { |
| 1005 | 1005 | if ($reset) { |
@@ -1014,15 +1014,15 @@ discard block |
||
| 1014 | 1014 | $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);"; |
| 1015 | 1015 | } |
| 1016 | 1016 | } |
| 1017 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1017 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1018 | 1018 | try { |
| 1019 | 1019 | $sth = $this->db->prepare($query); |
| 1020 | 1020 | $sth->execute($query_values); |
| 1021 | - } catch(PDOException $e) { |
|
| 1021 | + } catch (PDOException $e) { |
|
| 1022 | 1022 | return "error : ".$e->getMessage(); |
| 1023 | 1023 | } |
| 1024 | 1024 | } |
| 1025 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) { |
|
| 1025 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) { |
|
| 1026 | 1026 | global $globalDBdriver; |
| 1027 | 1027 | if ($globalDBdriver == 'mysql') { |
| 1028 | 1028 | if ($reset) { |
@@ -1037,15 +1037,15 @@ discard block |
||
| 1037 | 1037 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);"; |
| 1038 | 1038 | } |
| 1039 | 1039 | } |
| 1040 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1040 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1041 | 1041 | try { |
| 1042 | 1042 | $sth = $this->db->prepare($query); |
| 1043 | 1043 | $sth->execute($query_values); |
| 1044 | - } catch(PDOException $e) { |
|
| 1044 | + } catch (PDOException $e) { |
|
| 1045 | 1045 | return "error : ".$e->getMessage(); |
| 1046 | 1046 | } |
| 1047 | 1047 | } |
| 1048 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1048 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1049 | 1049 | global $globalDBdriver; |
| 1050 | 1050 | if ($globalDBdriver == 'mysql') { |
| 1051 | 1051 | if ($reset) { |
@@ -1060,15 +1060,15 @@ discard block |
||
| 1060 | 1060 | $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);"; |
| 1061 | 1061 | } |
| 1062 | 1062 | } |
| 1063 | - $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); |
|
| 1063 | + $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); |
|
| 1064 | 1064 | try { |
| 1065 | 1065 | $sth = $this->db->prepare($query); |
| 1066 | 1066 | $sth->execute($query_values); |
| 1067 | - } catch(PDOException $e) { |
|
| 1067 | + } catch (PDOException $e) { |
|
| 1068 | 1068 | return "error : ".$e->getMessage(); |
| 1069 | 1069 | } |
| 1070 | 1070 | } |
| 1071 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1071 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1072 | 1072 | global $globalDBdriver; |
| 1073 | 1073 | if ($globalDBdriver == 'mysql') { |
| 1074 | 1074 | if ($reset) { |
@@ -1083,15 +1083,15 @@ discard block |
||
| 1083 | 1083 | $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);"; |
| 1084 | 1084 | } |
| 1085 | 1085 | } |
| 1086 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1086 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1087 | 1087 | try { |
| 1088 | 1088 | $sth = $this->db->prepare($query); |
| 1089 | 1089 | $sth->execute($query_values); |
| 1090 | - } catch(PDOException $e) { |
|
| 1090 | + } catch (PDOException $e) { |
|
| 1091 | 1091 | return "error : ".$e->getMessage(); |
| 1092 | 1092 | } |
| 1093 | 1093 | } |
| 1094 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1094 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1095 | 1095 | global $globalDBdriver; |
| 1096 | 1096 | if ($globalDBdriver == 'mysql') { |
| 1097 | 1097 | if ($reset) { |
@@ -1106,15 +1106,15 @@ discard block |
||
| 1106 | 1106 | $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);"; |
| 1107 | 1107 | } |
| 1108 | 1108 | } |
| 1109 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1109 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1110 | 1110 | try { |
| 1111 | 1111 | $sth = $this->db->prepare($query); |
| 1112 | 1112 | $sth->execute($query_values); |
| 1113 | - } catch(PDOException $e) { |
|
| 1113 | + } catch (PDOException $e) { |
|
| 1114 | 1114 | return "error : ".$e->getMessage(); |
| 1115 | 1115 | } |
| 1116 | 1116 | } |
| 1117 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1117 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1118 | 1118 | global $globalDBdriver; |
| 1119 | 1119 | if ($globalDBdriver == 'mysql') { |
| 1120 | 1120 | if ($reset) { |
@@ -1129,15 +1129,15 @@ discard block |
||
| 1129 | 1129 | $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);"; |
| 1130 | 1130 | } |
| 1131 | 1131 | } |
| 1132 | - $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); |
|
| 1132 | + $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); |
|
| 1133 | 1133 | try { |
| 1134 | 1134 | $sth = $this->db->prepare($query); |
| 1135 | 1135 | $sth->execute($query_values); |
| 1136 | - } catch(PDOException $e) { |
|
| 1136 | + } catch (PDOException $e) { |
|
| 1137 | 1137 | return "error : ".$e->getMessage(); |
| 1138 | 1138 | } |
| 1139 | 1139 | } |
| 1140 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1140 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | if ($airport_icao != '') { |
| 1143 | 1143 | if ($globalDBdriver == 'mysql') { |
@@ -1153,16 +1153,16 @@ discard block |
||
| 1153 | 1153 | $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);"; |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
| 1156 | - $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); |
|
| 1156 | + $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); |
|
| 1157 | 1157 | try { |
| 1158 | 1158 | $sth = $this->db->prepare($query); |
| 1159 | 1159 | $sth->execute($query_values); |
| 1160 | - } catch(PDOException $e) { |
|
| 1160 | + } catch (PDOException $e) { |
|
| 1161 | 1161 | return "error : ".$e->getMessage(); |
| 1162 | 1162 | } |
| 1163 | 1163 | } |
| 1164 | 1164 | } |
| 1165 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 1165 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | if ($airport_icao != '') { |
| 1168 | 1168 | if ($globalDBdriver == 'mysql') { |
@@ -1170,16 +1170,16 @@ discard block |
||
| 1170 | 1170 | } else { |
| 1171 | 1171 | $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);"; |
| 1172 | 1172 | } |
| 1173 | - $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); |
|
| 1173 | + $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); |
|
| 1174 | 1174 | try { |
| 1175 | 1175 | $sth = $this->db->prepare($query); |
| 1176 | 1176 | $sth->execute($query_values); |
| 1177 | - } catch(PDOException $e) { |
|
| 1177 | + } catch (PDOException $e) { |
|
| 1178 | 1178 | return "error : ".$e->getMessage(); |
| 1179 | 1179 | } |
| 1180 | 1180 | } |
| 1181 | 1181 | } |
| 1182 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1182 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1183 | 1183 | global $globalDBdriver; |
| 1184 | 1184 | if ($airport_icao != '') { |
| 1185 | 1185 | if ($globalDBdriver == 'mysql') { |
@@ -1195,16 +1195,16 @@ discard block |
||
| 1195 | 1195 | $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);"; |
| 1196 | 1196 | } |
| 1197 | 1197 | } |
| 1198 | - $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); |
|
| 1198 | + $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); |
|
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $this->db->prepare($query); |
| 1201 | 1201 | $sth->execute($query_values); |
| 1202 | - } catch(PDOException $e) { |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | return "error : ".$e->getMessage(); |
| 1204 | 1204 | } |
| 1205 | 1205 | } |
| 1206 | 1206 | } |
| 1207 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 1207 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 1208 | 1208 | global $globalDBdriver; |
| 1209 | 1209 | if ($airport_icao != '') { |
| 1210 | 1210 | if ($globalDBdriver == 'mysql') { |
@@ -1212,11 +1212,11 @@ discard block |
||
| 1212 | 1212 | } else { |
| 1213 | 1213 | $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);"; |
| 1214 | 1214 | } |
| 1215 | - $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); |
|
| 1215 | + $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); |
|
| 1216 | 1216 | try { |
| 1217 | 1217 | $sth = $this->db->prepare($query); |
| 1218 | 1218 | $sth->execute($query_values); |
| 1219 | - } catch(PDOException $e) { |
|
| 1219 | + } catch (PDOException $e) { |
|
| 1220 | 1220 | return "error : ".$e->getMessage(); |
| 1221 | 1221 | } |
| 1222 | 1222 | } |
@@ -1228,7 +1228,7 @@ discard block |
||
| 1228 | 1228 | try { |
| 1229 | 1229 | $sth = $this->db->prepare($query); |
| 1230 | 1230 | $sth->execute($query_values); |
| 1231 | - } catch(PDOException $e) { |
|
| 1231 | + } catch (PDOException $e) { |
|
| 1232 | 1232 | return "error : ".$e->getMessage(); |
| 1233 | 1233 | } |
| 1234 | 1234 | } |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | try { |
| 1239 | 1239 | $sth = $this->db->prepare($query); |
| 1240 | 1240 | $sth->execute($query_values); |
| 1241 | - } catch(PDOException $e) { |
|
| 1241 | + } catch (PDOException $e) { |
|
| 1242 | 1242 | return "error : ".$e->getMessage(); |
| 1243 | 1243 | } |
| 1244 | 1244 | } |
@@ -1248,13 +1248,13 @@ discard block |
||
| 1248 | 1248 | try { |
| 1249 | 1249 | $sth = $this->db->prepare($query); |
| 1250 | 1250 | $sth->execute($query_values); |
| 1251 | - } catch(PDOException $e) { |
|
| 1251 | + } catch (PDOException $e) { |
|
| 1252 | 1252 | return "error : ".$e->getMessage(); |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
| 1255 | 1255 | |
| 1256 | 1256 | public function addOldStats() { |
| 1257 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1257 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear; |
|
| 1258 | 1258 | $Common = new Common(); |
| 1259 | 1259 | $Connection = new Connection(); |
| 1260 | 1260 | date_default_timezone_set('UTC'); |
@@ -1271,40 +1271,40 @@ discard block |
||
| 1271 | 1271 | $Spotter = new Spotter($this->db); |
| 1272 | 1272 | |
| 1273 | 1273 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 1274 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 1274 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 1275 | 1275 | foreach ($alldata as $number) { |
| 1276 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 1276 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 1277 | 1277 | } |
| 1278 | 1278 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 1279 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 1279 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 1280 | 1280 | foreach ($alldata as $number) { |
| 1281 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 1281 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 1282 | 1282 | } |
| 1283 | 1283 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 1284 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 1284 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 1285 | 1285 | foreach ($alldata as $number) { |
| 1286 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 1286 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 1287 | 1287 | } |
| 1288 | 1288 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 1289 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 1289 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 1290 | 1290 | foreach ($alldata as $number) { |
| 1291 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1291 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1292 | 1292 | } |
| 1293 | 1293 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 1294 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 1294 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 1295 | 1295 | foreach ($alldata as $number) { |
| 1296 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 1296 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 1297 | 1297 | } |
| 1298 | 1298 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 1299 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 1299 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 1300 | 1300 | foreach ($alldata as $number) { |
| 1301 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 1301 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 1302 | 1302 | } |
| 1303 | 1303 | |
| 1304 | 1304 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1305 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 1305 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 1306 | 1306 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1307 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1307 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 1308 | 1308 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1309 | 1309 | $alldata = array(); |
| 1310 | 1310 | |
@@ -1322,14 +1322,14 @@ discard block |
||
| 1322 | 1322 | foreach ($alldata as $key => $row) { |
| 1323 | 1323 | $count[$key] = $row['airport_departure_icao_count']; |
| 1324 | 1324 | } |
| 1325 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1325 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1326 | 1326 | foreach ($alldata as $number) { |
| 1327 | - 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); |
|
| 1327 | + 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); |
|
| 1328 | 1328 | } |
| 1329 | 1329 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1330 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 1330 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 1331 | 1331 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1332 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1332 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 1333 | 1333 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1334 | 1334 | $alldata = array(); |
| 1335 | 1335 | foreach ($pall as $value) { |
@@ -1346,16 +1346,16 @@ discard block |
||
| 1346 | 1346 | foreach ($alldata as $key => $row) { |
| 1347 | 1347 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1348 | 1348 | } |
| 1349 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1349 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1350 | 1350 | foreach ($alldata as $number) { |
| 1351 | - 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); |
|
| 1351 | + 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); |
|
| 1352 | 1352 | } |
| 1353 | 1353 | if ($Connection->tableExists('countries')) { |
| 1354 | 1354 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 1355 | 1355 | $SpotterArchive = new SpotterArchive(); |
| 1356 | - $alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 1356 | + $alldata = $SpotterArchive->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 1357 | 1357 | foreach ($alldata as $number) { |
| 1358 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'',$reset); |
|
| 1358 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', $reset); |
|
| 1359 | 1359 | } |
| 1360 | 1360 | } |
| 1361 | 1361 | |
@@ -1369,37 +1369,37 @@ discard block |
||
| 1369 | 1369 | $lastyear = false; |
| 1370 | 1370 | foreach ($alldata as $number) { |
| 1371 | 1371 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1372 | - $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']))); |
|
| 1372 | + $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']))); |
|
| 1373 | 1373 | } |
| 1374 | 1374 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 1375 | 1375 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1376 | 1376 | foreach ($alldata as $number) { |
| 1377 | - $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']))); |
|
| 1377 | + $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']))); |
|
| 1378 | 1378 | } |
| 1379 | 1379 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 1380 | 1380 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1381 | 1381 | foreach ($alldata as $number) { |
| 1382 | - $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']))); |
|
| 1382 | + $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']))); |
|
| 1383 | 1383 | } |
| 1384 | 1384 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 1385 | 1385 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1386 | 1386 | foreach ($alldata as $number) { |
| 1387 | - $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']))); |
|
| 1387 | + $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']))); |
|
| 1388 | 1388 | } |
| 1389 | 1389 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 1390 | 1390 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1391 | 1391 | foreach ($alldata as $number) { |
| 1392 | - $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']))); |
|
| 1392 | + $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']))); |
|
| 1393 | 1393 | } |
| 1394 | 1394 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 1395 | 1395 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1396 | 1396 | foreach ($alldata as $number) { |
| 1397 | - $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']))); |
|
| 1397 | + $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']))); |
|
| 1398 | 1398 | } |
| 1399 | 1399 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 1400 | 1400 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1401 | 1401 | foreach ($alldata as $number) { |
| 1402 | - $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']))); |
|
| 1402 | + $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']))); |
|
| 1403 | 1403 | } |
| 1404 | 1404 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 1405 | 1405 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -1444,7 +1444,7 @@ discard block |
||
| 1444 | 1444 | } |
| 1445 | 1445 | $alldata = $pall; |
| 1446 | 1446 | foreach ($alldata as $number) { |
| 1447 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 1447 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 1448 | 1448 | } |
| 1449 | 1449 | echo '...Arrival'."\n"; |
| 1450 | 1450 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -1486,7 +1486,7 @@ discard block |
||
| 1486 | 1486 | } |
| 1487 | 1487 | $alldata = $pall; |
| 1488 | 1488 | foreach ($alldata as $number) { |
| 1489 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 1489 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 1490 | 1490 | } |
| 1491 | 1491 | |
| 1492 | 1492 | echo 'Flights data...'."\n"; |
@@ -1494,28 +1494,28 @@ discard block |
||
| 1494 | 1494 | echo '-> countAllDatesLastMonth...'."\n"; |
| 1495 | 1495 | $alldata = $Spotter->countAllDatesLastMonth(); |
| 1496 | 1496 | foreach ($alldata as $number) { |
| 1497 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 1497 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 1498 | 1498 | } |
| 1499 | 1499 | echo '-> countAllDates...'."\n"; |
| 1500 | 1500 | $previousdata = $this->countAllDates(); |
| 1501 | 1501 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 1502 | 1502 | $this->deleteStatFlight('date'); |
| 1503 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates()); |
|
| 1503 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates()); |
|
| 1504 | 1504 | $values = array(); |
| 1505 | 1505 | foreach ($alldata as $cnt) { |
| 1506 | 1506 | $values[] = $cnt['date_count']; |
| 1507 | 1507 | } |
| 1508 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1509 | - array_splice($alldata,11); |
|
| 1508 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1509 | + array_splice($alldata, 11); |
|
| 1510 | 1510 | foreach ($alldata as $number) { |
| 1511 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 1511 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 1512 | 1512 | } |
| 1513 | 1513 | |
| 1514 | 1514 | $this->deleteStatFlight('hour'); |
| 1515 | 1515 | echo '-> countAllHours...'."\n"; |
| 1516 | 1516 | $alldata = $Spotter->countAllHours('hour'); |
| 1517 | 1517 | foreach ($alldata as $number) { |
| 1518 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 1518 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 1519 | 1519 | } |
| 1520 | 1520 | |
| 1521 | 1521 | |
@@ -1524,34 +1524,34 @@ discard block |
||
| 1524 | 1524 | echo '--- Stats by airlines ---'."\n"; |
| 1525 | 1525 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 1526 | 1526 | $Spotter = new Spotter($this->db); |
| 1527 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 1527 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 1528 | 1528 | foreach ($alldata as $number) { |
| 1529 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 1529 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 1530 | 1530 | } |
| 1531 | 1531 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 1532 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 1532 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 1533 | 1533 | foreach ($alldata as $number) { |
| 1534 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 1534 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 1535 | 1535 | } |
| 1536 | 1536 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 1537 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 1537 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 1538 | 1538 | foreach ($alldata as $number) { |
| 1539 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1539 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1540 | 1540 | } |
| 1541 | 1541 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 1542 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 1542 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 1543 | 1543 | foreach ($alldata as $number) { |
| 1544 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 1544 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 1545 | 1545 | } |
| 1546 | 1546 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 1547 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 1547 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 1548 | 1548 | foreach ($alldata as $number) { |
| 1549 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 1549 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 1550 | 1550 | } |
| 1551 | 1551 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1552 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1552 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1553 | 1553 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1554 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1554 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1555 | 1555 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1556 | 1556 | //$alldata = array(); |
| 1557 | 1557 | foreach ($dall as $value) { |
@@ -1571,12 +1571,12 @@ discard block |
||
| 1571 | 1571 | } |
| 1572 | 1572 | $alldata = $pall; |
| 1573 | 1573 | foreach ($alldata as $number) { |
| 1574 | - 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); |
|
| 1574 | + 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); |
|
| 1575 | 1575 | } |
| 1576 | 1576 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1577 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1577 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1578 | 1578 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1579 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1579 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1580 | 1580 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1581 | 1581 | //$alldata = array(); |
| 1582 | 1582 | foreach ($dall as $value) { |
@@ -1596,7 +1596,7 @@ discard block |
||
| 1596 | 1596 | } |
| 1597 | 1597 | $alldata = $pall; |
| 1598 | 1598 | foreach ($alldata as $number) { |
| 1599 | - 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); |
|
| 1599 | + 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); |
|
| 1600 | 1600 | } |
| 1601 | 1601 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 1602 | 1602 | $Spotter = new Spotter($this->db); |
@@ -1604,27 +1604,27 @@ discard block |
||
| 1604 | 1604 | $lastyear = false; |
| 1605 | 1605 | foreach ($alldata as $number) { |
| 1606 | 1606 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1607 | - $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']); |
|
| 1607 | + $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']); |
|
| 1608 | 1608 | } |
| 1609 | 1609 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 1610 | 1610 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1611 | 1611 | foreach ($alldata as $number) { |
| 1612 | - $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']); |
|
| 1612 | + $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']); |
|
| 1613 | 1613 | } |
| 1614 | 1614 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 1615 | 1615 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1616 | 1616 | foreach ($alldata as $number) { |
| 1617 | - $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']); |
|
| 1617 | + $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']); |
|
| 1618 | 1618 | } |
| 1619 | 1619 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 1620 | 1620 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1621 | 1621 | foreach ($alldata as $number) { |
| 1622 | - $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']); |
|
| 1622 | + $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']); |
|
| 1623 | 1623 | } |
| 1624 | 1624 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 1625 | 1625 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1626 | 1626 | foreach ($alldata as $number) { |
| 1627 | - $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']); |
|
| 1627 | + $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']); |
|
| 1628 | 1628 | } |
| 1629 | 1629 | if ($globalDebug) echo '...Departure'."\n"; |
| 1630 | 1630 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | } |
| 1648 | 1648 | $alldata = $pall; |
| 1649 | 1649 | foreach ($alldata as $number) { |
| 1650 | - $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']); |
|
| 1650 | + $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']); |
|
| 1651 | 1651 | } |
| 1652 | 1652 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1653 | 1653 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -1670,32 +1670,32 @@ discard block |
||
| 1670 | 1670 | } |
| 1671 | 1671 | $alldata = $pall; |
| 1672 | 1672 | foreach ($alldata as $number) { |
| 1673 | - $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']); |
|
| 1673 | + $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']); |
|
| 1674 | 1674 | } |
| 1675 | 1675 | |
| 1676 | 1676 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 1677 | 1677 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 1678 | 1678 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1679 | 1679 | foreach ($alldata as $number) { |
| 1680 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 1680 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1681 | 1681 | } |
| 1682 | 1682 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 1683 | 1683 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1684 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
|
| 1684 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines()); |
|
| 1685 | 1685 | $values = array(); |
| 1686 | 1686 | foreach ($alldata as $cnt) { |
| 1687 | 1687 | $values[] = $cnt['date_count']; |
| 1688 | 1688 | } |
| 1689 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1690 | - array_splice($alldata,11); |
|
| 1689 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1690 | + array_splice($alldata, 11); |
|
| 1691 | 1691 | foreach ($alldata as $number) { |
| 1692 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 1692 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1693 | 1693 | } |
| 1694 | 1694 | |
| 1695 | 1695 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 1696 | 1696 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1697 | 1697 | foreach ($alldata as $number) { |
| 1698 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 1698 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 1699 | 1699 | } |
| 1700 | 1700 | |
| 1701 | 1701 | |
@@ -1714,32 +1714,32 @@ discard block |
||
| 1714 | 1714 | // Count by filter |
| 1715 | 1715 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 1716 | 1716 | $Spotter = new Spotter($this->db); |
| 1717 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 1717 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 1718 | 1718 | foreach ($alldata as $number) { |
| 1719 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 1719 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 1720 | 1720 | } |
| 1721 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 1721 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 1722 | 1722 | foreach ($alldata as $number) { |
| 1723 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 1723 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 1724 | 1724 | } |
| 1725 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 1725 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 1726 | 1726 | foreach ($alldata as $number) { |
| 1727 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 1727 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 1728 | 1728 | } |
| 1729 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 1729 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 1730 | 1730 | foreach ($alldata as $number) { |
| 1731 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 1731 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 1732 | 1732 | } |
| 1733 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 1733 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 1734 | 1734 | foreach ($alldata as $number) { |
| 1735 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 1735 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 1736 | 1736 | } |
| 1737 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 1737 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 1738 | 1738 | foreach ($alldata as $number) { |
| 1739 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 1739 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 1740 | 1740 | } |
| 1741 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1742 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 1741 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 1742 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 1743 | 1743 | $alldata = array(); |
| 1744 | 1744 | foreach ($pall as $value) { |
| 1745 | 1745 | $icao = $value['airport_departure_icao']; |
@@ -1755,12 +1755,12 @@ discard block |
||
| 1755 | 1755 | foreach ($alldata as $key => $row) { |
| 1756 | 1756 | $count[$key] = $row['airport_departure_icao_count']; |
| 1757 | 1757 | } |
| 1758 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1758 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1759 | 1759 | foreach ($alldata as $number) { |
| 1760 | - 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); |
|
| 1760 | + 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); |
|
| 1761 | 1761 | } |
| 1762 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1763 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 1762 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 1763 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 1764 | 1764 | $alldata = array(); |
| 1765 | 1765 | foreach ($pall as $value) { |
| 1766 | 1766 | $icao = $value['airport_arrival_icao']; |
@@ -1776,40 +1776,40 @@ discard block |
||
| 1776 | 1776 | foreach ($alldata as $key => $row) { |
| 1777 | 1777 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1778 | 1778 | } |
| 1779 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1779 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1780 | 1780 | foreach ($alldata as $number) { |
| 1781 | - 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); |
|
| 1781 | + 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); |
|
| 1782 | 1782 | } |
| 1783 | 1783 | $Spotter = new Spotter($this->db); |
| 1784 | 1784 | $alldata = $Spotter->countAllMonths($filter); |
| 1785 | 1785 | $lastyear = false; |
| 1786 | 1786 | foreach ($alldata as $number) { |
| 1787 | 1787 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1788 | - $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); |
|
| 1788 | + $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); |
|
| 1789 | 1789 | } |
| 1790 | 1790 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 1791 | 1791 | foreach ($alldata as $number) { |
| 1792 | - $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); |
|
| 1792 | + $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); |
|
| 1793 | 1793 | } |
| 1794 | 1794 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 1795 | 1795 | foreach ($alldata as $number) { |
| 1796 | - $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); |
|
| 1796 | + $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); |
|
| 1797 | 1797 | } |
| 1798 | 1798 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 1799 | 1799 | foreach ($alldata as $number) { |
| 1800 | - $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); |
|
| 1800 | + $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); |
|
| 1801 | 1801 | } |
| 1802 | 1802 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 1803 | 1803 | foreach ($alldata as $number) { |
| 1804 | - $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); |
|
| 1804 | + $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); |
|
| 1805 | 1805 | } |
| 1806 | 1806 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 1807 | 1807 | foreach ($alldata as $number) { |
| 1808 | - $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); |
|
| 1808 | + $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); |
|
| 1809 | 1809 | } |
| 1810 | 1810 | echo '...Departure'."\n"; |
| 1811 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 1812 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 1811 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 1812 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 1813 | 1813 | foreach ($dall as $value) { |
| 1814 | 1814 | $icao = $value['departure_airport_icao']; |
| 1815 | 1815 | $ddate = $value['date']; |
@@ -1827,11 +1827,11 @@ discard block |
||
| 1827 | 1827 | } |
| 1828 | 1828 | $alldata = $pall; |
| 1829 | 1829 | foreach ($alldata as $number) { |
| 1830 | - $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); |
|
| 1830 | + $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); |
|
| 1831 | 1831 | } |
| 1832 | 1832 | echo '...Arrival'."\n"; |
| 1833 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 1834 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 1833 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 1834 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 1835 | 1835 | foreach ($dall as $value) { |
| 1836 | 1836 | $icao = $value['arrival_airport_icao']; |
| 1837 | 1837 | $ddate = $value['date']; |
@@ -1849,40 +1849,40 @@ discard block |
||
| 1849 | 1849 | } |
| 1850 | 1850 | $alldata = $pall; |
| 1851 | 1851 | foreach ($alldata as $number) { |
| 1852 | - $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); |
|
| 1852 | + $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); |
|
| 1853 | 1853 | } |
| 1854 | 1854 | |
| 1855 | 1855 | echo 'Flights data...'."\n"; |
| 1856 | 1856 | echo '-> countAllDatesLastMonth...'."\n"; |
| 1857 | 1857 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 1858 | 1858 | foreach ($alldata as $number) { |
| 1859 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 1859 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 1860 | 1860 | } |
| 1861 | 1861 | echo '-> countAllDates...'."\n"; |
| 1862 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 1863 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 1862 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 1863 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 1864 | 1864 | $values = array(); |
| 1865 | 1865 | foreach ($alldata as $cnt) { |
| 1866 | 1866 | $values[] = $cnt['date_count']; |
| 1867 | 1867 | } |
| 1868 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1869 | - array_splice($alldata,11); |
|
| 1868 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1869 | + array_splice($alldata, 11); |
|
| 1870 | 1870 | foreach ($alldata as $number) { |
| 1871 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 1871 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 1872 | 1872 | } |
| 1873 | 1873 | |
| 1874 | 1874 | echo '-> countAllHours...'."\n"; |
| 1875 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 1875 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 1876 | 1876 | foreach ($alldata as $number) { |
| 1877 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 1877 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 1878 | 1878 | } |
| 1879 | 1879 | echo 'Insert last stats update date...'."\n"; |
| 1880 | 1880 | date_default_timezone_set('UTC'); |
| 1881 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 1881 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 1882 | 1882 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 1883 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 1883 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 1884 | 1884 | $this->deleteOldStats($filter_name); |
| 1885 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 1885 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 1886 | 1886 | } |
| 1887 | 1887 | } |
| 1888 | 1888 | |
@@ -1895,16 +1895,16 @@ discard block |
||
| 1895 | 1895 | // SUM all previous month to put as year |
| 1896 | 1896 | $previous_year = date('Y'); |
| 1897 | 1897 | $previous_year--; |
| 1898 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 1899 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 1900 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 1901 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 1898 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 1899 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 1900 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 1901 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 1902 | 1902 | $allairlines = $this->getAllAirlineNames(); |
| 1903 | 1903 | foreach ($allairlines as $data) { |
| 1904 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 1905 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 1906 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 1907 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 1904 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 1905 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 1906 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 1907 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 1908 | 1908 | } |
| 1909 | 1909 | |
| 1910 | 1910 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -1913,7 +1913,7 @@ discard block |
||
| 1913 | 1913 | try { |
| 1914 | 1914 | $sth = $this->db->prepare($query); |
| 1915 | 1915 | $sth->execute(); |
| 1916 | - } catch(PDOException $e) { |
|
| 1916 | + } catch (PDOException $e) { |
|
| 1917 | 1917 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 1918 | 1918 | } |
| 1919 | 1919 | } |
@@ -1922,15 +1922,15 @@ discard block |
||
| 1922 | 1922 | try { |
| 1923 | 1923 | $sth = $this->db->prepare($query); |
| 1924 | 1924 | $sth->execute(); |
| 1925 | - } catch(PDOException $e) { |
|
| 1925 | + } catch (PDOException $e) { |
|
| 1926 | 1926 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 1927 | 1927 | } |
| 1928 | 1928 | } |
| 1929 | 1929 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 1930 | 1930 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 1931 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 1931 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 1932 | 1932 | $this->deleteOldStats(); |
| 1933 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 1933 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 1934 | 1934 | $lastyearupdate = true; |
| 1935 | 1935 | } |
| 1936 | 1936 | } |
@@ -1952,7 +1952,7 @@ discard block |
||
| 1952 | 1952 | try { |
| 1953 | 1953 | $sth = $this->db->prepare($query); |
| 1954 | 1954 | $sth->execute(); |
| 1955 | - } catch(PDOException $e) { |
|
| 1955 | + } catch (PDOException $e) { |
|
| 1956 | 1956 | return "error : ".$e->getMessage(); |
| 1957 | 1957 | } |
| 1958 | 1958 | } |
@@ -1966,14 +1966,14 @@ discard block |
||
| 1966 | 1966 | try { |
| 1967 | 1967 | $sth = $this->db->prepare($query); |
| 1968 | 1968 | $sth->execute(); |
| 1969 | - } catch(PDOException $e) { |
|
| 1969 | + } catch (PDOException $e) { |
|
| 1970 | 1970 | return "error : ".$e->getMessage(); |
| 1971 | 1971 | } |
| 1972 | 1972 | } |
| 1973 | 1973 | if (!isset($lastyearupdate)) { |
| 1974 | 1974 | echo 'Insert last stats update date...'."\n"; |
| 1975 | 1975 | date_default_timezone_set('UTC'); |
| 1976 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 1976 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 1977 | 1977 | } |
| 1978 | 1978 | if ($globalStatsResetYear) { |
| 1979 | 1979 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -125,6 +125,9 @@ discard block |
||
| 125 | 125 | public $tag_start = 0; |
| 126 | 126 | private $dom = null; |
| 127 | 127 | |
| 128 | + /** |
|
| 129 | + * @param simple_html_dom $dom |
|
| 130 | + */ |
|
| 128 | 131 | function __construct($dom) |
| 129 | 132 | { |
| 130 | 133 | $this->dom = $dom; |
@@ -1501,6 +1504,11 @@ discard block |
||
| 1501 | 1504 | } |
| 1502 | 1505 | |
| 1503 | 1506 | // parse attributes |
| 1507 | + |
|
| 1508 | + /** |
|
| 1509 | + * @param simple_html_dom_node $node |
|
| 1510 | + * @param string[] $space |
|
| 1511 | + */ |
|
| 1504 | 1512 | protected function parse_attr($node, $name, &$space) |
| 1505 | 1513 | { |
| 1506 | 1514 | // Per sourceforge: http://sourceforge.net/tracker/?func=detail&aid=3061408&group_id=218559&atid=1044037 |
@@ -1538,6 +1546,11 @@ discard block |
||
| 1538 | 1546 | } |
| 1539 | 1547 | |
| 1540 | 1548 | // link node's parent |
| 1549 | + |
|
| 1550 | + /** |
|
| 1551 | + * @param simple_html_dom_node $node |
|
| 1552 | + * @param boolean $is_child |
|
| 1553 | + */ |
|
| 1541 | 1554 | protected function link_nodes(&$node, $is_child) |
| 1542 | 1555 | { |
| 1543 | 1556 | $node->parent = $this->parent; |
@@ -1549,6 +1562,10 @@ discard block |
||
| 1549 | 1562 | } |
| 1550 | 1563 | |
| 1551 | 1564 | // as a text node |
| 1565 | + |
|
| 1566 | + /** |
|
| 1567 | + * @param string $tag |
|
| 1568 | + */ |
|
| 1552 | 1569 | protected function as_text_node($tag) |
| 1553 | 1570 | { |
| 1554 | 1571 | $node = new simple_html_dom_node($this); |
@@ -1559,12 +1576,18 @@ discard block |
||
| 1559 | 1576 | return true; |
| 1560 | 1577 | } |
| 1561 | 1578 | |
| 1579 | + /** |
|
| 1580 | + * @param string $chars |
|
| 1581 | + */ |
|
| 1562 | 1582 | protected function skip($chars) |
| 1563 | 1583 | { |
| 1564 | 1584 | $this->pos += strspn($this->doc, $chars, $this->pos); |
| 1565 | 1585 | $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1566 | 1586 | } |
| 1567 | 1587 | |
| 1588 | + /** |
|
| 1589 | + * @param string $chars |
|
| 1590 | + */ |
|
| 1568 | 1591 | protected function copy_skip($chars) |
| 1569 | 1592 | { |
| 1570 | 1593 | $pos = $this->pos; |
@@ -1575,6 +1598,9 @@ discard block |
||
| 1575 | 1598 | return substr($this->doc, $pos, $len); |
| 1576 | 1599 | } |
| 1577 | 1600 | |
| 1601 | + /** |
|
| 1602 | + * @param string $chars |
|
| 1603 | + */ |
|
| 1578 | 1604 | protected function copy_until($chars) |
| 1579 | 1605 | { |
| 1580 | 1606 | $pos = $this->pos; |
@@ -1584,6 +1610,9 @@ discard block |
||
| 1584 | 1610 | return substr($this->doc, $pos, $len); |
| 1585 | 1611 | } |
| 1586 | 1612 | |
| 1613 | + /** |
|
| 1614 | + * @param string $char |
|
| 1615 | + */ |
|
| 1587 | 1616 | protected function copy_until_char($char) |
| 1588 | 1617 | { |
| 1589 | 1618 | if ($this->char===null) return ''; |
@@ -1602,6 +1631,9 @@ discard block |
||
| 1602 | 1631 | return substr($this->doc, $pos_old, $pos-$pos_old); |
| 1603 | 1632 | } |
| 1604 | 1633 | |
| 1634 | + /** |
|
| 1635 | + * @param string $char |
|
| 1636 | + */ |
|
| 1605 | 1637 | protected function copy_until_char_escape($char) |
| 1606 | 1638 | { |
| 1607 | 1639 | if ($this->char===null) return ''; |
@@ -1633,6 +1665,10 @@ discard block |
||
| 1633 | 1665 | |
| 1634 | 1666 | // remove noise from html content |
| 1635 | 1667 | // save the noise in the $this->noise array. |
| 1668 | + |
|
| 1669 | + /** |
|
| 1670 | + * @param string $pattern |
|
| 1671 | + */ |
|
| 1636 | 1672 | protected function remove_noise($pattern, $remove_tag=false) |
| 1637 | 1673 | { |
| 1638 | 1674 | global $debug_object; |
@@ -1658,6 +1694,10 @@ discard block |
||
| 1658 | 1694 | } |
| 1659 | 1695 | |
| 1660 | 1696 | // restore noise to html content |
| 1697 | + |
|
| 1698 | + /** |
|
| 1699 | + * @param string|null $text |
|
| 1700 | + */ |
|
| 1661 | 1701 | function restore_noise($text) |
| 1662 | 1702 | { |
| 1663 | 1703 | global $debug_object; |
@@ -824,11 +824,11 @@ |
||
| 824 | 824 | } |
| 825 | 825 | |
| 826 | 826 | /** |
| 827 | - * Returns true if $string is valid UTF-8 and false otherwise. |
|
| 828 | - * |
|
| 829 | - * @param mixed $str String to be tested |
|
| 830 | - * @return boolean |
|
| 831 | - */ |
|
| 827 | + * Returns true if $string is valid UTF-8 and false otherwise. |
|
| 828 | + * |
|
| 829 | + * @param mixed $str String to be tested |
|
| 830 | + * @return boolean |
|
| 831 | + */ |
|
| 832 | 832 | static function is_utf8($str) |
| 833 | 833 | { |
| 834 | 834 | $c=0; $b=0; |
@@ -45,21 +45,21 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | define('HDOM_TYPE_ELEMENT', 1); |
| 47 | 47 | define('HDOM_TYPE_COMMENT', 2); |
| 48 | -define('HDOM_TYPE_TEXT', 3); |
|
| 49 | -define('HDOM_TYPE_ENDTAG', 4); |
|
| 50 | -define('HDOM_TYPE_ROOT', 5); |
|
| 48 | +define('HDOM_TYPE_TEXT', 3); |
|
| 49 | +define('HDOM_TYPE_ENDTAG', 4); |
|
| 50 | +define('HDOM_TYPE_ROOT', 5); |
|
| 51 | 51 | define('HDOM_TYPE_UNKNOWN', 6); |
| 52 | 52 | define('HDOM_QUOTE_DOUBLE', 0); |
| 53 | 53 | define('HDOM_QUOTE_SINGLE', 1); |
| 54 | -define('HDOM_QUOTE_NO', 3); |
|
| 55 | -define('HDOM_INFO_BEGIN', 0); |
|
| 56 | -define('HDOM_INFO_END', 1); |
|
| 57 | -define('HDOM_INFO_QUOTE', 2); |
|
| 58 | -define('HDOM_INFO_SPACE', 3); |
|
| 59 | -define('HDOM_INFO_TEXT', 4); |
|
| 60 | -define('HDOM_INFO_INNER', 5); |
|
| 61 | -define('HDOM_INFO_OUTER', 6); |
|
| 62 | -define('HDOM_INFO_ENDSPACE',7); |
|
| 54 | +define('HDOM_QUOTE_NO', 3); |
|
| 55 | +define('HDOM_INFO_BEGIN', 0); |
|
| 56 | +define('HDOM_INFO_END', 1); |
|
| 57 | +define('HDOM_INFO_QUOTE', 2); |
|
| 58 | +define('HDOM_INFO_SPACE', 3); |
|
| 59 | +define('HDOM_INFO_TEXT', 4); |
|
| 60 | +define('HDOM_INFO_INNER', 5); |
|
| 61 | +define('HDOM_INFO_OUTER', 6); |
|
| 62 | +define('HDOM_INFO_ENDSPACE', 7); |
|
| 63 | 63 | define('DEFAULT_TARGET_CHARSET', 'UTF-8'); |
| 64 | 64 | define('DEFAULT_BR_TEXT', "\r\n"); |
| 65 | 65 | define('DEFAULT_SPAN_TEXT', " "); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | // ----------------------------------------------------------------------------- |
| 69 | 69 | // get html dom from file |
| 70 | 70 | // $maxlen is defined in the code as PHP_STREAM_COPY_ALL which is defined as -1. |
| 71 | -function file_get_html($url, $use_include_path = false, $context=null, $offset = -1, $maxLen=-1, $lowercase = true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) |
|
| 71 | +function file_get_html($url, $use_include_path = false, $context = null, $offset = -1, $maxLen = -1, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT) |
|
| 72 | 72 | { |
| 73 | 73 | // We DO force the tags to be terminated. |
| 74 | 74 | $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | // get html dom from string |
| 89 | -function str_get_html($str, $lowercase=true, $forceTagsClosed=true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) |
|
| 89 | +function str_get_html($str, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT) |
|
| 90 | 90 | { |
| 91 | 91 | $dom = new simple_html_dom(null, $lowercase, $forceTagsClosed, $target_charset, $stripRN, $defaultBRText, $defaultSpanText); |
| 92 | 92 | if (empty($str) || strlen($str) > MAX_FILE_SIZE) |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // dump html dom tree |
| 102 | -function dump_html_tree($node, $show_attr=true, $deep=0) |
|
| 102 | +function dump_html_tree($node, $show_attr = true, $deep = 0) |
|
| 103 | 103 | { |
| 104 | 104 | $node->dump($node); |
| 105 | 105 | } |
@@ -151,12 +151,12 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | // dump node's tree |
| 154 | - function dump($show_attr=true, $deep=0) |
|
| 154 | + function dump($show_attr = true, $deep = 0) |
|
| 155 | 155 | { |
| 156 | 156 | $lead = str_repeat(' ', $deep); |
| 157 | 157 | |
| 158 | 158 | echo $lead.$this->tag; |
| 159 | - if ($show_attr && count($this->attr)>0) |
|
| 159 | + if ($show_attr && count($this->attr) > 0) |
|
| 160 | 160 | { |
| 161 | 161 | echo '('; |
| 162 | 162 | foreach ($this->attr as $k=>$v) |
@@ -169,18 +169,18 @@ discard block |
||
| 169 | 169 | { |
| 170 | 170 | foreach ($this->nodes as $c) |
| 171 | 171 | { |
| 172 | - $c->dump($show_attr, $deep+1); |
|
| 172 | + $c->dump($show_attr, $deep + 1); |
|
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | |
| 178 | 178 | // Debugging function to dump a single dom node with a bunch of information about it. |
| 179 | - function dump_node($echo=true) |
|
| 179 | + function dump_node($echo = true) |
|
| 180 | 180 | { |
| 181 | 181 | |
| 182 | 182 | $string = $this->tag; |
| 183 | - if (count($this->attr)>0) |
|
| 183 | + if (count($this->attr) > 0) |
|
| 184 | 184 | { |
| 185 | 185 | $string .= '('; |
| 186 | 186 | foreach ($this->attr as $k=>$v) |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | $string .= ')'; |
| 191 | 191 | } |
| 192 | - if (count($this->_)>0) |
|
| 192 | + if (count($this->_) > 0) |
|
| 193 | 193 | { |
| 194 | 194 | $string .= ' $_ ('; |
| 195 | 195 | foreach ($this->_ as $k=>$v) |
@@ -211,22 +211,22 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | if (isset($this->text)) |
| 213 | 213 | { |
| 214 | - $string .= " text: (" . $this->text . ")"; |
|
| 214 | + $string .= " text: (".$this->text.")"; |
|
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | $string .= " HDOM_INNER_INFO: '"; |
| 218 | 218 | if (isset($node->_[HDOM_INFO_INNER])) |
| 219 | 219 | { |
| 220 | - $string .= $node->_[HDOM_INFO_INNER] . "'"; |
|
| 220 | + $string .= $node->_[HDOM_INFO_INNER]."'"; |
|
| 221 | 221 | } |
| 222 | 222 | else |
| 223 | 223 | { |
| 224 | 224 | $string .= ' NULL '; |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - $string .= " children: " . count($this->children); |
|
| 228 | - $string .= " nodes: " . count($this->nodes); |
|
| 229 | - $string .= " tag_start: " . $this->tag_start; |
|
| 227 | + $string .= " children: ".count($this->children); |
|
| 228 | + $string .= " nodes: ".count($this->nodes); |
|
| 229 | + $string .= " tag_start: ".$this->tag_start; |
|
| 230 | 230 | $string .= "\n"; |
| 231 | 231 | |
| 232 | 232 | if ($echo) |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | // returns the parent of node |
| 244 | 244 | // If a node is passed in, it will reset the parent of the current node to that one. |
| 245 | - function parent($parent=null) |
|
| 245 | + function parent($parent = null) |
|
| 246 | 246 | { |
| 247 | 247 | // I am SURE that this doesn't work properly. |
| 248 | 248 | // It fails to unset the current node from it's current parents nodes or children list first. |
@@ -263,9 +263,9 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // returns children of node |
| 266 | - function children($idx=-1) |
|
| 266 | + function children($idx = -1) |
|
| 267 | 267 | { |
| 268 | - if ($idx===-1) |
|
| 268 | + if ($idx === -1) |
|
| 269 | 269 | { |
| 270 | 270 | return $this->children; |
| 271 | 271 | } |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | // returns the first child of node |
| 280 | 280 | function first_child() |
| 281 | 281 | { |
| 282 | - if (count($this->children)>0) |
|
| 282 | + if (count($this->children) > 0) |
|
| 283 | 283 | { |
| 284 | 284 | return $this->children[0]; |
| 285 | 285 | } |
@@ -289,9 +289,9 @@ discard block |
||
| 289 | 289 | // returns the last child of node |
| 290 | 290 | function last_child() |
| 291 | 291 | { |
| 292 | - if (($count=count($this->children))>0) |
|
| 292 | + if (($count = count($this->children)) > 0) |
|
| 293 | 293 | { |
| 294 | - return $this->children[$count-1]; |
|
| 294 | + return $this->children[$count - 1]; |
|
| 295 | 295 | } |
| 296 | 296 | return null; |
| 297 | 297 | } |
@@ -299,18 +299,18 @@ discard block |
||
| 299 | 299 | // returns the next sibling of node |
| 300 | 300 | function next_sibling() |
| 301 | 301 | { |
| 302 | - if ($this->parent===null) |
|
| 302 | + if ($this->parent === null) |
|
| 303 | 303 | { |
| 304 | 304 | return null; |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | $idx = 0; |
| 308 | 308 | $count = count($this->parent->children); |
| 309 | - while ($idx<$count && $this!==$this->parent->children[$idx]) |
|
| 309 | + while ($idx < $count && $this !== $this->parent->children[$idx]) |
|
| 310 | 310 | { |
| 311 | 311 | ++$idx; |
| 312 | 312 | } |
| 313 | - if (++$idx>=$count) |
|
| 313 | + if (++$idx >= $count) |
|
| 314 | 314 | { |
| 315 | 315 | return null; |
| 316 | 316 | } |
@@ -320,12 +320,12 @@ discard block |
||
| 320 | 320 | // returns the previous sibling of node |
| 321 | 321 | function prev_sibling() |
| 322 | 322 | { |
| 323 | - if ($this->parent===null) return null; |
|
| 323 | + if ($this->parent === null) return null; |
|
| 324 | 324 | $idx = 0; |
| 325 | 325 | $count = count($this->parent->children); |
| 326 | - while ($idx<$count && $this!==$this->parent->children[$idx]) |
|
| 326 | + while ($idx < $count && $this !== $this->parent->children[$idx]) |
|
| 327 | 327 | ++$idx; |
| 328 | - if (--$idx<0) return null; |
|
| 328 | + if (--$idx < 0) return null; |
|
| 329 | 329 | return $this->parent->children[$idx]; |
| 330 | 330 | } |
| 331 | 331 | |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | |
| 341 | 341 | while (!is_null($returnDom)) |
| 342 | 342 | { |
| 343 | - if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: " . $returnDom->tag); } |
|
| 343 | + if (is_object($debug_object)) { $debug_object->debug_log(2, "Current tag is: ".$returnDom->tag); } |
|
| 344 | 344 | |
| 345 | 345 | if ($returnDom->tag == $tag) |
| 346 | 346 | { |
@@ -374,16 +374,16 @@ discard block |
||
| 374 | 374 | { |
| 375 | 375 | if (!empty($this->text)) |
| 376 | 376 | { |
| 377 | - $text = " with text: " . $this->text; |
|
| 377 | + $text = " with text: ".$this->text; |
|
| 378 | 378 | } |
| 379 | 379 | } |
| 380 | - $debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text); |
|
| 380 | + $debug_object->debug_log(1, 'Innertext of tag: '.$this->tag.$text); |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | - if ($this->tag==='root') return $this->innertext(); |
|
| 383 | + if ($this->tag === 'root') return $this->innertext(); |
|
| 384 | 384 | |
| 385 | 385 | // trigger callback |
| 386 | - if ($this->dom && $this->dom->callback!==null) |
|
| 386 | + if ($this->dom && $this->dom->callback !== null) |
|
| 387 | 387 | { |
| 388 | 388 | call_user_func_array($this->dom->callback, array($this)); |
| 389 | 389 | } |
@@ -418,7 +418,7 @@ discard block |
||
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | // render end tag |
| 421 | - if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) |
|
| 421 | + if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) |
|
| 422 | 422 | $ret .= '</'.$this->tag.'>'; |
| 423 | 423 | return $ret; |
| 424 | 424 | } |
@@ -433,8 +433,8 @@ discard block |
||
| 433 | 433 | case HDOM_TYPE_COMMENT: return ''; |
| 434 | 434 | case HDOM_TYPE_UNKNOWN: return ''; |
| 435 | 435 | } |
| 436 | - if (strcasecmp($this->tag, 'script')===0) return ''; |
|
| 437 | - if (strcasecmp($this->tag, 'style')===0) return ''; |
|
| 436 | + if (strcasecmp($this->tag, 'script') === 0) return ''; |
|
| 437 | + if (strcasecmp($this->tag, 'style') === 0) return ''; |
|
| 438 | 438 | |
| 439 | 439 | $ret = ''; |
| 440 | 440 | // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL. |
@@ -480,12 +480,12 @@ discard block |
||
| 480 | 480 | ++$i; |
| 481 | 481 | |
| 482 | 482 | // skip removed attribute |
| 483 | - if ($val===null || $val===false) |
|
| 483 | + if ($val === null || $val === false) |
|
| 484 | 484 | continue; |
| 485 | 485 | |
| 486 | 486 | $ret .= $this->_[HDOM_INFO_SPACE][$i][0]; |
| 487 | 487 | //no value attr: nowrap, checked selected... |
| 488 | - if ($val===true) |
|
| 488 | + if ($val === true) |
|
| 489 | 489 | $ret .= $key; |
| 490 | 490 | else { |
| 491 | 491 | switch ($this->_[HDOM_INFO_QUOTE][$i]) |
@@ -498,34 +498,34 @@ discard block |
||
| 498 | 498 | } |
| 499 | 499 | } |
| 500 | 500 | $ret = $this->dom->restore_noise($ret); |
| 501 | - return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>'; |
|
| 501 | + return $ret.$this->_[HDOM_INFO_ENDSPACE].'>'; |
|
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | // find elements by css selector |
| 505 | 505 | //PaperG - added ability for find to lowercase the value of the selector. |
| 506 | - function find($selector, $idx=null, $lowercase=false) |
|
| 506 | + function find($selector, $idx = null, $lowercase = false) |
|
| 507 | 507 | { |
| 508 | 508 | $selectors = $this->parse_selector($selector); |
| 509 | - if (($count=count($selectors))===0) return array(); |
|
| 509 | + if (($count = count($selectors)) === 0) return array(); |
|
| 510 | 510 | $found_keys = array(); |
| 511 | 511 | |
| 512 | 512 | // find each selector |
| 513 | - for ($c=0; $c<$count; ++$c) |
|
| 513 | + for ($c = 0; $c < $count; ++$c) |
|
| 514 | 514 | { |
| 515 | 515 | // The change on the below line was documented on the sourceforge code tracker id 2788009 |
| 516 | 516 | // used to be: if (($levle=count($selectors[0]))===0) return array(); |
| 517 | - if (($levle=count($selectors[$c]))===0) return array(); |
|
| 517 | + if (($levle = count($selectors[$c])) === 0) return array(); |
|
| 518 | 518 | if (!isset($this->_[HDOM_INFO_BEGIN])) return array(); |
| 519 | 519 | |
| 520 | 520 | $head = array($this->_[HDOM_INFO_BEGIN]=>1); |
| 521 | 521 | |
| 522 | 522 | // handle descendant selectors, no recursive! |
| 523 | - for ($l=0; $l<$levle; ++$l) |
|
| 523 | + for ($l = 0; $l < $levle; ++$l) |
|
| 524 | 524 | { |
| 525 | 525 | $ret = array(); |
| 526 | 526 | foreach ($head as $k=>$v) |
| 527 | 527 | { |
| 528 | - $n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k]; |
|
| 528 | + $n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k]; |
|
| 529 | 529 | //PaperG - Pass this optional parameter on to the seek function. |
| 530 | 530 | $n->seek($selectors[$c][$l], $ret, $lowercase); |
| 531 | 531 | } |
@@ -550,13 +550,13 @@ discard block |
||
| 550 | 550 | |
| 551 | 551 | // return nth-element or array |
| 552 | 552 | if (is_null($idx)) return $found; |
| 553 | - else if ($idx<0) $idx = count($found) + $idx; |
|
| 553 | + else if ($idx < 0) $idx = count($found) + $idx; |
|
| 554 | 554 | return (isset($found[$idx])) ? $found[$idx] : null; |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | // seek for given conditions |
| 558 | 558 | // PaperG - added parameter to allow for case insensitive testing of the value of a selector. |
| 559 | - protected function seek($selector, &$ret, $lowercase=false) |
|
| 559 | + protected function seek($selector, &$ret, $lowercase = false) |
|
| 560 | 560 | { |
| 561 | 561 | global $debug_object; |
| 562 | 562 | if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } |
@@ -569,8 +569,8 @@ discard block |
||
| 569 | 569 | $count = 0; |
| 570 | 570 | foreach ($this->children as $c) |
| 571 | 571 | { |
| 572 | - if ($tag==='*' || $tag===$c->tag) { |
|
| 573 | - if (++$count==$key) { |
|
| 572 | + if ($tag === '*' || $tag === $c->tag) { |
|
| 573 | + if (++$count == $key) { |
|
| 574 | 574 | $ret[$c->_[HDOM_INFO_BEGIN]] = 1; |
| 575 | 575 | return; |
| 576 | 576 | } |
@@ -580,38 +580,38 @@ discard block |
||
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | $end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0; |
| 583 | - if ($end==0) { |
|
| 583 | + if ($end == 0) { |
|
| 584 | 584 | $parent = $this->parent; |
| 585 | - while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) { |
|
| 585 | + while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) { |
|
| 586 | 586 | $end -= 1; |
| 587 | 587 | $parent = $parent->parent; |
| 588 | 588 | } |
| 589 | 589 | $end += $parent->_[HDOM_INFO_END]; |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | - for ($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) { |
|
| 592 | + for ($i = $this->_[HDOM_INFO_BEGIN] + 1; $i < $end; ++$i) { |
|
| 593 | 593 | $node = $this->dom->nodes[$i]; |
| 594 | 594 | |
| 595 | 595 | $pass = true; |
| 596 | 596 | |
| 597 | - if ($tag==='*' && !$key) { |
|
| 597 | + if ($tag === '*' && !$key) { |
|
| 598 | 598 | if (in_array($node, $this->children, true)) |
| 599 | 599 | $ret[$i] = 1; |
| 600 | 600 | continue; |
| 601 | 601 | } |
| 602 | 602 | |
| 603 | 603 | // compare tag |
| 604 | - if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;} |
|
| 604 | + if ($tag && $tag != $node->tag && $tag !== '*') {$pass = false; } |
|
| 605 | 605 | // compare key |
| 606 | 606 | if ($pass && $key) { |
| 607 | 607 | if ($no_key) { |
| 608 | - if (isset($node->attr[$key])) $pass=false; |
|
| 608 | + if (isset($node->attr[$key])) $pass = false; |
|
| 609 | 609 | } else { |
| 610 | - if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false; |
|
| 610 | + if (($key != "plaintext") && !isset($node->attr[$key])) $pass = false; |
|
| 611 | 611 | } |
| 612 | 612 | } |
| 613 | 613 | // compare value |
| 614 | - if ($pass && $key && $val && $val!=='*') { |
|
| 614 | + if ($pass && $key && $val && $val !== '*') { |
|
| 615 | 615 | // If they have told us that this is a "plaintext" search then we want the plaintext of the node - right? |
| 616 | 616 | if ($key == "plaintext") { |
| 617 | 617 | // $node->plaintext actually returns $node->text(); |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | // this is a normal search, we want the value of that attribute of the tag. |
| 621 | 621 | $nodeKeyValue = $node->attr[$key]; |
| 622 | 622 | } |
| 623 | - if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: " . $node->tag . " for attribute: " . $key . $exp . $val . " where nodes value is: " . $nodeKeyValue);} |
|
| 623 | + if (is_object($debug_object)) {$debug_object->debug_log(2, "testing node: ".$node->tag." for attribute: ".$key.$exp.$val." where nodes value is: ".$nodeKeyValue); } |
|
| 624 | 624 | |
| 625 | 625 | //PaperG - If lowercase is set, do a case insensitive test of the value of the selector. |
| 626 | 626 | if ($lowercase) { |
@@ -628,11 +628,11 @@ discard block |
||
| 628 | 628 | } else { |
| 629 | 629 | $check = $this->match($exp, $val, $nodeKeyValue); |
| 630 | 630 | } |
| 631 | - if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: " . ($check ? "true" : "false"));} |
|
| 631 | + if (is_object($debug_object)) {$debug_object->debug_log(2, "after match: ".($check ? "true" : "false")); } |
|
| 632 | 632 | |
| 633 | 633 | // handle multiple class |
| 634 | - if (!$check && strcasecmp($key, 'class')===0) { |
|
| 635 | - foreach (explode(' ',$node->attr[$key]) as $k) { |
|
| 634 | + if (!$check && strcasecmp($key, 'class') === 0) { |
|
| 635 | + foreach (explode(' ', $node->attr[$key]) as $k) { |
|
| 636 | 636 | // Without this, there were cases where leading, trailing, or double spaces lead to our comparing blanks - bad form. |
| 637 | 637 | if (!empty($k)) { |
| 638 | 638 | if ($lowercase) { |
@@ -650,24 +650,24 @@ discard block |
||
| 650 | 650 | unset($node); |
| 651 | 651 | } |
| 652 | 652 | // It's passed by reference so this is actually what this function returns. |
| 653 | - if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret);} |
|
| 653 | + if (is_object($debug_object)) {$debug_object->debug_log(1, "EXIT - ret: ", $ret); } |
|
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | protected function match($exp, $pattern, $value) { |
| 657 | 657 | global $debug_object; |
| 658 | - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} |
|
| 658 | + if (is_object($debug_object)) {$debug_object->debug_log_entry(1); } |
|
| 659 | 659 | |
| 660 | 660 | switch ($exp) { |
| 661 | 661 | case '=': |
| 662 | - return ($value===$pattern); |
|
| 662 | + return ($value === $pattern); |
|
| 663 | 663 | case '!=': |
| 664 | - return ($value!==$pattern); |
|
| 664 | + return ($value !== $pattern); |
|
| 665 | 665 | case '^=': |
| 666 | - return preg_match("/^".preg_quote($pattern,'/')."/", $value); |
|
| 666 | + return preg_match("/^".preg_quote($pattern, '/')."/", $value); |
|
| 667 | 667 | case '$=': |
| 668 | - return preg_match("/".preg_quote($pattern,'/')."$/", $value); |
|
| 668 | + return preg_match("/".preg_quote($pattern, '/')."$/", $value); |
|
| 669 | 669 | case '*=': |
| 670 | - if ($pattern[0]=='/') { |
|
| 670 | + if ($pattern[0] == '/') { |
|
| 671 | 671 | return preg_match($pattern, $value); |
| 672 | 672 | } |
| 673 | 673 | return preg_match("/".$pattern."/i", $value); |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | |
| 678 | 678 | protected function parse_selector($selector_string) { |
| 679 | 679 | global $debug_object; |
| 680 | - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} |
|
| 680 | + if (is_object($debug_object)) {$debug_object->debug_log_entry(1); } |
|
| 681 | 681 | |
| 682 | 682 | // pattern of CSS selectors, modified from mootools |
| 683 | 683 | // Paperg: Add the colon to the attrbute, so that it properly finds <tag attr:ibute="something" > like google does. |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | // $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; |
| 689 | 689 | $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-:]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is"; |
| 690 | 690 | preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER); |
| 691 | - if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches);} |
|
| 691 | + if (is_object($debug_object)) {$debug_object->debug_log(2, "Matches Array: ", $matches); } |
|
| 692 | 692 | |
| 693 | 693 | $selectors = array(); |
| 694 | 694 | $result = array(); |
@@ -696,29 +696,29 @@ discard block |
||
| 696 | 696 | |
| 697 | 697 | foreach ($matches as $m) { |
| 698 | 698 | $m[0] = trim($m[0]); |
| 699 | - if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue; |
|
| 699 | + if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') continue; |
|
| 700 | 700 | // for browser generated xpath |
| 701 | - if ($m[1]==='tbody') continue; |
|
| 701 | + if ($m[1] === 'tbody') continue; |
|
| 702 | 702 | |
| 703 | 703 | list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false); |
| 704 | - if (!empty($m[2])) {$key='id'; $val=$m[2];} |
|
| 705 | - if (!empty($m[3])) {$key='class'; $val=$m[3];} |
|
| 706 | - if (!empty($m[4])) {$key=$m[4];} |
|
| 707 | - if (!empty($m[5])) {$exp=$m[5];} |
|
| 708 | - if (!empty($m[6])) {$val=$m[6];} |
|
| 704 | + if (!empty($m[2])) {$key = 'id'; $val = $m[2]; } |
|
| 705 | + if (!empty($m[3])) {$key = 'class'; $val = $m[3]; } |
|
| 706 | + if (!empty($m[4])) {$key = $m[4]; } |
|
| 707 | + if (!empty($m[5])) {$exp = $m[5]; } |
|
| 708 | + if (!empty($m[6])) {$val = $m[6]; } |
|
| 709 | 709 | |
| 710 | 710 | // convert to lowercase |
| 711 | - if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);} |
|
| 711 | + if ($this->dom->lowercase) {$tag = strtolower($tag); $key = strtolower($key); } |
|
| 712 | 712 | //elements that do NOT have the specified attribute |
| 713 | - if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;} |
|
| 713 | + if (isset($key[0]) && $key[0] === '!') {$key = substr($key, 1); $no_key = true; } |
|
| 714 | 714 | |
| 715 | 715 | $result[] = array($tag, $key, $val, $exp, $no_key); |
| 716 | - if (trim($m[7])===',') { |
|
| 716 | + if (trim($m[7]) === ',') { |
|
| 717 | 717 | $selectors[] = $result; |
| 718 | 718 | $result = array(); |
| 719 | 719 | } |
| 720 | 720 | } |
| 721 | - if (count($result)>0) |
|
| 721 | + if (count($result) > 0) |
|
| 722 | 722 | $selectors[] = $result; |
| 723 | 723 | return $selectors; |
| 724 | 724 | } |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | function __set($name, $value) |
| 743 | 743 | { |
| 744 | 744 | global $debug_object; |
| 745 | - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} |
|
| 745 | + if (is_object($debug_object)) {$debug_object->debug_log_entry(1); } |
|
| 746 | 746 | |
| 747 | 747 | switch ($name) |
| 748 | 748 | { |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | function convert_text($text) |
| 781 | 781 | { |
| 782 | 782 | global $debug_object; |
| 783 | - if (is_object($debug_object)) {$debug_object->debug_log_entry(1);} |
|
| 783 | + if (is_object($debug_object)) {$debug_object->debug_log_entry(1); } |
|
| 784 | 784 | |
| 785 | 785 | $converted_text = $text; |
| 786 | 786 | |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | $sourceCharset = strtoupper($this->dom->_charset); |
| 793 | 793 | $targetCharset = strtoupper($this->dom->_target_charset); |
| 794 | 794 | } |
| 795 | - if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: " . $sourceCharset . " target charaset: " . $targetCharset);} |
|
| 795 | + if (is_object($debug_object)) {$debug_object->debug_log(3, "source charset: ".$sourceCharset." target charaset: ".$targetCharset); } |
|
| 796 | 796 | |
| 797 | 797 | if (!empty($sourceCharset) && !empty($targetCharset) && (strcasecmp($sourceCharset, $targetCharset) != 0)) |
| 798 | 798 | { |
@@ -831,27 +831,27 @@ discard block |
||
| 831 | 831 | */ |
| 832 | 832 | static function is_utf8($str) |
| 833 | 833 | { |
| 834 | - $c=0; $b=0; |
|
| 835 | - $bits=0; |
|
| 836 | - $len=strlen($str); |
|
| 837 | - for($i=0; $i<$len; $i++) |
|
| 834 | + $c = 0; $b = 0; |
|
| 835 | + $bits = 0; |
|
| 836 | + $len = strlen($str); |
|
| 837 | + for ($i = 0; $i < $len; $i++) |
|
| 838 | 838 | { |
| 839 | - $c=ord($str[$i]); |
|
| 840 | - if($c > 128) |
|
| 839 | + $c = ord($str[$i]); |
|
| 840 | + if ($c > 128) |
|
| 841 | 841 | { |
| 842 | - if(($c >= 254)) return false; |
|
| 843 | - elseif($c >= 252) $bits=6; |
|
| 844 | - elseif($c >= 248) $bits=5; |
|
| 845 | - elseif($c >= 240) $bits=4; |
|
| 846 | - elseif($c >= 224) $bits=3; |
|
| 847 | - elseif($c >= 192) $bits=2; |
|
| 842 | + if (($c >= 254)) return false; |
|
| 843 | + elseif ($c >= 252) $bits = 6; |
|
| 844 | + elseif ($c >= 248) $bits = 5; |
|
| 845 | + elseif ($c >= 240) $bits = 4; |
|
| 846 | + elseif ($c >= 224) $bits = 3; |
|
| 847 | + elseif ($c >= 192) $bits = 2; |
|
| 848 | 848 | else return false; |
| 849 | - if(($i+$bits) > $len) return false; |
|
| 850 | - while($bits > 1) |
|
| 849 | + if (($i + $bits) > $len) return false; |
|
| 850 | + while ($bits > 1) |
|
| 851 | 851 | { |
| 852 | 852 | $i++; |
| 853 | - $b=ord($str[$i]); |
|
| 854 | - if($b < 128 || $b > 191) return false; |
|
| 853 | + $b = ord($str[$i]); |
|
| 854 | + if ($b < 128 || $b > 191) return false; |
|
| 855 | 855 | $bits--; |
| 856 | 856 | } |
| 857 | 857 | } |
@@ -955,24 +955,24 @@ discard block |
||
| 955 | 955 | } |
| 956 | 956 | |
| 957 | 957 | // camel naming conventions |
| 958 | - function getAllAttributes() {return $this->attr;} |
|
| 959 | - function getAttribute($name) {return $this->__get($name);} |
|
| 960 | - function setAttribute($name, $value) {$this->__set($name, $value);} |
|
| 961 | - function hasAttribute($name) {return $this->__isset($name);} |
|
| 962 | - function removeAttribute($name) {$this->__set($name, null);} |
|
| 963 | - function getElementById($id) {return $this->find("#$id", 0);} |
|
| 964 | - function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);} |
|
| 965 | - function getElementByTagName($name) {return $this->find($name, 0);} |
|
| 966 | - function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);} |
|
| 967 | - function parentNode() {return $this->parent();} |
|
| 968 | - function childNodes($idx=-1) {return $this->children($idx);} |
|
| 969 | - function firstChild() {return $this->first_child();} |
|
| 970 | - function lastChild() {return $this->last_child();} |
|
| 971 | - function nextSibling() {return $this->next_sibling();} |
|
| 972 | - function previousSibling() {return $this->prev_sibling();} |
|
| 973 | - function hasChildNodes() {return $this->has_child();} |
|
| 974 | - function nodeName() {return $this->tag;} |
|
| 975 | - function appendChild($node) {$node->parent($this); return $node;} |
|
| 958 | + function getAllAttributes() {return $this->attr; } |
|
| 959 | + function getAttribute($name) {return $this->__get($name); } |
|
| 960 | + function setAttribute($name, $value) {$this->__set($name, $value); } |
|
| 961 | + function hasAttribute($name) {return $this->__isset($name); } |
|
| 962 | + function removeAttribute($name) {$this->__set($name, null); } |
|
| 963 | + function getElementById($id) {return $this->find("#$id", 0); } |
|
| 964 | + function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); } |
|
| 965 | + function getElementByTagName($name) {return $this->find($name, 0); } |
|
| 966 | + function getElementsByTagName($name, $idx = null) {return $this->find($name, $idx); } |
|
| 967 | + function parentNode() {return $this->parent(); } |
|
| 968 | + function childNodes($idx = -1) {return $this->children($idx); } |
|
| 969 | + function firstChild() {return $this->first_child(); } |
|
| 970 | + function lastChild() {return $this->last_child(); } |
|
| 971 | + function nextSibling() {return $this->next_sibling(); } |
|
| 972 | + function previousSibling() {return $this->prev_sibling(); } |
|
| 973 | + function hasChildNodes() {return $this->has_child(); } |
|
| 974 | + function nodeName() {return $this->tag; } |
|
| 975 | + function appendChild($node) {$node->parent($this); return $node; } |
|
| 976 | 976 | |
| 977 | 977 | } |
| 978 | 978 | |
@@ -1028,11 +1028,11 @@ discard block |
||
| 1028 | 1028 | 'option'=>array('option'=>1), |
| 1029 | 1029 | ); |
| 1030 | 1030 | |
| 1031 | - function __construct($str=null, $lowercase=true, $forceTagsClosed=true, $target_charset=DEFAULT_TARGET_CHARSET, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) |
|
| 1031 | + function __construct($str = null, $lowercase = true, $forceTagsClosed = true, $target_charset = DEFAULT_TARGET_CHARSET, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT) |
|
| 1032 | 1032 | { |
| 1033 | 1033 | if ($str) |
| 1034 | 1034 | { |
| 1035 | - if (preg_match("/^http:\/\//i",$str) || is_file($str)) |
|
| 1035 | + if (preg_match("/^http:\/\//i", $str) || is_file($str)) |
|
| 1036 | 1036 | { |
| 1037 | 1037 | $this->load_file($str); |
| 1038 | 1038 | } |
@@ -1043,7 +1043,7 @@ discard block |
||
| 1043 | 1043 | } |
| 1044 | 1044 | // Forcing tags to be closed implies that we don't trust the html, but it can lead to parsing errors if we SHOULD trust the html. |
| 1045 | 1045 | if (!$forceTagsClosed) { |
| 1046 | - $this->optional_closing_array=array(); |
|
| 1046 | + $this->optional_closing_array = array(); |
|
| 1047 | 1047 | } |
| 1048 | 1048 | $this->_target_charset = $target_charset; |
| 1049 | 1049 | } |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | } |
| 1055 | 1055 | |
| 1056 | 1056 | // load html from string |
| 1057 | - function load($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) |
|
| 1057 | + function load($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT) |
|
| 1058 | 1058 | { |
| 1059 | 1059 | global $debug_object; |
| 1060 | 1060 | |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | $args = func_get_args(); |
| 1097 | 1097 | $this->load(call_user_func_array('file_get_contents', $args), true); |
| 1098 | 1098 | // Throw an error if we can't properly load the dom. |
| 1099 | - if (($error=error_get_last())!==null) { |
|
| 1099 | + if (($error = error_get_last()) !== null) { |
|
| 1100 | 1100 | $this->clear(); |
| 1101 | 1101 | return false; |
| 1102 | 1102 | } |
@@ -1115,16 +1115,16 @@ discard block |
||
| 1115 | 1115 | } |
| 1116 | 1116 | |
| 1117 | 1117 | // save dom as string |
| 1118 | - function save($filepath='') |
|
| 1118 | + function save($filepath = '') |
|
| 1119 | 1119 | { |
| 1120 | 1120 | $ret = $this->root->innertext(); |
| 1121 | - if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX); |
|
| 1121 | + if ($filepath !== '') file_put_contents($filepath, $ret, LOCK_EX); |
|
| 1122 | 1122 | return $ret; |
| 1123 | 1123 | } |
| 1124 | 1124 | |
| 1125 | 1125 | // find dom node by css selector |
| 1126 | 1126 | // Paperg - allow us to specify that we want case insensitive testing of the value of the selector. |
| 1127 | - function find($selector, $idx=null, $lowercase=false) |
|
| 1127 | + function find($selector, $idx = null, $lowercase = false) |
|
| 1128 | 1128 | { |
| 1129 | 1129 | return $this->root->find($selector, $idx, $lowercase); |
| 1130 | 1130 | } |
@@ -1132,22 +1132,22 @@ discard block |
||
| 1132 | 1132 | // clean up memory due to php5 circular references memory leak... |
| 1133 | 1133 | function clear() |
| 1134 | 1134 | { |
| 1135 | - foreach ($this->nodes as $n) {$n->clear(); $n = null;} |
|
| 1135 | + foreach ($this->nodes as $n) {$n->clear(); $n = null; } |
|
| 1136 | 1136 | // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear. |
| 1137 | - if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;} |
|
| 1138 | - if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);} |
|
| 1139 | - if (isset($this->root)) {$this->root->clear(); unset($this->root);} |
|
| 1137 | + if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null; } |
|
| 1138 | + if (isset($this->parent)) {$this->parent->clear(); unset($this->parent); } |
|
| 1139 | + if (isset($this->root)) {$this->root->clear(); unset($this->root); } |
|
| 1140 | 1140 | unset($this->doc); |
| 1141 | 1141 | unset($this->noise); |
| 1142 | 1142 | } |
| 1143 | 1143 | |
| 1144 | - function dump($show_attr=true) |
|
| 1144 | + function dump($show_attr = true) |
|
| 1145 | 1145 | { |
| 1146 | 1146 | $this->root->dump($show_attr); |
| 1147 | 1147 | } |
| 1148 | 1148 | |
| 1149 | 1149 | // prepare HTML data and init everything |
| 1150 | - protected function prepare($str, $lowercase=true, $stripRN=true, $defaultBRText=DEFAULT_BR_TEXT, $defaultSpanText=DEFAULT_SPAN_TEXT) |
|
| 1150 | + protected function prepare($str, $lowercase = true, $stripRN = true, $defaultBRText = DEFAULT_BR_TEXT, $defaultSpanText = DEFAULT_SPAN_TEXT) |
|
| 1151 | 1151 | { |
| 1152 | 1152 | $this->clear(); |
| 1153 | 1153 | |
@@ -1178,13 +1178,13 @@ discard block |
||
| 1178 | 1178 | $this->root->_[HDOM_INFO_BEGIN] = -1; |
| 1179 | 1179 | $this->root->nodetype = HDOM_TYPE_ROOT; |
| 1180 | 1180 | $this->parent = $this->root; |
| 1181 | - if ($this->size>0) $this->char = $this->doc[0]; |
|
| 1181 | + if ($this->size > 0) $this->char = $this->doc[0]; |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | // parse html content |
| 1185 | 1185 | protected function parse() |
| 1186 | 1186 | { |
| 1187 | - if (($s = $this->copy_until_char('<'))==='') |
|
| 1187 | + if (($s = $this->copy_until_char('<')) === '') |
|
| 1188 | 1188 | { |
| 1189 | 1189 | return $this->read_tag(); |
| 1190 | 1190 | } |
@@ -1213,18 +1213,18 @@ discard block |
||
| 1213 | 1213 | if ($success) |
| 1214 | 1214 | { |
| 1215 | 1215 | $charset = $matches[1]; |
| 1216 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: ' . $charset);} |
|
| 1216 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'header content-type found charset of: '.$charset); } |
|
| 1217 | 1217 | } |
| 1218 | 1218 | |
| 1219 | 1219 | } |
| 1220 | 1220 | |
| 1221 | 1221 | if (empty($charset)) |
| 1222 | 1222 | { |
| 1223 | - $el = $this->root->find('meta[http-equiv=Content-Type]',0, true); |
|
| 1223 | + $el = $this->root->find('meta[http-equiv=Content-Type]', 0, true); |
|
| 1224 | 1224 | if (!empty($el)) |
| 1225 | 1225 | { |
| 1226 | 1226 | $fullvalue = $el->content; |
| 1227 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found' . $fullvalue);} |
|
| 1227 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag found'.$fullvalue); } |
|
| 1228 | 1228 | |
| 1229 | 1229 | if (!empty($fullvalue)) |
| 1230 | 1230 | { |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | else |
| 1237 | 1237 | { |
| 1238 | 1238 | // If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1 |
| 1239 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');} |
|
| 1239 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.'); } |
|
| 1240 | 1240 | $charset = 'ISO-8859-1'; |
| 1241 | 1241 | } |
| 1242 | 1242 | } |
@@ -1251,14 +1251,14 @@ discard block |
||
| 1251 | 1251 | if (function_exists('mb_detect_encoding')) |
| 1252 | 1252 | { |
| 1253 | 1253 | // Have php try to detect the encoding from the text given to us. |
| 1254 | - $charset = mb_detect_encoding($this->root->plaintext . "ascii", $encoding_list = array( "UTF-8", "CP1252" ) ); |
|
| 1255 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: ' . $charset);} |
|
| 1254 | + $charset = mb_detect_encoding($this->root->plaintext."ascii", $encoding_list = array("UTF-8", "CP1252")); |
|
| 1255 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'mb_detect found: '.$charset); } |
|
| 1256 | 1256 | } |
| 1257 | 1257 | |
| 1258 | 1258 | // and if this doesn't work... then we need to just wrongheadedly assume it's UTF-8 so that we can move on - cause this will usually give us most of what we need... |
| 1259 | 1259 | if ($charset === false) |
| 1260 | 1260 | { |
| 1261 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8');} |
|
| 1261 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'since mb_detect failed - using default of utf-8'); } |
|
| 1262 | 1262 | $charset = 'UTF-8'; |
| 1263 | 1263 | } |
| 1264 | 1264 | } |
@@ -1266,11 +1266,11 @@ discard block |
||
| 1266 | 1266 | // Since CP1252 is a superset, if we get one of it's subsets, we want it instead. |
| 1267 | 1267 | if ((strtolower($charset) == strtolower('ISO-8859-1')) || (strtolower($charset) == strtolower('Latin1')) || (strtolower($charset) == strtolower('Latin-1'))) |
| 1268 | 1268 | { |
| 1269 | - if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing ' . $charset . ' with CP1252 as its a superset');} |
|
| 1269 | + if (is_object($debug_object)) {$debug_object->debug_log(2, 'replacing '.$charset.' with CP1252 as its a superset'); } |
|
| 1270 | 1270 | $charset = 'CP1252'; |
| 1271 | 1271 | } |
| 1272 | 1272 | |
| 1273 | - if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - ' . $charset);} |
|
| 1273 | + if (is_object($debug_object)) {$debug_object->debug_log(1, 'EXIT - '.$charset); } |
|
| 1274 | 1274 | |
| 1275 | 1275 | return $this->_charset = $charset; |
| 1276 | 1276 | } |
@@ -1278,41 +1278,41 @@ discard block |
||
| 1278 | 1278 | // read tag info |
| 1279 | 1279 | protected function read_tag() |
| 1280 | 1280 | { |
| 1281 | - if ($this->char!=='<') |
|
| 1281 | + if ($this->char !== '<') |
|
| 1282 | 1282 | { |
| 1283 | 1283 | $this->root->_[HDOM_INFO_END] = $this->cursor; |
| 1284 | 1284 | return false; |
| 1285 | 1285 | } |
| 1286 | 1286 | $begin_tag_pos = $this->pos; |
| 1287 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1287 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1288 | 1288 | |
| 1289 | 1289 | // end tag |
| 1290 | - if ($this->char==='/') |
|
| 1290 | + if ($this->char === '/') |
|
| 1291 | 1291 | { |
| 1292 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1292 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1293 | 1293 | // This represents the change in the simple_html_dom trunk from revision 180 to 181. |
| 1294 | 1294 | // $this->skip($this->token_blank_t); |
| 1295 | 1295 | $this->skip($this->token_blank); |
| 1296 | 1296 | $tag = $this->copy_until_char('>'); |
| 1297 | 1297 | |
| 1298 | 1298 | // skip attributes in end tag |
| 1299 | - if (($pos = strpos($tag, ' '))!==false) |
|
| 1299 | + if (($pos = strpos($tag, ' ')) !== false) |
|
| 1300 | 1300 | $tag = substr($tag, 0, $pos); |
| 1301 | 1301 | |
| 1302 | 1302 | $parent_lower = strtolower($this->parent->tag); |
| 1303 | 1303 | $tag_lower = strtolower($tag); |
| 1304 | 1304 | |
| 1305 | - if ($parent_lower!==$tag_lower) |
|
| 1305 | + if ($parent_lower !== $tag_lower) |
|
| 1306 | 1306 | { |
| 1307 | 1307 | if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower])) |
| 1308 | 1308 | { |
| 1309 | 1309 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1310 | 1310 | $org_parent = $this->parent; |
| 1311 | 1311 | |
| 1312 | - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) |
|
| 1312 | + while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) |
|
| 1313 | 1313 | $this->parent = $this->parent->parent; |
| 1314 | 1314 | |
| 1315 | - if (strtolower($this->parent->tag)!==$tag_lower) { |
|
| 1315 | + if (strtolower($this->parent->tag) !== $tag_lower) { |
|
| 1316 | 1316 | $this->parent = $org_parent; // restore origonal parent |
| 1317 | 1317 | if ($this->parent->parent) $this->parent = $this->parent->parent; |
| 1318 | 1318 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
@@ -1324,17 +1324,17 @@ discard block |
||
| 1324 | 1324 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1325 | 1325 | $org_parent = $this->parent; |
| 1326 | 1326 | |
| 1327 | - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) |
|
| 1327 | + while (($this->parent->parent) && strtolower($this->parent->tag) !== $tag_lower) |
|
| 1328 | 1328 | $this->parent = $this->parent->parent; |
| 1329 | 1329 | |
| 1330 | - if (strtolower($this->parent->tag)!==$tag_lower) |
|
| 1330 | + if (strtolower($this->parent->tag) !== $tag_lower) |
|
| 1331 | 1331 | { |
| 1332 | 1332 | $this->parent = $org_parent; // restore origonal parent |
| 1333 | 1333 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
| 1334 | 1334 | return $this->as_text_node($tag); |
| 1335 | 1335 | } |
| 1336 | 1336 | } |
| 1337 | - else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower) |
|
| 1337 | + else if (($this->parent->parent) && strtolower($this->parent->parent->tag) === $tag_lower) |
|
| 1338 | 1338 | { |
| 1339 | 1339 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1340 | 1340 | $this->parent = $this->parent->parent; |
@@ -1346,7 +1346,7 @@ discard block |
||
| 1346 | 1346 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
| 1347 | 1347 | if ($this->parent->parent) $this->parent = $this->parent->parent; |
| 1348 | 1348 | |
| 1349 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1349 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1350 | 1350 | return true; |
| 1351 | 1351 | } |
| 1352 | 1352 | |
@@ -1357,25 +1357,25 @@ discard block |
||
| 1357 | 1357 | $node->tag_start = $begin_tag_pos; |
| 1358 | 1358 | |
| 1359 | 1359 | // doctype, cdata & comments... |
| 1360 | - if (isset($tag[0]) && $tag[0]==='!') { |
|
| 1361 | - $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>'); |
|
| 1360 | + if (isset($tag[0]) && $tag[0] === '!') { |
|
| 1361 | + $node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until_char('>'); |
|
| 1362 | 1362 | |
| 1363 | - if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') { |
|
| 1363 | + if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') { |
|
| 1364 | 1364 | $node->nodetype = HDOM_TYPE_COMMENT; |
| 1365 | 1365 | $node->tag = 'comment'; |
| 1366 | 1366 | } else { |
| 1367 | 1367 | $node->nodetype = HDOM_TYPE_UNKNOWN; |
| 1368 | 1368 | $node->tag = 'unknown'; |
| 1369 | 1369 | } |
| 1370 | - if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1370 | + if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>'; |
|
| 1371 | 1371 | $this->link_nodes($node, true); |
| 1372 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1372 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1373 | 1373 | return true; |
| 1374 | 1374 | } |
| 1375 | 1375 | |
| 1376 | 1376 | // text |
| 1377 | - if ($pos=strpos($tag, '<')!==false) { |
|
| 1378 | - $tag = '<' . substr($tag, 0, -1); |
|
| 1377 | + if ($pos = strpos($tag, '<') !== false) { |
|
| 1378 | + $tag = '<'.substr($tag, 0, -1); |
|
| 1379 | 1379 | $node->_[HDOM_INFO_TEXT] = $tag; |
| 1380 | 1380 | $this->link_nodes($node, false); |
| 1381 | 1381 | $this->char = $this->doc[--$this->pos]; // prev |
@@ -1383,15 +1383,15 @@ discard block |
||
| 1383 | 1383 | } |
| 1384 | 1384 | |
| 1385 | 1385 | if (!preg_match("/^[\w-:]+$/", $tag)) { |
| 1386 | - $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>'); |
|
| 1387 | - if ($this->char==='<') { |
|
| 1386 | + $node->_[HDOM_INFO_TEXT] = '<'.$tag.$this->copy_until('<>'); |
|
| 1387 | + if ($this->char === '<') { |
|
| 1388 | 1388 | $this->link_nodes($node, false); |
| 1389 | 1389 | return true; |
| 1390 | 1390 | } |
| 1391 | 1391 | |
| 1392 | - if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1392 | + if ($this->char === '>') $node->_[HDOM_INFO_TEXT] .= '>'; |
|
| 1393 | 1393 | $this->link_nodes($node, false); |
| 1394 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1394 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1395 | 1395 | return true; |
| 1396 | 1396 | } |
| 1397 | 1397 | |
@@ -1401,7 +1401,7 @@ discard block |
||
| 1401 | 1401 | $node->tag = ($this->lowercase) ? $tag_lower : $tag; |
| 1402 | 1402 | |
| 1403 | 1403 | // handle optional closing tags |
| 1404 | - if (isset($this->optional_closing_tags[$tag_lower]) ) |
|
| 1404 | + if (isset($this->optional_closing_tags[$tag_lower])) |
|
| 1405 | 1405 | { |
| 1406 | 1406 | while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)])) |
| 1407 | 1407 | { |
@@ -1417,67 +1417,67 @@ discard block |
||
| 1417 | 1417 | // attributes |
| 1418 | 1418 | do |
| 1419 | 1419 | { |
| 1420 | - if ($this->char!==null && $space[0]==='') |
|
| 1420 | + if ($this->char !== null && $space[0] === '') |
|
| 1421 | 1421 | { |
| 1422 | 1422 | break; |
| 1423 | 1423 | } |
| 1424 | 1424 | $name = $this->copy_until($this->token_equal); |
| 1425 | - if ($guard===$this->pos) |
|
| 1425 | + if ($guard === $this->pos) |
|
| 1426 | 1426 | { |
| 1427 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1427 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1428 | 1428 | continue; |
| 1429 | 1429 | } |
| 1430 | 1430 | $guard = $this->pos; |
| 1431 | 1431 | |
| 1432 | 1432 | // handle endless '<' |
| 1433 | - if ($this->pos>=$this->size-1 && $this->char!=='>') { |
|
| 1433 | + if ($this->pos >= $this->size - 1 && $this->char !== '>') { |
|
| 1434 | 1434 | $node->nodetype = HDOM_TYPE_TEXT; |
| 1435 | 1435 | $node->_[HDOM_INFO_END] = 0; |
| 1436 | - $node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name; |
|
| 1436 | + $node->_[HDOM_INFO_TEXT] = '<'.$tag.$space[0].$name; |
|
| 1437 | 1437 | $node->tag = 'text'; |
| 1438 | 1438 | $this->link_nodes($node, false); |
| 1439 | 1439 | return true; |
| 1440 | 1440 | } |
| 1441 | 1441 | |
| 1442 | 1442 | // handle mismatch '<' |
| 1443 | - if ($this->doc[$this->pos-1]=='<') { |
|
| 1443 | + if ($this->doc[$this->pos - 1] == '<') { |
|
| 1444 | 1444 | $node->nodetype = HDOM_TYPE_TEXT; |
| 1445 | 1445 | $node->tag = 'text'; |
| 1446 | 1446 | $node->attr = array(); |
| 1447 | 1447 | $node->_[HDOM_INFO_END] = 0; |
| 1448 | - $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1); |
|
| 1448 | + $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos - $begin_tag_pos - 1); |
|
| 1449 | 1449 | $this->pos -= 2; |
| 1450 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1450 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1451 | 1451 | $this->link_nodes($node, false); |
| 1452 | 1452 | return true; |
| 1453 | 1453 | } |
| 1454 | 1454 | |
| 1455 | - if ($name!=='/' && $name!=='') { |
|
| 1455 | + if ($name !== '/' && $name !== '') { |
|
| 1456 | 1456 | $space[1] = $this->copy_skip($this->token_blank); |
| 1457 | 1457 | $name = $this->restore_noise($name); |
| 1458 | 1458 | if ($this->lowercase) $name = strtolower($name); |
| 1459 | - if ($this->char==='=') { |
|
| 1460 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1459 | + if ($this->char === '=') { |
|
| 1460 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1461 | 1461 | $this->parse_attr($node, $name, $space); |
| 1462 | 1462 | } |
| 1463 | 1463 | else { |
| 1464 | 1464 | //no value attr: nowrap, checked selected... |
| 1465 | 1465 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO; |
| 1466 | 1466 | $node->attr[$name] = true; |
| 1467 | - if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev |
|
| 1467 | + if ($this->char != '>') $this->char = $this->doc[--$this->pos]; // prev |
|
| 1468 | 1468 | } |
| 1469 | 1469 | $node->_[HDOM_INFO_SPACE][] = $space; |
| 1470 | 1470 | $space = array($this->copy_skip($this->token_blank), '', ''); |
| 1471 | 1471 | } |
| 1472 | 1472 | else |
| 1473 | 1473 | break; |
| 1474 | - } while ($this->char!=='>' && $this->char!=='/'); |
|
| 1474 | + } while ($this->char !== '>' && $this->char !== '/'); |
|
| 1475 | 1475 | |
| 1476 | 1476 | $this->link_nodes($node, true); |
| 1477 | 1477 | $node->_[HDOM_INFO_ENDSPACE] = $space[0]; |
| 1478 | 1478 | |
| 1479 | 1479 | // check self closing |
| 1480 | - if ($this->copy_until_char_escape('>')==='/') |
|
| 1480 | + if ($this->copy_until_char_escape('>') === '/') |
|
| 1481 | 1481 | { |
| 1482 | 1482 | $node->_[HDOM_INFO_ENDSPACE] .= '/'; |
| 1483 | 1483 | $node->_[HDOM_INFO_END] = 0; |
@@ -1487,7 +1487,7 @@ discard block |
||
| 1487 | 1487 | // reset parent |
| 1488 | 1488 | if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node; |
| 1489 | 1489 | } |
| 1490 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1490 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1491 | 1491 | |
| 1492 | 1492 | // If it's a BR tag, we need to set it's text to the default text. |
| 1493 | 1493 | // This way when we see it in plaintext, we can generate formatting that the user wants. |
@@ -1514,15 +1514,15 @@ discard block |
||
| 1514 | 1514 | switch ($this->char) { |
| 1515 | 1515 | case '"': |
| 1516 | 1516 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE; |
| 1517 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1517 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1518 | 1518 | $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"')); |
| 1519 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1519 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1520 | 1520 | break; |
| 1521 | 1521 | case '\'': |
| 1522 | 1522 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE; |
| 1523 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1523 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1524 | 1524 | $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\'')); |
| 1525 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1525 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1526 | 1526 | break; |
| 1527 | 1527 | default: |
| 1528 | 1528 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO; |
@@ -1553,16 +1553,16 @@ discard block |
||
| 1553 | 1553 | { |
| 1554 | 1554 | $node = new simple_html_dom_node($this); |
| 1555 | 1555 | ++$this->cursor; |
| 1556 | - $node->_[HDOM_INFO_TEXT] = '</' . $tag . '>'; |
|
| 1556 | + $node->_[HDOM_INFO_TEXT] = '</'.$tag.'>'; |
|
| 1557 | 1557 | $this->link_nodes($node, false); |
| 1558 | - $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1558 | + $this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1559 | 1559 | return true; |
| 1560 | 1560 | } |
| 1561 | 1561 | |
| 1562 | 1562 | protected function skip($chars) |
| 1563 | 1563 | { |
| 1564 | 1564 | $this->pos += strspn($this->doc, $chars, $this->pos); |
| 1565 | - $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1565 | + $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1566 | 1566 | } |
| 1567 | 1567 | |
| 1568 | 1568 | protected function copy_skip($chars) |
@@ -1570,8 +1570,8 @@ discard block |
||
| 1570 | 1570 | $pos = $this->pos; |
| 1571 | 1571 | $len = strspn($this->doc, $chars, $pos); |
| 1572 | 1572 | $this->pos += $len; |
| 1573 | - $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1574 | - if ($len===0) return ''; |
|
| 1573 | + $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1574 | + if ($len === 0) return ''; |
|
| 1575 | 1575 | return substr($this->doc, $pos, $len); |
| 1576 | 1576 | } |
| 1577 | 1577 | |
@@ -1580,70 +1580,70 @@ discard block |
||
| 1580 | 1580 | $pos = $this->pos; |
| 1581 | 1581 | $len = strcspn($this->doc, $chars, $pos); |
| 1582 | 1582 | $this->pos += $len; |
| 1583 | - $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1583 | + $this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next |
|
| 1584 | 1584 | return substr($this->doc, $pos, $len); |
| 1585 | 1585 | } |
| 1586 | 1586 | |
| 1587 | 1587 | protected function copy_until_char($char) |
| 1588 | 1588 | { |
| 1589 | - if ($this->char===null) return ''; |
|
| 1589 | + if ($this->char === null) return ''; |
|
| 1590 | 1590 | |
| 1591 | - if (($pos = strpos($this->doc, $char, $this->pos))===false) { |
|
| 1592 | - $ret = substr($this->doc, $this->pos, $this->size-$this->pos); |
|
| 1591 | + if (($pos = strpos($this->doc, $char, $this->pos)) === false) { |
|
| 1592 | + $ret = substr($this->doc, $this->pos, $this->size - $this->pos); |
|
| 1593 | 1593 | $this->char = null; |
| 1594 | 1594 | $this->pos = $this->size; |
| 1595 | 1595 | return $ret; |
| 1596 | 1596 | } |
| 1597 | 1597 | |
| 1598 | - if ($pos===$this->pos) return ''; |
|
| 1598 | + if ($pos === $this->pos) return ''; |
|
| 1599 | 1599 | $pos_old = $this->pos; |
| 1600 | 1600 | $this->char = $this->doc[$pos]; |
| 1601 | 1601 | $this->pos = $pos; |
| 1602 | - return substr($this->doc, $pos_old, $pos-$pos_old); |
|
| 1602 | + return substr($this->doc, $pos_old, $pos - $pos_old); |
|
| 1603 | 1603 | } |
| 1604 | 1604 | |
| 1605 | 1605 | protected function copy_until_char_escape($char) |
| 1606 | 1606 | { |
| 1607 | - if ($this->char===null) return ''; |
|
| 1607 | + if ($this->char === null) return ''; |
|
| 1608 | 1608 | |
| 1609 | 1609 | $start = $this->pos; |
| 1610 | 1610 | while (1) |
| 1611 | 1611 | { |
| 1612 | - if (($pos = strpos($this->doc, $char, $start))===false) |
|
| 1612 | + if (($pos = strpos($this->doc, $char, $start)) === false) |
|
| 1613 | 1613 | { |
| 1614 | - $ret = substr($this->doc, $this->pos, $this->size-$this->pos); |
|
| 1614 | + $ret = substr($this->doc, $this->pos, $this->size - $this->pos); |
|
| 1615 | 1615 | $this->char = null; |
| 1616 | 1616 | $this->pos = $this->size; |
| 1617 | 1617 | return $ret; |
| 1618 | 1618 | } |
| 1619 | 1619 | |
| 1620 | - if ($pos===$this->pos) return ''; |
|
| 1620 | + if ($pos === $this->pos) return ''; |
|
| 1621 | 1621 | |
| 1622 | - if ($this->doc[$pos-1]==='\\') { |
|
| 1623 | - $start = $pos+1; |
|
| 1622 | + if ($this->doc[$pos - 1] === '\\') { |
|
| 1623 | + $start = $pos + 1; |
|
| 1624 | 1624 | continue; |
| 1625 | 1625 | } |
| 1626 | 1626 | |
| 1627 | 1627 | $pos_old = $this->pos; |
| 1628 | 1628 | $this->char = $this->doc[$pos]; |
| 1629 | 1629 | $this->pos = $pos; |
| 1630 | - return substr($this->doc, $pos_old, $pos-$pos_old); |
|
| 1630 | + return substr($this->doc, $pos_old, $pos - $pos_old); |
|
| 1631 | 1631 | } |
| 1632 | 1632 | } |
| 1633 | 1633 | |
| 1634 | 1634 | // remove noise from html content |
| 1635 | 1635 | // save the noise in the $this->noise array. |
| 1636 | - protected function remove_noise($pattern, $remove_tag=false) |
|
| 1636 | + protected function remove_noise($pattern, $remove_tag = false) |
|
| 1637 | 1637 | { |
| 1638 | 1638 | global $debug_object; |
| 1639 | 1639 | if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } |
| 1640 | 1640 | |
| 1641 | 1641 | $count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE); |
| 1642 | 1642 | |
| 1643 | - for ($i=$count-1; $i>-1; --$i) |
|
| 1643 | + for ($i = $count - 1; $i > -1; --$i) |
|
| 1644 | 1644 | { |
| 1645 | - $key = '___noise___'.sprintf('% 5d', count($this->noise)+1000); |
|
| 1646 | - if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: ' . $key); } |
|
| 1645 | + $key = '___noise___'.sprintf('% 5d', count($this->noise) + 1000); |
|
| 1646 | + if (is_object($debug_object)) { $debug_object->debug_log(2, 'key is: '.$key); } |
|
| 1647 | 1647 | $idx = ($remove_tag) ? 0 : 1; |
| 1648 | 1648 | $this->noise[$key] = $matches[$i][$idx][0]; |
| 1649 | 1649 | $this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0])); |
@@ -1651,7 +1651,7 @@ discard block |
||
| 1651 | 1651 | |
| 1652 | 1652 | // reset the length of content |
| 1653 | 1653 | $this->size = strlen($this->doc); |
| 1654 | - if ($this->size>0) |
|
| 1654 | + if ($this->size > 0) |
|
| 1655 | 1655 | { |
| 1656 | 1656 | $this->char = $this->doc[0]; |
| 1657 | 1657 | } |
@@ -1663,28 +1663,28 @@ discard block |
||
| 1663 | 1663 | global $debug_object; |
| 1664 | 1664 | if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } |
| 1665 | 1665 | |
| 1666 | - while (($pos=strpos($text, '___noise___'))!==false) |
|
| 1666 | + while (($pos = strpos($text, '___noise___')) !== false) |
|
| 1667 | 1667 | { |
| 1668 | 1668 | // Sometimes there is a broken piece of markup, and we don't GET the pos+11 etc... token which indicates a problem outside of us... |
| 1669 | - if (strlen($text) > $pos+15) |
|
| 1669 | + if (strlen($text) > $pos + 15) |
|
| 1670 | 1670 | { |
| 1671 | - $key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13].$text[$pos+14].$text[$pos+15]; |
|
| 1672 | - if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: ' . $key); } |
|
| 1671 | + $key = '___noise___'.$text[$pos + 11].$text[$pos + 12].$text[$pos + 13].$text[$pos + 14].$text[$pos + 15]; |
|
| 1672 | + if (is_object($debug_object)) { $debug_object->debug_log(2, 'located key of: '.$key); } |
|
| 1673 | 1673 | |
| 1674 | 1674 | if (isset($this->noise[$key])) |
| 1675 | 1675 | { |
| 1676 | - $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16); |
|
| 1676 | + $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos + 16); |
|
| 1677 | 1677 | } |
| 1678 | 1678 | else |
| 1679 | 1679 | { |
| 1680 | 1680 | // do this to prevent an infinite loop. |
| 1681 | - $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16); |
|
| 1681 | + $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key.substr($text, $pos + 16); |
|
| 1682 | 1682 | } |
| 1683 | 1683 | } |
| 1684 | 1684 | else |
| 1685 | 1685 | { |
| 1686 | 1686 | // There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem. |
| 1687 | - $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11); |
|
| 1687 | + $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY'.substr($text, $pos + 11); |
|
| 1688 | 1688 | } |
| 1689 | 1689 | } |
| 1690 | 1690 | return $text; |
@@ -1696,9 +1696,9 @@ discard block |
||
| 1696 | 1696 | global $debug_object; |
| 1697 | 1697 | if (is_object($debug_object)) { $debug_object->debug_log_entry(1); } |
| 1698 | 1698 | |
| 1699 | - foreach($this->noise as $noiseElement) |
|
| 1699 | + foreach ($this->noise as $noiseElement) |
|
| 1700 | 1700 | { |
| 1701 | - if (strpos($noiseElement, $text)!==false) |
|
| 1701 | + if (strpos($noiseElement, $text) !== false) |
|
| 1702 | 1702 | { |
| 1703 | 1703 | return $noiseElement; |
| 1704 | 1704 | } |
@@ -1727,16 +1727,16 @@ discard block |
||
| 1727 | 1727 | } |
| 1728 | 1728 | |
| 1729 | 1729 | // camel naming conventions |
| 1730 | - function childNodes($idx=-1) {return $this->root->childNodes($idx);} |
|
| 1731 | - function firstChild() {return $this->root->first_child();} |
|
| 1732 | - function lastChild() {return $this->root->last_child();} |
|
| 1733 | - function createElement($name, $value=null) {return @str_get_html("<$name>$value</$name>")->first_child();} |
|
| 1734 | - function createTextNode($value) {return @end(str_get_html($value)->nodes);} |
|
| 1735 | - function getElementById($id) {return $this->find("#$id", 0);} |
|
| 1736 | - function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);} |
|
| 1737 | - function getElementByTagName($name) {return $this->find($name, 0);} |
|
| 1738 | - function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);} |
|
| 1739 | - function loadFile() {$args = func_get_args();$this->load_file($args);} |
|
| 1730 | + function childNodes($idx = -1) {return $this->root->childNodes($idx); } |
|
| 1731 | + function firstChild() {return $this->root->first_child(); } |
|
| 1732 | + function lastChild() {return $this->root->last_child(); } |
|
| 1733 | + function createElement($name, $value = null) {return @str_get_html("<$name>$value</$name>")->first_child(); } |
|
| 1734 | + function createTextNode($value) {return @end(str_get_html($value)->nodes); } |
|
| 1735 | + function getElementById($id) {return $this->find("#$id", 0); } |
|
| 1736 | + function getElementsById($id, $idx = null) {return $this->find("#$id", $idx); } |
|
| 1737 | + function getElementByTagName($name) {return $this->find($name, 0); } |
|
| 1738 | + function getElementsByTagName($name, $idx = -1) {return $this->find($name, $idx); } |
|
| 1739 | + function loadFile() {$args = func_get_args(); $this->load_file($args); } |
|
| 1740 | 1740 | } |
| 1741 | 1741 | |
| 1742 | 1742 | ?> |
| 1743 | 1743 | \ No newline at end of file |
@@ -159,8 +159,9 @@ discard block |
||
| 159 | 159 | if ($show_attr && count($this->attr)>0) |
| 160 | 160 | { |
| 161 | 161 | echo '('; |
| 162 | - foreach ($this->attr as $k=>$v) |
|
| 163 | - echo "[$k]=>\"".$this->$k.'", '; |
|
| 162 | + foreach ($this->attr as $k=>$v) { |
|
| 163 | + echo "[$k]=>\"".$this->$k.'", '; |
|
| 164 | + } |
|
| 164 | 165 | echo ')'; |
| 165 | 166 | } |
| 166 | 167 | echo "\n"; |
@@ -218,8 +219,7 @@ discard block |
||
| 218 | 219 | if (isset($node->_[HDOM_INFO_INNER])) |
| 219 | 220 | { |
| 220 | 221 | $string .= $node->_[HDOM_INFO_INNER] . "'"; |
| 221 | - } |
|
| 222 | - else |
|
| 222 | + } else |
|
| 223 | 223 | { |
| 224 | 224 | $string .= ' NULL '; |
| 225 | 225 | } |
@@ -233,8 +233,7 @@ discard block |
||
| 233 | 233 | { |
| 234 | 234 | echo $string; |
| 235 | 235 | return; |
| 236 | - } |
|
| 237 | - else |
|
| 236 | + } else |
|
| 238 | 237 | { |
| 239 | 238 | return $string; |
| 240 | 239 | } |
@@ -320,12 +319,17 @@ discard block |
||
| 320 | 319 | // returns the previous sibling of node |
| 321 | 320 | function prev_sibling() |
| 322 | 321 | { |
| 323 | - if ($this->parent===null) return null; |
|
| 322 | + if ($this->parent===null) { |
|
| 323 | + return null; |
|
| 324 | + } |
|
| 324 | 325 | $idx = 0; |
| 325 | 326 | $count = count($this->parent->children); |
| 326 | - while ($idx<$count && $this!==$this->parent->children[$idx]) |
|
| 327 | - ++$idx; |
|
| 328 | - if (--$idx<0) return null; |
|
| 327 | + while ($idx<$count && $this!==$this->parent->children[$idx]) { |
|
| 328 | + ++$idx; |
|
| 329 | + } |
|
| 330 | + if (--$idx<0) { |
|
| 331 | + return null; |
|
| 332 | + } |
|
| 329 | 333 | return $this->parent->children[$idx]; |
| 330 | 334 | } |
| 331 | 335 | |
@@ -354,12 +358,17 @@ discard block |
||
| 354 | 358 | // get dom node's inner html |
| 355 | 359 | function innertext() |
| 356 | 360 | { |
| 357 | - if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER]; |
|
| 358 | - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 361 | + if (isset($this->_[HDOM_INFO_INNER])) { |
|
| 362 | + return $this->_[HDOM_INFO_INNER]; |
|
| 363 | + } |
|
| 364 | + if (isset($this->_[HDOM_INFO_TEXT])) { |
|
| 365 | + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 366 | + } |
|
| 359 | 367 | |
| 360 | 368 | $ret = ''; |
| 361 | - foreach ($this->nodes as $n) |
|
| 362 | - $ret .= $n->outertext(); |
|
| 369 | + foreach ($this->nodes as $n) { |
|
| 370 | + $ret .= $n->outertext(); |
|
| 371 | + } |
|
| 363 | 372 | return $ret; |
| 364 | 373 | } |
| 365 | 374 | |
@@ -380,7 +389,9 @@ discard block |
||
| 380 | 389 | $debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text); |
| 381 | 390 | } |
| 382 | 391 | |
| 383 | - if ($this->tag==='root') return $this->innertext(); |
|
| 392 | + if ($this->tag==='root') { |
|
| 393 | + return $this->innertext(); |
|
| 394 | + } |
|
| 384 | 395 | |
| 385 | 396 | // trigger callback |
| 386 | 397 | if ($this->dom && $this->dom->callback!==null) |
@@ -388,8 +399,12 @@ discard block |
||
| 388 | 399 | call_user_func_array($this->dom->callback, array($this)); |
| 389 | 400 | } |
| 390 | 401 | |
| 391 | - if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER]; |
|
| 392 | - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 402 | + if (isset($this->_[HDOM_INFO_OUTER])) { |
|
| 403 | + return $this->_[HDOM_INFO_OUTER]; |
|
| 404 | + } |
|
| 405 | + if (isset($this->_[HDOM_INFO_TEXT])) { |
|
| 406 | + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 407 | + } |
|
| 393 | 408 | |
| 394 | 409 | // render begin tag |
| 395 | 410 | if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) |
@@ -418,23 +433,30 @@ discard block |
||
| 418 | 433 | } |
| 419 | 434 | |
| 420 | 435 | // render end tag |
| 421 | - if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) |
|
| 422 | - $ret .= '</'.$this->tag.'>'; |
|
| 436 | + if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0) { |
|
| 437 | + $ret .= '</'.$this->tag.'>'; |
|
| 438 | + } |
|
| 423 | 439 | return $ret; |
| 424 | 440 | } |
| 425 | 441 | |
| 426 | 442 | // get dom node's plain text |
| 427 | 443 | function text() |
| 428 | 444 | { |
| 429 | - if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER]; |
|
| 445 | + if (isset($this->_[HDOM_INFO_INNER])) { |
|
| 446 | + return $this->_[HDOM_INFO_INNER]; |
|
| 447 | + } |
|
| 430 | 448 | switch ($this->nodetype) |
| 431 | 449 | { |
| 432 | 450 | case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
| 433 | 451 | case HDOM_TYPE_COMMENT: return ''; |
| 434 | 452 | case HDOM_TYPE_UNKNOWN: return ''; |
| 435 | 453 | } |
| 436 | - if (strcasecmp($this->tag, 'script')===0) return ''; |
|
| 437 | - if (strcasecmp($this->tag, 'style')===0) return ''; |
|
| 454 | + if (strcasecmp($this->tag, 'script')===0) { |
|
| 455 | + return ''; |
|
| 456 | + } |
|
| 457 | + if (strcasecmp($this->tag, 'style')===0) { |
|
| 458 | + return ''; |
|
| 459 | + } |
|
| 438 | 460 | |
| 439 | 461 | $ret = ''; |
| 440 | 462 | // In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed for some span tags, and some p tags) $this->nodes is set to NULL. |
@@ -470,7 +492,9 @@ discard block |
||
| 470 | 492 | function makeup() |
| 471 | 493 | { |
| 472 | 494 | // text, comment, unknown |
| 473 | - if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 495 | + if (isset($this->_[HDOM_INFO_TEXT])) { |
|
| 496 | + return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]); |
|
| 497 | + } |
|
| 474 | 498 | |
| 475 | 499 | $ret = '<'.$this->tag; |
| 476 | 500 | $i = -1; |
@@ -480,14 +504,15 @@ discard block |
||
| 480 | 504 | ++$i; |
| 481 | 505 | |
| 482 | 506 | // skip removed attribute |
| 483 | - if ($val===null || $val===false) |
|
| 484 | - continue; |
|
| 507 | + if ($val===null || $val===false) { |
|
| 508 | + continue; |
|
| 509 | + } |
|
| 485 | 510 | |
| 486 | 511 | $ret .= $this->_[HDOM_INFO_SPACE][$i][0]; |
| 487 | 512 | //no value attr: nowrap, checked selected... |
| 488 | - if ($val===true) |
|
| 489 | - $ret .= $key; |
|
| 490 | - else { |
|
| 513 | + if ($val===true) { |
|
| 514 | + $ret .= $key; |
|
| 515 | + } else { |
|
| 491 | 516 | switch ($this->_[HDOM_INFO_QUOTE][$i]) |
| 492 | 517 | { |
| 493 | 518 | case HDOM_QUOTE_DOUBLE: $quote = '"'; break; |
@@ -506,7 +531,9 @@ discard block |
||
| 506 | 531 | function find($selector, $idx=null, $lowercase=false) |
| 507 | 532 | { |
| 508 | 533 | $selectors = $this->parse_selector($selector); |
| 509 | - if (($count=count($selectors))===0) return array(); |
|
| 534 | + if (($count=count($selectors))===0) { |
|
| 535 | + return array(); |
|
| 536 | + } |
|
| 510 | 537 | $found_keys = array(); |
| 511 | 538 | |
| 512 | 539 | // find each selector |
@@ -514,8 +541,12 @@ discard block |
||
| 514 | 541 | { |
| 515 | 542 | // The change on the below line was documented on the sourceforge code tracker id 2788009 |
| 516 | 543 | // used to be: if (($levle=count($selectors[0]))===0) return array(); |
| 517 | - if (($levle=count($selectors[$c]))===0) return array(); |
|
| 518 | - if (!isset($this->_[HDOM_INFO_BEGIN])) return array(); |
|
| 544 | + if (($levle=count($selectors[$c]))===0) { |
|
| 545 | + return array(); |
|
| 546 | + } |
|
| 547 | + if (!isset($this->_[HDOM_INFO_BEGIN])) { |
|
| 548 | + return array(); |
|
| 549 | + } |
|
| 519 | 550 | |
| 520 | 551 | $head = array($this->_[HDOM_INFO_BEGIN]=>1); |
| 521 | 552 | |
@@ -545,12 +576,16 @@ discard block |
||
| 545 | 576 | ksort($found_keys); |
| 546 | 577 | |
| 547 | 578 | $found = array(); |
| 548 | - foreach ($found_keys as $k=>$v) |
|
| 549 | - $found[] = $this->dom->nodes[$k]; |
|
| 579 | + foreach ($found_keys as $k=>$v) { |
|
| 580 | + $found[] = $this->dom->nodes[$k]; |
|
| 581 | + } |
|
| 550 | 582 | |
| 551 | 583 | // return nth-element or array |
| 552 | - if (is_null($idx)) return $found; |
|
| 553 | - else if ($idx<0) $idx = count($found) + $idx; |
|
| 584 | + if (is_null($idx)) { |
|
| 585 | + return $found; |
|
| 586 | + } else if ($idx<0) { |
|
| 587 | + $idx = count($found) + $idx; |
|
| 588 | + } |
|
| 554 | 589 | return (isset($found[$idx])) ? $found[$idx] : null; |
| 555 | 590 | } |
| 556 | 591 | |
@@ -595,8 +630,9 @@ discard block |
||
| 595 | 630 | $pass = true; |
| 596 | 631 | |
| 597 | 632 | if ($tag==='*' && !$key) { |
| 598 | - if (in_array($node, $this->children, true)) |
|
| 599 | - $ret[$i] = 1; |
|
| 633 | + if (in_array($node, $this->children, true)) { |
|
| 634 | + $ret[$i] = 1; |
|
| 635 | + } |
|
| 600 | 636 | continue; |
| 601 | 637 | } |
| 602 | 638 | |
@@ -605,9 +641,13 @@ discard block |
||
| 605 | 641 | // compare key |
| 606 | 642 | if ($pass && $key) { |
| 607 | 643 | if ($no_key) { |
| 608 | - if (isset($node->attr[$key])) $pass=false; |
|
| 644 | + if (isset($node->attr[$key])) { |
|
| 645 | + $pass=false; |
|
| 646 | + } |
|
| 609 | 647 | } else { |
| 610 | - if (($key != "plaintext") && !isset($node->attr[$key])) $pass=false; |
|
| 648 | + if (($key != "plaintext") && !isset($node->attr[$key])) { |
|
| 649 | + $pass=false; |
|
| 650 | + } |
|
| 611 | 651 | } |
| 612 | 652 | } |
| 613 | 653 | // compare value |
@@ -640,13 +680,19 @@ discard block |
||
| 640 | 680 | } else { |
| 641 | 681 | $check = $this->match($exp, $val, $k); |
| 642 | 682 | } |
| 643 | - if ($check) break; |
|
| 683 | + if ($check) { |
|
| 684 | + break; |
|
| 685 | + } |
|
| 644 | 686 | } |
| 645 | 687 | } |
| 646 | 688 | } |
| 647 | - if (!$check) $pass = false; |
|
| 689 | + if (!$check) { |
|
| 690 | + $pass = false; |
|
| 691 | + } |
|
| 692 | + } |
|
| 693 | + if ($pass) { |
|
| 694 | + $ret[$i] = 1; |
|
| 648 | 695 | } |
| 649 | - if ($pass) $ret[$i] = 1; |
|
| 650 | 696 | unset($node); |
| 651 | 697 | } |
| 652 | 698 | // It's passed by reference so this is actually what this function returns. |
@@ -696,9 +742,13 @@ discard block |
||
| 696 | 742 | |
| 697 | 743 | foreach ($matches as $m) { |
| 698 | 744 | $m[0] = trim($m[0]); |
| 699 | - if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue; |
|
| 745 | + if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') { |
|
| 746 | + continue; |
|
| 747 | + } |
|
| 700 | 748 | // for browser generated xpath |
| 701 | - if ($m[1]==='tbody') continue; |
|
| 749 | + if ($m[1]==='tbody') { |
|
| 750 | + continue; |
|
| 751 | + } |
|
| 702 | 752 | |
| 703 | 753 | list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false); |
| 704 | 754 | if (!empty($m[2])) {$key='id'; $val=$m[2];} |
@@ -718,8 +768,9 @@ discard block |
||
| 718 | 768 | $result = array(); |
| 719 | 769 | } |
| 720 | 770 | } |
| 721 | - if (count($result)>0) |
|
| 722 | - $selectors[] = $result; |
|
| 771 | + if (count($result)>0) { |
|
| 772 | + $selectors[] = $result; |
|
| 773 | + } |
|
| 723 | 774 | return $selectors; |
| 724 | 775 | } |
| 725 | 776 | |
@@ -748,7 +799,9 @@ discard block |
||
| 748 | 799 | { |
| 749 | 800 | case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value; |
| 750 | 801 | case 'innertext': |
| 751 | - if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value; |
|
| 802 | + if (isset($this->_[HDOM_INFO_TEXT])) { |
|
| 803 | + return $this->_[HDOM_INFO_TEXT] = $value; |
|
| 804 | + } |
|
| 752 | 805 | return $this->_[HDOM_INFO_INNER] = $value; |
| 753 | 806 | } |
| 754 | 807 | if (!isset($this->attr[$name])) |
@@ -772,8 +825,9 @@ discard block |
||
| 772 | 825 | } |
| 773 | 826 | |
| 774 | 827 | function __unset($name) { |
| 775 | - if (isset($this->attr[$name])) |
|
| 776 | - unset($this->attr[$name]); |
|
| 828 | + if (isset($this->attr[$name])) { |
|
| 829 | + unset($this->attr[$name]); |
|
| 830 | + } |
|
| 777 | 831 | } |
| 778 | 832 | |
| 779 | 833 | // PaperG - Function to convert the text from one character set to another if the two sets are not the same. |
@@ -800,8 +854,7 @@ discard block |
||
| 800 | 854 | if ((strcasecmp($targetCharset, 'UTF-8') == 0) && ($this->is_utf8($text))) |
| 801 | 855 | { |
| 802 | 856 | $converted_text = $text; |
| 803 | - } |
|
| 804 | - else |
|
| 857 | + } else |
|
| 805 | 858 | { |
| 806 | 859 | $converted_text = iconv($sourceCharset, $targetCharset, $text); |
| 807 | 860 | } |
@@ -839,19 +892,31 @@ discard block |
||
| 839 | 892 | $c=ord($str[$i]); |
| 840 | 893 | if($c > 128) |
| 841 | 894 | { |
| 842 | - if(($c >= 254)) return false; |
|
| 843 | - elseif($c >= 252) $bits=6; |
|
| 844 | - elseif($c >= 248) $bits=5; |
|
| 845 | - elseif($c >= 240) $bits=4; |
|
| 846 | - elseif($c >= 224) $bits=3; |
|
| 847 | - elseif($c >= 192) $bits=2; |
|
| 848 | - else return false; |
|
| 849 | - if(($i+$bits) > $len) return false; |
|
| 895 | + if(($c >= 254)) { |
|
| 896 | + return false; |
|
| 897 | + } elseif($c >= 252) { |
|
| 898 | + $bits=6; |
|
| 899 | + } elseif($c >= 248) { |
|
| 900 | + $bits=5; |
|
| 901 | + } elseif($c >= 240) { |
|
| 902 | + $bits=4; |
|
| 903 | + } elseif($c >= 224) { |
|
| 904 | + $bits=3; |
|
| 905 | + } elseif($c >= 192) { |
|
| 906 | + $bits=2; |
|
| 907 | + } else { |
|
| 908 | + return false; |
|
| 909 | + } |
|
| 910 | + if(($i+$bits) > $len) { |
|
| 911 | + return false; |
|
| 912 | + } |
|
| 850 | 913 | while($bits > 1) |
| 851 | 914 | { |
| 852 | 915 | $i++; |
| 853 | 916 | $b=ord($str[$i]); |
| 854 | - if($b < 128 || $b > 191) return false; |
|
| 917 | + if($b < 128 || $b > 191) { |
|
| 918 | + return false; |
|
| 919 | + } |
|
| 855 | 920 | $bits--; |
| 856 | 921 | } |
| 857 | 922 | } |
@@ -1035,8 +1100,7 @@ discard block |
||
| 1035 | 1100 | if (preg_match("/^http:\/\//i",$str) || is_file($str)) |
| 1036 | 1101 | { |
| 1037 | 1102 | $this->load_file($str); |
| 1038 | - } |
|
| 1039 | - else |
|
| 1103 | + } else |
|
| 1040 | 1104 | { |
| 1041 | 1105 | $this->load($str, $lowercase, $stripRN, $defaultBRText, $defaultSpanText); |
| 1042 | 1106 | } |
@@ -1118,7 +1182,9 @@ discard block |
||
| 1118 | 1182 | function save($filepath='') |
| 1119 | 1183 | { |
| 1120 | 1184 | $ret = $this->root->innertext(); |
| 1121 | - if ($filepath!=='') file_put_contents($filepath, $ret, LOCK_EX); |
|
| 1185 | + if ($filepath!=='') { |
|
| 1186 | + file_put_contents($filepath, $ret, LOCK_EX); |
|
| 1187 | + } |
|
| 1122 | 1188 | return $ret; |
| 1123 | 1189 | } |
| 1124 | 1190 | |
@@ -1134,7 +1200,10 @@ discard block |
||
| 1134 | 1200 | { |
| 1135 | 1201 | foreach ($this->nodes as $n) {$n->clear(); $n = null;} |
| 1136 | 1202 | // This add next line is documented in the sourceforge repository. 2977248 as a fix for ongoing memory leaks that occur even with the use of clear. |
| 1137 | - if (isset($this->children)) foreach ($this->children as $n) {$n->clear(); $n = null;} |
|
| 1203 | + if (isset($this->children)) { |
|
| 1204 | + foreach ($this->children as $n) {$n->clear(); |
|
| 1205 | + } |
|
| 1206 | + $n = null;} |
|
| 1138 | 1207 | if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);} |
| 1139 | 1208 | if (isset($this->root)) {$this->root->clear(); unset($this->root);} |
| 1140 | 1209 | unset($this->doc); |
@@ -1178,7 +1247,9 @@ discard block |
||
| 1178 | 1247 | $this->root->_[HDOM_INFO_BEGIN] = -1; |
| 1179 | 1248 | $this->root->nodetype = HDOM_TYPE_ROOT; |
| 1180 | 1249 | $this->parent = $this->root; |
| 1181 | - if ($this->size>0) $this->char = $this->doc[0]; |
|
| 1250 | + if ($this->size>0) { |
|
| 1251 | + $this->char = $this->doc[0]; |
|
| 1252 | + } |
|
| 1182 | 1253 | } |
| 1183 | 1254 | |
| 1184 | 1255 | // parse html content |
@@ -1232,8 +1303,7 @@ discard block |
||
| 1232 | 1303 | if ($success) |
| 1233 | 1304 | { |
| 1234 | 1305 | $charset = $matches[1]; |
| 1235 | - } |
|
| 1236 | - else |
|
| 1306 | + } else |
|
| 1237 | 1307 | { |
| 1238 | 1308 | // If there is a meta tag, and they don't specify the character set, research says that it's typically ISO-8859-1 |
| 1239 | 1309 | if (is_object($debug_object)) {$debug_object->debug_log(2, 'meta content-type tag couldn\'t be parsed. using iso-8859 default.');} |
@@ -1296,8 +1366,9 @@ discard block |
||
| 1296 | 1366 | $tag = $this->copy_until_char('>'); |
| 1297 | 1367 | |
| 1298 | 1368 | // skip attributes in end tag |
| 1299 | - if (($pos = strpos($tag, ' '))!==false) |
|
| 1300 | - $tag = substr($tag, 0, $pos); |
|
| 1369 | + if (($pos = strpos($tag, ' '))!==false) { |
|
| 1370 | + $tag = substr($tag, 0, $pos); |
|
| 1371 | + } |
|
| 1301 | 1372 | |
| 1302 | 1373 | $parent_lower = strtolower($this->parent->tag); |
| 1303 | 1374 | $tag_lower = strtolower($tag); |
@@ -1309,23 +1380,26 @@ discard block |
||
| 1309 | 1380 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1310 | 1381 | $org_parent = $this->parent; |
| 1311 | 1382 | |
| 1312 | - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) |
|
| 1313 | - $this->parent = $this->parent->parent; |
|
| 1383 | + while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) { |
|
| 1384 | + $this->parent = $this->parent->parent; |
|
| 1385 | + } |
|
| 1314 | 1386 | |
| 1315 | 1387 | if (strtolower($this->parent->tag)!==$tag_lower) { |
| 1316 | 1388 | $this->parent = $org_parent; // restore origonal parent |
| 1317 | - if ($this->parent->parent) $this->parent = $this->parent->parent; |
|
| 1389 | + if ($this->parent->parent) { |
|
| 1390 | + $this->parent = $this->parent->parent; |
|
| 1391 | + } |
|
| 1318 | 1392 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
| 1319 | 1393 | return $this->as_text_node($tag); |
| 1320 | 1394 | } |
| 1321 | - } |
|
| 1322 | - else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) |
|
| 1395 | + } else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) |
|
| 1323 | 1396 | { |
| 1324 | 1397 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1325 | 1398 | $org_parent = $this->parent; |
| 1326 | 1399 | |
| 1327 | - while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) |
|
| 1328 | - $this->parent = $this->parent->parent; |
|
| 1400 | + while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower) { |
|
| 1401 | + $this->parent = $this->parent->parent; |
|
| 1402 | + } |
|
| 1329 | 1403 | |
| 1330 | 1404 | if (strtolower($this->parent->tag)!==$tag_lower) |
| 1331 | 1405 | { |
@@ -1333,18 +1407,19 @@ discard block |
||
| 1333 | 1407 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
| 1334 | 1408 | return $this->as_text_node($tag); |
| 1335 | 1409 | } |
| 1336 | - } |
|
| 1337 | - else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower) |
|
| 1410 | + } else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower) |
|
| 1338 | 1411 | { |
| 1339 | 1412 | $this->parent->_[HDOM_INFO_END] = 0; |
| 1340 | 1413 | $this->parent = $this->parent->parent; |
| 1414 | + } else { |
|
| 1415 | + return $this->as_text_node($tag); |
|
| 1341 | 1416 | } |
| 1342 | - else |
|
| 1343 | - return $this->as_text_node($tag); |
|
| 1344 | 1417 | } |
| 1345 | 1418 | |
| 1346 | 1419 | $this->parent->_[HDOM_INFO_END] = $this->cursor; |
| 1347 | - if ($this->parent->parent) $this->parent = $this->parent->parent; |
|
| 1420 | + if ($this->parent->parent) { |
|
| 1421 | + $this->parent = $this->parent->parent; |
|
| 1422 | + } |
|
| 1348 | 1423 | |
| 1349 | 1424 | $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1350 | 1425 | return true; |
@@ -1367,7 +1442,9 @@ discard block |
||
| 1367 | 1442 | $node->nodetype = HDOM_TYPE_UNKNOWN; |
| 1368 | 1443 | $node->tag = 'unknown'; |
| 1369 | 1444 | } |
| 1370 | - if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1445 | + if ($this->char==='>') { |
|
| 1446 | + $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1447 | + } |
|
| 1371 | 1448 | $this->link_nodes($node, true); |
| 1372 | 1449 | $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1373 | 1450 | return true; |
@@ -1389,7 +1466,9 @@ discard block |
||
| 1389 | 1466 | return true; |
| 1390 | 1467 | } |
| 1391 | 1468 | |
| 1392 | - if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1469 | + if ($this->char==='>') { |
|
| 1470 | + $node->_[HDOM_INFO_TEXT].='>'; |
|
| 1471 | + } |
|
| 1393 | 1472 | $this->link_nodes($node, false); |
| 1394 | 1473 | $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1395 | 1474 | return true; |
@@ -1455,22 +1534,26 @@ discard block |
||
| 1455 | 1534 | if ($name!=='/' && $name!=='') { |
| 1456 | 1535 | $space[1] = $this->copy_skip($this->token_blank); |
| 1457 | 1536 | $name = $this->restore_noise($name); |
| 1458 | - if ($this->lowercase) $name = strtolower($name); |
|
| 1537 | + if ($this->lowercase) { |
|
| 1538 | + $name = strtolower($name); |
|
| 1539 | + } |
|
| 1459 | 1540 | if ($this->char==='=') { |
| 1460 | 1541 | $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1461 | 1542 | $this->parse_attr($node, $name, $space); |
| 1462 | - } |
|
| 1463 | - else { |
|
| 1543 | + } else { |
|
| 1464 | 1544 | //no value attr: nowrap, checked selected... |
| 1465 | 1545 | $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO; |
| 1466 | 1546 | $node->attr[$name] = true; |
| 1467 | - if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev |
|
| 1547 | + if ($this->char!='>') { |
|
| 1548 | + $this->char = $this->doc[--$this->pos]; |
|
| 1549 | + } |
|
| 1550 | + // prev |
|
| 1468 | 1551 | } |
| 1469 | 1552 | $node->_[HDOM_INFO_SPACE][] = $space; |
| 1470 | 1553 | $space = array($this->copy_skip($this->token_blank), '', ''); |
| 1554 | + } else { |
|
| 1555 | + break; |
|
| 1471 | 1556 | } |
| 1472 | - else |
|
| 1473 | - break; |
|
| 1474 | 1557 | } while ($this->char!=='>' && $this->char!=='/'); |
| 1475 | 1558 | |
| 1476 | 1559 | $this->link_nodes($node, true); |
@@ -1481,11 +1564,12 @@ discard block |
||
| 1481 | 1564 | { |
| 1482 | 1565 | $node->_[HDOM_INFO_ENDSPACE] .= '/'; |
| 1483 | 1566 | $node->_[HDOM_INFO_END] = 0; |
| 1484 | - } |
|
| 1485 | - else |
|
| 1567 | + } else |
|
| 1486 | 1568 | { |
| 1487 | 1569 | // reset parent |
| 1488 | - if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node; |
|
| 1570 | + if (!isset($this->self_closing_tags[strtolower($node->tag)])) { |
|
| 1571 | + $this->parent = $node; |
|
| 1572 | + } |
|
| 1489 | 1573 | } |
| 1490 | 1574 | $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1491 | 1575 | |
@@ -1571,7 +1655,9 @@ discard block |
||
| 1571 | 1655 | $len = strspn($this->doc, $chars, $pos); |
| 1572 | 1656 | $this->pos += $len; |
| 1573 | 1657 | $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next |
| 1574 | - if ($len===0) return ''; |
|
| 1658 | + if ($len===0) { |
|
| 1659 | + return ''; |
|
| 1660 | + } |
|
| 1575 | 1661 | return substr($this->doc, $pos, $len); |
| 1576 | 1662 | } |
| 1577 | 1663 | |
@@ -1586,7 +1672,9 @@ discard block |
||
| 1586 | 1672 | |
| 1587 | 1673 | protected function copy_until_char($char) |
| 1588 | 1674 | { |
| 1589 | - if ($this->char===null) return ''; |
|
| 1675 | + if ($this->char===null) { |
|
| 1676 | + return ''; |
|
| 1677 | + } |
|
| 1590 | 1678 | |
| 1591 | 1679 | if (($pos = strpos($this->doc, $char, $this->pos))===false) { |
| 1592 | 1680 | $ret = substr($this->doc, $this->pos, $this->size-$this->pos); |
@@ -1595,7 +1683,9 @@ discard block |
||
| 1595 | 1683 | return $ret; |
| 1596 | 1684 | } |
| 1597 | 1685 | |
| 1598 | - if ($pos===$this->pos) return ''; |
|
| 1686 | + if ($pos===$this->pos) { |
|
| 1687 | + return ''; |
|
| 1688 | + } |
|
| 1599 | 1689 | $pos_old = $this->pos; |
| 1600 | 1690 | $this->char = $this->doc[$pos]; |
| 1601 | 1691 | $this->pos = $pos; |
@@ -1604,7 +1694,9 @@ discard block |
||
| 1604 | 1694 | |
| 1605 | 1695 | protected function copy_until_char_escape($char) |
| 1606 | 1696 | { |
| 1607 | - if ($this->char===null) return ''; |
|
| 1697 | + if ($this->char===null) { |
|
| 1698 | + return ''; |
|
| 1699 | + } |
|
| 1608 | 1700 | |
| 1609 | 1701 | $start = $this->pos; |
| 1610 | 1702 | while (1) |
@@ -1617,7 +1709,9 @@ discard block |
||
| 1617 | 1709 | return $ret; |
| 1618 | 1710 | } |
| 1619 | 1711 | |
| 1620 | - if ($pos===$this->pos) return ''; |
|
| 1712 | + if ($pos===$this->pos) { |
|
| 1713 | + return ''; |
|
| 1714 | + } |
|
| 1621 | 1715 | |
| 1622 | 1716 | if ($this->doc[$pos-1]==='\\') { |
| 1623 | 1717 | $start = $pos+1; |
@@ -1674,14 +1768,12 @@ discard block |
||
| 1674 | 1768 | if (isset($this->noise[$key])) |
| 1675 | 1769 | { |
| 1676 | 1770 | $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+16); |
| 1677 | - } |
|
| 1678 | - else |
|
| 1771 | + } else |
|
| 1679 | 1772 | { |
| 1680 | 1773 | // do this to prevent an infinite loop. |
| 1681 | 1774 | $text = substr($text, 0, $pos).'UNDEFINED NOISE FOR KEY: '.$key . substr($text, $pos+16); |
| 1682 | 1775 | } |
| 1683 | - } |
|
| 1684 | - else |
|
| 1776 | + } else |
|
| 1685 | 1777 | { |
| 1686 | 1778 | // There is no valid key being given back to us... We must get rid of the ___noise___ or we will have a problem. |
| 1687 | 1779 | $text = substr($text, 0, $pos).'NO NUMERIC NOISE KEY' . substr($text, $pos+11); |
@@ -3,13 +3,13 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 7 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
| 8 | -$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort); |
|
| 6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 7 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
| 8 | +$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort); |
|
| 9 | 9 | |
| 10 | 10 | if (!empty($spotter_array)) |
| 11 | 11 | { |
| 12 | - $title = sprintf(_("Most Common Aircraft Manufacturer on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 12 | + $title = sprintf(_("Most Common Aircraft Manufacturer on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
| 15 | 15 | print '<div class="select-item">'; |
@@ -27,13 +27,13 @@ discard block |
||
| 27 | 27 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
| 28 | 28 | print '<br />'; |
| 29 | 29 | print '<div class="info column">'; |
| 30 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 30 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 31 | 31 | print '</div>'; |
| 32 | 32 | |
| 33 | 33 | include('date-sub-menu.php'); |
| 34 | 34 | print '<div class="column">'; |
| 35 | 35 | print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>'; |
| 36 | - print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 36 | + print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 37 | 37 | |
| 38 | 38 | $manufacturers_array = $Spotter->countAllAircraftManufacturerByDate($date); |
| 39 | 39 | if (!empty($manufacturers_array)) |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | print '</thead>'; |
| 49 | 49 | print '<tbody>'; |
| 50 | 50 | $i = 1; |
| 51 | - foreach($manufacturers_array as $manufacturer_item) |
|
| 51 | + foreach ($manufacturers_array as $manufacturer_item) |
|
| 52 | 52 | { |
| 53 | 53 | print '<tr>'; |
| 54 | 54 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -3,9 +3,9 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 7 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
| 8 | -$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort); |
|
| 6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 7 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
| 8 | +$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort); |
|
| 9 | 9 | |
| 10 | 10 | if (!empty($spotter_array)) |
| 11 | 11 | { |
@@ -27,13 +27,13 @@ discard block |
||
| 27 | 27 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
| 28 | 28 | print '<br />'; |
| 29 | 29 | print '<div class="info column">'; |
| 30 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 30 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 31 | 31 | print '</div>'; |
| 32 | 32 | |
| 33 | 33 | include('date-sub-menu.php'); |
| 34 | 34 | print '<div class="column">'; |
| 35 | 35 | print '<h2>'._("Most Common Aircraft by Registration").'</h2>'; |
| 36 | - print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 36 | + print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 37 | 37 | |
| 38 | 38 | $aircraft_array = $Spotter->countAllAircraftRegistrationByDate($date); |
| 39 | 39 | if (!empty($aircraft_array)) |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | print '</thead>'; |
| 51 | 51 | print '<tbody>'; |
| 52 | 52 | $i = 1; |
| 53 | - foreach($aircraft_array as $aircraft_item) |
|
| 53 | + foreach ($aircraft_array as $aircraft_item) |
|
| 54 | 54 | { |
| 55 | 55 | print '<tr>'; |
| 56 | 56 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | if (isset($aircraft_item['aircraft_type'])) { |
| 61 | 61 | print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_type'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:").' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>'; |
| 62 | 62 | } else { |
| 63 | - print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:");' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>'; |
|
| 63 | + print '<a href="'.$globalURL.'/registration/'.$aircraft_item['registration'].'"><img src="'.$aircraft_item['image_thumbnail'].'" class="img-rounded" data-toggle="popover" title="'.$aircraft_item['registration'].' - '.$aircraft_item['aircraft_icao'].' - '.$aircraft_item['airline_name'].'" alt="'.$aircraft_item['registration'].' - '.$aircraft_item['airline_name'].'" data-content="'._("Registration:").' '.$aircraft_item['registration'].'<br />'._("Aircraft:").' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')<br />'._("Airline:"); ' '.$aircraft_item['airline_name'].'" data-html="true" width="100px" /></a>'; |
|
| 64 | 64 | } |
| 65 | 65 | print '</td>'; |
| 66 | 66 | } else { |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['airline'])) { |
| 7 | - header('Location: '.$globalURL.'/airline'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/airline'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 11 | 11 | $Spotter = new Spotter(); |
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | header('Location: '.$globalURL.'/airline'); |
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 10 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | $Spotter = new Spotter(); |
| 12 | -$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1",""); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", ""); |
|
| 13 | 13 | |
| 14 | 14 | if (!empty($spotter_array)) |
| 15 | 15 | { |
| 16 | - $title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']); |
|
| 16 | + $title = sprintf(_("Most Common Aircraft Manufacturer from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']); |
|
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | print '<div class="select-item">'; |
| 19 | 19 | print '<form action="'.$globalURL.'/airline" method="post">'; |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | $Stats = new Stats(); |
| 23 | 23 | $airline_names = $Stats->getAllAirlineNames(); |
| 24 | 24 | if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
| 25 | - foreach($airline_names as $airline_name) |
|
| 25 | + foreach ($airline_names as $airline_name) |
|
| 26 | 26 | { |
| 27 | - if($airline == $airline_name['airline_icao']) |
|
| 27 | + if ($airline == $airline_name['airline_icao']) |
|
| 28 | 28 | { |
| 29 | 29 | print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>'; |
| 30 | 30 | } else { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | include('airline-sub-menu.php'); |
| 63 | 63 | print '<div class="column">'; |
| 64 | 64 | print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>'; |
| 65 | - print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>'; |
|
| 65 | + print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>'; |
|
| 66 | 66 | |
| 67 | 67 | $manufacturers_array = $Spotter->countAllAircraftManufacturerByAirline($airline); |
| 68 | 68 | if (!empty($manufacturers_array)) |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | print '</thead>'; |
| 78 | 78 | print '<tbody>'; |
| 79 | 79 | $i = 1; |
| 80 | - foreach($manufacturers_array as $manufacturer_item) |
|
| 80 | + foreach ($manufacturers_array as $manufacturer_item) |
|
| 81 | 81 | { |
| 82 | 82 | print '<tr>'; |
| 83 | 83 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -21,7 +21,9 @@ discard block |
||
| 21 | 21 | print '<option></option>'; |
| 22 | 22 | $Stats = new Stats(); |
| 23 | 23 | $airline_names = $Stats->getAllAirlineNames(); |
| 24 | - if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
|
| 24 | + if (empty($airline_names)) { |
|
| 25 | + $airline_names = $Spotter->getAllAirlineNames(); |
|
| 26 | + } |
|
| 25 | 27 | foreach($airline_names as $airline_name) |
| 26 | 28 | { |
| 27 | 29 | if($airline == $airline_name['airline_icao']) |
@@ -43,8 +45,7 @@ discard block |
||
| 43 | 45 | if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif')) |
| 44 | 46 | { |
| 45 | 47 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
| 46 | - } |
|
| 47 | - elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
| 48 | + } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
| 48 | 49 | { |
| 49 | 50 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
| 50 | 51 | } |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['aircraft_manufacturer'])) { |
| 7 | - header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/manufacturer'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | 11 | $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
@@ -8,13 +8,13 @@ discard block |
||
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | 10 | $Spotter = new Spotter(); |
| 11 | -$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
|
| 12 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 13 | -$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort); |
|
| 11 | +$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))); |
|
| 12 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 13 | +$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort); |
|
| 14 | 14 | |
| 15 | 15 | if (!empty($spotter_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Aircraft by Registration from %s"),$manufacturer); |
|
| 17 | + $title = sprintf(_("Most Common Aircraft by Registration from %s"), $manufacturer); |
|
| 18 | 18 | require_once('header.php'); |
| 19 | 19 | |
| 20 | 20 | print '<div class="select-item">'; |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | 25 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 26 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 26 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 27 | 27 | { |
| 28 | - if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 28 | + if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 29 | 29 | { |
| 30 | 30 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 31 | 31 | } else { |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | include('manufacturer-sub-menu.php'); |
| 45 | 45 | print '<div class="column">'; |
| 46 | 46 | print '<h2>'._("Most Common Aircraft by Registration").'</h2>'; |
| 47 | - print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 47 | + print '<p>'.sprintf(_("The statistic below shows the most common aircraft by registration of flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 48 | 48 | |
| 49 | 49 | $aircraft_array = $Spotter->countAllAircraftRegistrationByManufacturer($manufacturer); |
| 50 | 50 | if (!empty($aircraft_array)) |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | print '</thead>'; |
| 62 | 62 | print '<tbody>'; |
| 63 | 63 | $i = 1; |
| 64 | - foreach($aircraft_array as $aircraft_item) |
|
| 64 | + foreach ($aircraft_array as $aircraft_item) |
|
| 65 | 65 | { |
| 66 | 66 | print '<tr>'; |
| 67 | 67 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -22,7 +22,9 @@ |
||
| 22 | 22 | print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">'; |
| 23 | 23 | $Stats = new Stats(); |
| 24 | 24 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 25 | - if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 25 | + if (empty($all_manufacturers)) { |
|
| 26 | + $all_manufacturers = $Spotter->getAllManufacturers(); |
|
| 27 | + } |
|
| 26 | 28 | foreach($all_manufacturers as $all_manufacturer) |
| 27 | 29 | { |
| 28 | 30 | if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
@@ -7,12 +7,12 @@ discard block |
||
| 7 | 7 | require_once('header.php'); |
| 8 | 8 | |
| 9 | 9 | //calculuation for the pagination |
| 10 | -if(!isset($_GET['limit']) || $_GET['limit'] == "") |
|
| 10 | +if (!isset($_GET['limit']) || $_GET['limit'] == "") |
|
| 11 | 11 | { |
| 12 | 12 | $limit_start = 0; |
| 13 | 13 | $limit_end = 25; |
| 14 | 14 | $absolute_difference = 25; |
| 15 | -} else { |
|
| 15 | +} else { |
|
| 16 | 16 | $limit_explode = explode(",", $_GET['limit']); |
| 17 | 17 | $limit_start = $limit_explode[0]; |
| 18 | 18 | $limit_end = $limit_explode[1]; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | print '<div class="table column">'; |
| 40 | 40 | print '<p>'._("The table below shows the detailed information of all custom selected flights who have special aspects to it, such as unique liveries, destinations etc.").'</p>'; |
| 41 | 41 | |
| 42 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 42 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 43 | 43 | if ($sort != '') { |
| 44 | 44 | $spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort); |
| 45 | 45 | } else { |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | $limit_start = 0; |
| 13 | 13 | $limit_end = 25; |
| 14 | 14 | $absolute_difference = 25; |
| 15 | -} else { |
|
| 15 | +} else { |
|
| 16 | 16 | $limit_explode = explode(",", $_GET['limit']); |
| 17 | 17 | $limit_start = $limit_explode[0]; |
| 18 | 18 | $limit_end = $limit_explode[1]; |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | if (!isset($_GET['airport'])) { |
| 7 | - header('Location: '.$globalURL.'/airport'); |
|
| 8 | - die(); |
|
| 7 | + header('Location: '.$globalURL.'/airport'); |
|
| 8 | + die(); |
|
| 9 | 9 | } |
| 10 | 10 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
| 11 | 11 | $Spotter = new Spotter(); |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | header('Location: '.$globalURL.'/airport'); |
| 8 | 8 | die(); |
| 9 | 9 | } |
| 10 | -$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
|
| 10 | +$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | $Spotter = new Spotter(); |
| 12 | -$spotter_array = $Spotter->getSpotterDataByAirport($airport,"0,1",""); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByAirport($airport, "0,1", ""); |
|
| 13 | 13 | $airport_array = $Spotter->getAllAirportInfo($airport); |
| 14 | 14 | |
| 15 | 15 | if (!empty($airport_array)) |
| 16 | 16 | { |
| 17 | - $title = sprintf(_("Most Common Aircraft Manufacturer to/from %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']); |
|
| 17 | + $title = sprintf(_("Most Common Aircraft Manufacturer to/from %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']); |
|
| 18 | 18 | |
| 19 | 19 | require_once('header.php'); |
| 20 | 20 | print '<div class="select-item">'; |
@@ -25,9 +25,9 @@ discard block |
||
| 25 | 25 | $airport_names = $Stats->getAllAirportNames(); |
| 26 | 26 | if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
| 27 | 27 | ksort($airport_names); |
| 28 | - foreach($airport_names as $airport_name) |
|
| 28 | + foreach ($airport_names as $airport_name) |
|
| 29 | 29 | { |
| 30 | - if($_GET['airport'] == $airport_name['airport_icao']) |
|
| 30 | + if ($_GET['airport'] == $airport_name['airport_icao']) |
|
| 31 | 31 | { |
| 32 | 32 | print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>'; |
| 33 | 33 | } else { |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | include('airport-sub-menu.php'); |
| 59 | 59 | print '<div class="column">'; |
| 60 | 60 | print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>'; |
| 61 | - print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>'; |
|
| 61 | + print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>'; |
|
| 62 | 62 | |
| 63 | 63 | $manufacturers_array = $Spotter->countAllAircraftManufacturerByAirport($_GET['airport']); |
| 64 | 64 | if (!empty($manufacturers_array)) |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | print '</thead>'; |
| 74 | 74 | print '<tbody>'; |
| 75 | 75 | $i = 1; |
| 76 | - foreach($manufacturers_array as $manufacturer_item) |
|
| 76 | + foreach ($manufacturers_array as $manufacturer_item) |
|
| 77 | 77 | { |
| 78 | 78 | print '<tr>'; |
| 79 | 79 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -23,7 +23,9 @@ |
||
| 23 | 23 | print '<option></option>'; |
| 24 | 24 | $Stats = new Stats(); |
| 25 | 25 | $airport_names = $Stats->getAllAirportNames(); |
| 26 | - if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames(); |
|
| 26 | + if (empty($airport_names)) { |
|
| 27 | + $airport_names = $Spotter->getAllAirportNames(); |
|
| 28 | + } |
|
| 27 | 29 | ksort($airport_names); |
| 28 | 30 | foreach($airport_names as $airport_name) |
| 29 | 31 | { |
@@ -3,13 +3,13 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 7 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
| 8 | -$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort); |
|
| 6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 7 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
| 8 | +$spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort); |
|
| 9 | 9 | |
| 10 | 10 | if (!empty($spotter_array)) |
| 11 | 11 | { |
| 12 | - $title = sprintf(_("Most Common Routes on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 12 | + $title = sprintf(_("Most Common Routes on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
| 13 | 13 | |
| 14 | 14 | require_once('header.php'); |
| 15 | 15 | print '<div class="select-item">'; |
@@ -27,13 +27,13 @@ discard block |
||
| 27 | 27 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
| 28 | 28 | print '<br />'; |
| 29 | 29 | print '<div class="info column">'; |
| 30 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 30 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
| 31 | 31 | print '</div>'; |
| 32 | 32 | |
| 33 | 33 | include('date-sub-menu.php'); |
| 34 | 34 | print '<div class="column">'; |
| 35 | 35 | print '<h2>'._("Most Common Routes").'</h2>'; |
| 36 | - print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 36 | + print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
| 37 | 37 | |
| 38 | 38 | $route_array = $Spotter->countAllRoutesByDate($date); |
| 39 | 39 | if (!empty($route_array)) |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | print '</thead>'; |
| 51 | 51 | print '<tbody>'; |
| 52 | 52 | $i = 1; |
| 53 | - foreach($route_array as $route_item) |
|
| 53 | + foreach ($route_array as $route_item) |
|
| 54 | 54 | { |
| 55 | 55 | print '<tr>'; |
| 56 | 56 | print '<td><strong>'.$i.'</strong></td>'; |
