Completed
Push — master ( 561404...142633 )
by Yannick
08:13
created
require/class.Stats.php 1 patch
Spacing   +373 added lines, -373 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 		$this->db = $Connection->db();
19 19
         }
20 20
               
21
-	public function addLastStatsUpdate($type,$stats_date) {
21
+	public function addLastStatsUpdate($type, $stats_date) {
22 22
                 $query = "DELETE FROM config WHERE name = :type;
23 23
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
24
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
24
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
25 25
                  try {
26 26
                         $sth = $this->db->prepare($query);
27 27
                         $sth->execute($query_values);
28
-                } catch(PDOException $e) {
28
+                } catch (PDOException $e) {
29 29
                         return "error : ".$e->getMessage();
30 30
                 }
31 31
         }
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
                  try {
36 36
                         $sth = $this->db->prepare($query);
37 37
                         $sth->execute(array(':type' => $type));
38
-                } catch(PDOException $e) {
38
+                } catch (PDOException $e) {
39 39
                         echo "error : ".$e->getMessage();
40 40
                 }
41 41
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
                  try {
56 56
                         $sth = $this->db->prepare($query);
57 57
                         $sth->execute(array(':filter_name' => $filter_name));
58
-                } catch(PDOException $e) {
58
+                } catch (PDOException $e) {
59 59
                         return "error : ".$e->getMessage();
60 60
                 }
61 61
         }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
                  try {
69 69
                         $sth = $this->db->prepare($query);
70 70
                         $sth->execute();
71
-                } catch(PDOException $e) {
71
+                } catch (PDOException $e) {
72 72
                         return "error : ".$e->getMessage();
73 73
                 }
74 74
                 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                  try {
77 77
                         $sth = $this->db->prepare($query);
78 78
                         $sth->execute(array(':filter_name' => $filter_name));
79
-                } catch(PDOException $e) {
79
+                } catch (PDOException $e) {
80 80
                         return "error : ".$e->getMessage();
81 81
                 }
82 82
         }
@@ -86,69 +86,69 @@  discard block
 block discarded – undo
86 86
                  try {
87 87
                         $sth = $this->db->prepare($query);
88 88
                         $sth->execute(array(':filter_name' => $filter_name));
89
-                } catch(PDOException $e) {
89
+                } catch (PDOException $e) {
90 90
                         echo "error : ".$e->getMessage();
91 91
                 }
92 92
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
93 93
                 return $all;
94 94
         }
95
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
95
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
96 96
 		if ($filter_name == '') $filter_name = $this->filter_name;
97 97
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 98
                  try {
99 99
                         $sth = $this->db->prepare($query);
100
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101
-                } catch(PDOException $e) {
100
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
101
+                } catch (PDOException $e) {
102 102
                         echo "error : ".$e->getMessage();
103 103
                 }
104 104
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
105 105
                 return $all;
106 106
         }
107
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
107
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
108 108
 		if ($filter_name == '') $filter_name = $this->filter_name;
109 109
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110 110
                  try {
111 111
                         $sth = $this->db->prepare($query);
112
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113
-                } catch(PDOException $e) {
112
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
113
+                } catch (PDOException $e) {
114 114
                         echo "error : ".$e->getMessage();
115 115
                 }
116 116
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
117 117
                 return $all;
118 118
         }
119
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
119
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
120 120
 		if ($filter_name == '') $filter_name = $this->filter_name;
121 121
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122 122
                  try {
123 123
                         $sth = $this->db->prepare($query);
124
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125
-                } catch(PDOException $e) {
124
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
125
+                } catch (PDOException $e) {
126 126
                         echo "error : ".$e->getMessage();
127 127
                 }
128 128
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
129 129
                 return $all;
130 130
         }
131 131
 
132
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
132
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
133 133
 		if ($filter_name == '') $filter_name = $this->filter_name;
134 134
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 135
                  try {
136 136
                         $sth = $this->db->prepare($query);
137
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138
-                } catch(PDOException $e) {
137
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
138
+                } catch (PDOException $e) {
139 139
                         echo "error : ".$e->getMessage();
140 140
                 }
141 141
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
142 142
                 return $all;
143 143
         }
144 144
 
145
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
145
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
146 146
 		if ($filter_name == '') $filter_name = $this->filter_name;
147 147
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 148
                  try {
149 149
                         $sth = $this->db->prepare($query);
150
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151
-                } catch(PDOException $e) {
150
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
151
+                } catch (PDOException $e) {
152 152
                         echo "error : ".$e->getMessage();
153 153
                 }
154 154
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         }
157 157
 
158 158
 
159
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
159
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
160 160
 		global $globalStatsFilters;
161 161
 		if ($filter_name == '') $filter_name = $this->filter_name;
162 162
 		if ($year == '' && $month == '') {
@@ -164,24 +164,24 @@  discard block
 block discarded – undo
164 164
 			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
165 165
 			try {
166 166
 				$sth = $this->db->prepare($query);
167
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
168
-			} catch(PDOException $e) {
167
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
168
+			} catch (PDOException $e) {
169 169
 				echo "error : ".$e->getMessage();
170 170
 			}
171 171
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172 172
 		} else $all = array();
173 173
                 if (empty($all)) {
174
-            	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
174
+            	    $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
175 175
             	    if ($filter_name != '') {
176
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
176
+            		    $filters = array_merge($filters, $globalStatsFilters[$filter_name]);
177 177
             	    }
178 178
             	    $Spotter = new Spotter($this->db);
179 179
             	    //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
180
+            	    $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
181 181
                 }
182 182
                 return $all;
183 183
 	}
184
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
184
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
185 185
 		global $globalStatsFilters;
186 186
 		if ($filter_name == '') $filter_name = $this->filter_name;
187 187
 		if ($year == '' && $month == '') {
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 			try {
191 191
 				$sth = $this->db->prepare($query);
192 192
 				$sth->execute(array(':filter_name' => $filter_name));
193
-			} catch(PDOException $e) {
193
+			} catch (PDOException $e) {
194 194
 				echo "error : ".$e->getMessage();
195 195
 			}
196 196
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -198,16 +198,16 @@  discard block
 block discarded – undo
198 198
                 if (empty($all)) {
199 199
             		$Spotter = new Spotter($this->db);
200 200
             		$filters = array();
201
-            		$filters = array('year' => $year,'month' => $month);
201
+            		$filters = array('year' => $year, 'month' => $month);
202 202
             		if ($filter_name != '') {
203
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
203
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
204 204
 			}
205 205
             		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
206
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
207 207
                 }
208 208
                 return $all;
209 209
 	}
210
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
210
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
211 211
 		global $globalStatsFilters;
212 212
 		if ($filter_name == '') $filter_name = $this->filter_name;
213 213
 		if ($year == '' && $month == '') {
@@ -215,16 +215,16 @@  discard block
 block discarded – undo
215 215
 			else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
216 216
 			try {
217 217
 				$sth = $this->db->prepare($query);
218
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
219
-			} catch(PDOException $e) {
218
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
219
+			} catch (PDOException $e) {
220 220
 				echo "error : ".$e->getMessage();
221 221
 			}
222 222
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
223 223
 		} else $all = array();
224 224
 		if (empty($all)) {
225
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
225
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
226 226
 			if ($filter_name != '') {
227
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
227
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
228 228
 			}
229 229
 			$Spotter = new Spotter($this->db);
230 230
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 		return $all;
234 234
 	}
235 235
 
236
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
236
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
237 237
 		global $globalStatsFilters;
238 238
 		if ($filter_name == '') $filter_name = $this->filter_name;
239 239
 		if ($year == '' && $month == '') {
@@ -241,20 +241,20 @@  discard block
 block discarded – undo
241 241
 			else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
242 242
 			try {
243 243
 				$sth = $this->db->prepare($query);
244
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
245
-			} catch(PDOException $e) {
244
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
245
+			} catch (PDOException $e) {
246 246
 				echo "error : ".$e->getMessage();
247 247
 			}
248 248
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249 249
 		} else $all = array();
250 250
                 if (empty($all)) {
251
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
251
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
252 252
 			if ($filter_name != '') {
253
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
253
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
254 254
 			}
255 255
 			$Spotter = new Spotter($this->db);
256 256
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
257
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
257
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
258 258
                 }
259 259
                 return $all;
260 260
 	}
@@ -265,15 +265,15 @@  discard block
 block discarded – undo
265 265
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
266 266
                  try {
267 267
                         $sth = $this->db->prepare($query);
268
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
-                } catch(PDOException $e) {
268
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
269
+                } catch (PDOException $e) {
270 270
                         echo "error : ".$e->getMessage();
271 271
                 }
272 272
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
273 273
                 if (empty($all)) {
274
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
274
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
275 275
 			if ($filter_name != '') {
276
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
276
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
277 277
 			}
278 278
 			$Spotter = new Spotter($this->db);
279 279
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
                 return $all;
283 283
 	}
284 284
 
285
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
285
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
286 286
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
287 287
 		if ($filter_name == '') $filter_name = $this->filter_name;
288 288
 		if ($year == '' && $month == '') {
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 			if (isset($forsource)) {
292 292
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
293 293
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
294
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
294
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
295 295
 			} else {
296 296
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
297 297
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 			try {
301 301
 				$sth = $this->db->prepare($query);
302 302
 				$sth->execute($query_values);
303
-			} catch(PDOException $e) {
303
+			} catch (PDOException $e) {
304 304
 				echo "error : ".$e->getMessage();
305 305
 			}
306 306
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -308,16 +308,16 @@  discard block
 block discarded – undo
308 308
                 if (empty($all)) {
309 309
 	                $Spotter = new Spotter($this->db);
310 310
             		$filters = array();
311
-			$filters = array('year' => $year,'month' => $month);
311
+			$filters = array('year' => $year, 'month' => $month);
312 312
             		if ($filter_name != '') {
313
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
313
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
314 314
 			}
315 315
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
316
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
316
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
317 317
                 }
318 318
                 return $all;
319 319
 	}
320
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
320
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
321 321
 		global $globalStatsFilters;
322 322
 		if ($filter_name == '') $filter_name = $this->filter_name;
323 323
 		if ($year == '' && $month == '') {
@@ -325,24 +325,24 @@  discard block
 block discarded – undo
325 325
 			else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
326 326
 			try {
327 327
 				$sth = $this->db->prepare($query);
328
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
329
-			} catch(PDOException $e) {
328
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
329
+			} catch (PDOException $e) {
330 330
 				echo "error : ".$e->getMessage();
331 331
 			}
332 332
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333 333
 		} else $all = array();
334 334
                 if (empty($all)) {
335
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
335
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
336 336
 			if ($filter_name != '') {
337
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
337
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
338 338
 			}
339 339
 	                $Spotter = new Spotter($this->db);
340 340
     		        //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
341
+    		        $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
342 342
                 }
343 343
                 return $all;
344 344
 	}
345
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
345
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
346 346
 		global $globalStatsFilters;
347 347
 		if ($filter_name == '') $filter_name = $this->filter_name;
348 348
 		if ($year == '' && $month == '') {
@@ -350,24 +350,24 @@  discard block
 block discarded – undo
350 350
 			else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
351 351
 			 try {
352 352
 				$sth = $this->db->prepare($query);
353
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
354
-			} catch(PDOException $e) {
353
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
354
+			} catch (PDOException $e) {
355 355
 				echo "error : ".$e->getMessage();
356 356
 			}
357 357
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
358 358
 		} else $all = array();
359 359
 		if (empty($all)) {
360
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
360
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
361 361
 			if ($filter_name != '') {
362
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
362
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
363 363
 			}
364 364
 			$Spotter = new Spotter($this->db);
365 365
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
366
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
366
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
367 367
 		}
368 368
 		return $all;
369 369
 	}
370
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
370
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
371 371
 		$Connection = new Connection();
372 372
 		if ($filter_name == '') $filter_name = $this->filter_name;
373 373
 		if ($Connection->tableExists('countries')) {
@@ -376,8 +376,8 @@  discard block
 block discarded – undo
376 376
 				else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
377 377
 				 try {
378 378
 					$sth = $this->db->prepare($query);
379
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
380
-				} catch(PDOException $e) {
379
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
380
+				} catch (PDOException $e) {
381 381
 					echo "error : ".$e->getMessage();
382 382
 				}
383 383
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
 			return array();
394 394
 		}
395 395
 	}
396
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
396
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
397 397
 		global $globalStatsFilters;
398 398
 		if ($filter_name == '') $filter_name = $this->filter_name;
399 399
 		if ($year == '' && $month == '') {
@@ -401,25 +401,25 @@  discard block
 block discarded – undo
401 401
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
402 402
 			try {
403 403
 				$sth = $this->db->prepare($query);
404
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
405
-			} catch(PDOException $e) {
404
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
405
+			} catch (PDOException $e) {
406 406
 				echo "error : ".$e->getMessage();
407 407
 			}
408 408
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409 409
 		} else $all = array();
410 410
 		if (empty($all)) {
411
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
411
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
412 412
 			if ($filter_name != '') {
413
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			$Spotter = new Spotter($this->db);
416 416
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
417
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
417
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
418 418
 		}
419 419
 		return $all;
420 420
 	}
421 421
 
422
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
422
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
423 423
 		global $globalStatsFilters;
424 424
 		if ($filter_name == '') $filter_name = $this->filter_name;
425 425
 		if ($year == '' && $month == '') {
@@ -427,24 +427,24 @@  discard block
 block discarded – undo
427 427
 			else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
428 428
 			try {
429 429
 				$sth = $this->db->prepare($query);
430
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
431
-			} catch(PDOException $e) {
430
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
431
+			} catch (PDOException $e) {
432 432
 				echo "error : ".$e->getMessage();
433 433
 			}
434 434
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435 435
 		} else $all = array();
436 436
                 if (empty($all)) {
437
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
437
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
438 438
 			if ($filter_name != '') {
439
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
439
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
440 440
 			}
441 441
             		$Spotter = new Spotter($this->db);
442 442
             		//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
443
+            		$all = $Spotter->countAllOwners($limit, 0, '', $filters);
444 444
                 }
445 445
                 return $all;
446 446
 	}
447
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
447
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
448 448
 		global $globalStatsFilters;
449 449
 		if ($filter_name == '') $filter_name = $this->filter_name;
450 450
 		if ($year == '' && $month == '') {
@@ -452,22 +452,22 @@  discard block
 block discarded – undo
452 452
 			else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
453 453
 			try {
454 454
 				$sth = $this->db->prepare($query);
455
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
456
-			} catch(PDOException $e) {
455
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
456
+			} catch (PDOException $e) {
457 457
 				echo "error : ".$e->getMessage();
458 458
 			}
459 459
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460 460
 		} else $all = array();
461 461
                 if (empty($all)) {
462
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
462
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
463 463
             		if ($filter_name != '') {
464
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
464
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
465 465
 			}
466 466
             		$Spotter = new Spotter($this->db);
467 467
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
468 468
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
469
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
469
+            		$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
470
+        		$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
471 471
         		$all = array();
472 472
         		foreach ($pall as $value) {
473 473
         			$icao = $value['airport_departure_icao'];
@@ -484,11 +484,11 @@  discard block
 block discarded – undo
484 484
         		foreach ($all as $key => $row) {
485 485
         			$count[$key] = $row['airport_departure_icao_count'];
486 486
         		}
487
-        		array_multisort($count,SORT_DESC,$all);
487
+        		array_multisort($count, SORT_DESC, $all);
488 488
                 }
489 489
                 return $all;
490 490
 	}
491
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
491
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
492 492
 		global $globalStatsFilters;
493 493
 		if ($filter_name == '') $filter_name = $this->filter_name;
494 494
 		if ($year == '' && $month == '') {
@@ -496,22 +496,22 @@  discard block
 block discarded – undo
496 496
 			else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
497 497
 			try {
498 498
 				$sth = $this->db->prepare($query);
499
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
500
-			} catch(PDOException $e) {
499
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
500
+			} catch (PDOException $e) {
501 501
 				echo "error : ".$e->getMessage();
502 502
 			}
503 503
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
504 504
 		} else $all = array();
505 505
 		if (empty($all)) {
506
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
506
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
507 507
 			if ($filter_name != '') {
508
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
508
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
509 509
 			}
510 510
 			$Spotter = new Spotter($this->db);
511 511
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
512 512
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
513
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
514
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
513
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
514
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
515 515
         		$all = array();
516 516
         		foreach ($pall as $value) {
517 517
         			$icao = $value['airport_arrival_icao'];
@@ -528,12 +528,12 @@  discard block
 block discarded – undo
528 528
         		foreach ($all as $key => $row) {
529 529
         			$count[$key] = $row['airport_arrival_icao_count'];
530 530
         		}
531
-        		array_multisort($count,SORT_DESC,$all);
531
+        		array_multisort($count, SORT_DESC, $all);
532 532
                 }
533 533
  
534 534
                 return $all;
535 535
 	}
536
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
536
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
537 537
 		global $globalDBdriver, $globalStatsFilters;
538 538
 		if ($filter_name == '') $filter_name = $this->filter_name;
539 539
 		if ($globalDBdriver == 'mysql') {
@@ -543,18 +543,18 @@  discard block
 block discarded – undo
543 543
 			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
544 544
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
545 545
 		}
546
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
546
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
547 547
                  try {
548 548
                         $sth = $this->db->prepare($query);
549 549
                         $sth->execute($query_data);
550
-                } catch(PDOException $e) {
550
+                } catch (PDOException $e) {
551 551
                         echo "error : ".$e->getMessage();
552 552
                 }
553 553
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 554
                 if (empty($all)) {
555 555
 			$filters = array('airlines' => array($stats_airline));
556 556
 			if ($filter_name != '') {
557
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
557
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
558 558
 			}
559 559
             		$Spotter = new Spotter($this->db);
560 560
             		$all = $Spotter->countAllMonthsLastYear($filters);
@@ -563,29 +563,29 @@  discard block
 block discarded – undo
563 563
                 return $all;
564 564
 	}
565 565
 	
566
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
566
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
567 567
 		global $globalStatsFilters;
568 568
 		if ($filter_name == '') $filter_name = $this->filter_name;
569 569
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
570
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
570
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
571 571
                  try {
572 572
                         $sth = $this->db->prepare($query);
573 573
                         $sth->execute($query_data);
574
-                } catch(PDOException $e) {
574
+                } catch (PDOException $e) {
575 575
                         echo "error : ".$e->getMessage();
576 576
                 }
577 577
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578
                 if (empty($all)) {
579 579
 			$filters = array('airlines' => array($stats_airline));
580 580
 			if ($filter_name != '') {
581
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
581
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
582 582
 			}
583 583
             		$Spotter = new Spotter($this->db);
584 584
             		$all = $Spotter->countAllDatesLastMonth($filters);
585 585
                 }
586 586
                 return $all;
587 587
 	}
588
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
588
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
589 589
 		global $globalDBdriver, $globalStatsFilters;
590 590
 		if ($filter_name == '') $filter_name = $this->filter_name;
591 591
 		if ($globalDBdriver == 'mysql') {
@@ -593,40 +593,40 @@  discard block
 block discarded – undo
593 593
 		} else {
594 594
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
595 595
 		}
596
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
596
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
597 597
                  try {
598 598
                         $sth = $this->db->prepare($query);
599 599
                         $sth->execute($query_data);
600
-                } catch(PDOException $e) {
600
+                } catch (PDOException $e) {
601 601
                         echo "error : ".$e->getMessage();
602 602
                 }
603 603
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
604 604
                 if (empty($all)) {
605 605
 			$filters = array('airlines' => array($stats_airline));
606 606
 			if ($filter_name != '') {
607
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
607
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
608 608
 			}
609 609
             		$Spotter = new Spotter($this->db);
610 610
             		$all = $Spotter->countAllDatesLast7Days($filters);
611 611
                 }
612 612
                 return $all;
613 613
 	}
614
-	public function countAllDates($stats_airline = '',$filter_name = '') {
614
+	public function countAllDates($stats_airline = '', $filter_name = '') {
615 615
 		global $globalStatsFilters;
616 616
 		if ($filter_name == '') $filter_name = $this->filter_name;
617 617
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
618
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
618
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
619 619
                  try {
620 620
                         $sth = $this->db->prepare($query);
621 621
                         $sth->execute($query_data);
622
-                } catch(PDOException $e) {
622
+                } catch (PDOException $e) {
623 623
                         echo "error : ".$e->getMessage();
624 624
                 }
625 625
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
626 626
                 if (empty($all)) {
627 627
 			$filters = array('airlines' => array($stats_airline));
628 628
 			if ($filter_name != '') {
629
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
629
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
630 630
 			}
631 631
             		$Spotter = new Spotter($this->db);
632 632
             		$all = $Spotter->countAllDates($filters);
@@ -641,21 +641,21 @@  discard block
 block discarded – undo
641 641
                  try {
642 642
                         $sth = $this->db->prepare($query);
643 643
                         $sth->execute($query_data);
644
-                } catch(PDOException $e) {
644
+                } catch (PDOException $e) {
645 645
                         echo "error : ".$e->getMessage();
646 646
                 }
647 647
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
648 648
                 if (empty($all)) {
649 649
             		$filters = array();
650 650
             		if ($filter_name != '') {
651
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
651
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
652 652
 			}
653 653
             		$Spotter = new Spotter($this->db);
654 654
             		$all = $Spotter->countAllDatesByAirlines($filters);
655 655
                 }
656 656
                 return $all;
657 657
 	}
658
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
658
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
659 659
 		global $globalStatsFilters, $globalDBdriver;
660 660
 		if ($filter_name == '') $filter_name = $this->filter_name;
661 661
 		if ($globalDBdriver == 'mysql') {
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
                  try {
667 667
                         $sth = $this->db->prepare($query);
668 668
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
-                } catch(PDOException $e) {
669
+                } catch (PDOException $e) {
670 670
                         echo "error : ".$e->getMessage();
671 671
                 }
672 672
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
                 if (empty($all)) {
675 675
 			$filters = array('airlines' => array($stats_airline));
676 676
 			if ($filter_name != '') {
677
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
677
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
678 678
 			}
679 679
             		$Spotter = new Spotter($this->db);
680 680
             		$all = $Spotter->countAllMonths($filters);
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
                  try {
693 693
                         $sth = $this->db->prepare($query);
694 694
                         $sth->execute();
695
-                } catch(PDOException $e) {
695
+                } catch (PDOException $e) {
696 696
                         echo "error : ".$e->getMessage();
697 697
                 }
698 698
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
                  try {
714 714
                         $sth = $this->db->prepare($query);
715 715
                         $sth->execute();
716
-                } catch(PDOException $e) {
716
+                } catch (PDOException $e) {
717 717
                         echo "error : ".$e->getMessage();
718 718
                 }
719 719
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,21 +731,21 @@  discard block
 block discarded – undo
731 731
                  try {
732 732
                         $sth = $this->db->prepare($query);
733 733
                         $sth->execute(array(':filter_name' => $filter_name));
734
-                } catch(PDOException $e) {
734
+                } catch (PDOException $e) {
735 735
                         echo "error : ".$e->getMessage();
736 736
                 }
737 737
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
738 738
                 if (empty($all)) {
739 739
             		$filters = array();
740 740
             		if ($filter_name != '') {
741
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
741
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
742 742
 			}
743 743
             		$Spotter = new Spotter($this->db);
744 744
             		$all = $Spotter->countAllMilitaryMonths($filters);
745 745
                 }
746 746
                 return $all;
747 747
 	}
748
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
748
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
749 749
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
750 750
 		if ($filter_name == '') $filter_name = $this->filter_name;
751 751
 		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -762,30 +762,30 @@  discard block
 block discarded – undo
762 762
                  try {
763 763
                         $sth = $this->db->prepare($query);
764 764
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765
-                } catch(PDOException $e) {
765
+                } catch (PDOException $e) {
766 766
                         echo "error : ".$e->getMessage();
767 767
                 }
768 768
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
769 769
                 if (empty($all)) {
770 770
 			$filters = array('airlines' => array($stats_airline));
771 771
 			if ($filter_name != '') {
772
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
772
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
773 773
 			}
774 774
             		$Spotter = new Spotter($this->db);
775
-            		$all = $Spotter->countAllHours($orderby,$filters);
775
+            		$all = $Spotter->countAllHours($orderby, $filters);
776 776
                 }
777 777
                 return $all;
778 778
 	}
779 779
 	
780
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
780
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
781 781
 		global $globalStatsFilters;
782 782
 		if ($filter_name == '') $filter_name = $this->filter_name;
783 783
 		if ($year == '') $year = date('Y');
784
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
784
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
785 785
 		if (empty($all)) {
786
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
786
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
787 787
 			if ($filter_name != '') {
788
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
788
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
789 789
 			}
790 790
 			$Spotter = new Spotter($this->db);
791 791
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -793,16 +793,16 @@  discard block
 block discarded – undo
793 793
 		}
794 794
 		return $all;
795 795
 	}
796
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
796
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
797 797
 		global $globalStatsFilters;
798 798
 		if ($filter_name == '') $filter_name = $this->filter_name;
799 799
 		if ($year == '') $year = date('Y');
800
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
800
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
801 801
 		if (empty($all)) {
802 802
 		        $filters = array();
803
-			$filters = array('year' => $year,'month' => $month);
803
+			$filters = array('year' => $year, 'month' => $month);
804 804
             		if ($filter_name != '') {
805
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
805
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
806 806
 			}
807 807
 			$Spotter = new Spotter($this->db);
808 808
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -810,15 +810,15 @@  discard block
 block discarded – undo
810 810
 		}
811 811
 		return $all;
812 812
 	}
813
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
813
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
814 814
 		global $globalStatsFilters;
815 815
 		if ($filter_name == '') $filter_name = $this->filter_name;
816 816
 		if ($year == '') $year = date('Y');
817
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
817
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
818 818
 		if (empty($all)) {
819
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
819
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
820 820
 			if ($filter_name != '') {
821
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
821
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
822 822
 			}
823 823
 			$Spotter = new Spotter($this->db);
824 824
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -826,24 +826,24 @@  discard block
 block discarded – undo
826 826
 		}
827 827
 		return $all;
828 828
 	}
829
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
829
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
830 830
 		global $globalStatsFilters;
831 831
 		if ($filter_name == '') $filter_name = $this->filter_name;
832 832
 		if ($year == '' && $month == '') {
833 833
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
834 834
 			try {
835 835
 				$sth = $this->db->prepare($query);
836
-				$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
837
-			} catch(PDOException $e) {
836
+				$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
837
+			} catch (PDOException $e) {
838 838
 				echo "error : ".$e->getMessage();
839 839
 			}
840 840
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
841 841
 			$all = $result[0]['nb'];
842
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
842
+		} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
843 843
 		if (empty($all)) {
844
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
844
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
845 845
 			if ($filter_name != '') {
846
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
846
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
847 847
 			}
848 848
 			$Spotter = new Spotter($this->db);
849 849
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 		}
852 852
 		return $all;
853 853
 	}
854
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
854
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
855 855
 		global $globalStatsFilters;
856 856
 		if ($filter_name == '') $filter_name = $this->filter_name;
857 857
 		if ($year == '' && $month == '') {
@@ -859,17 +859,17 @@  discard block
 block discarded – undo
859 859
 			try {
860 860
 				$sth = $this->db->prepare($query);
861 861
 				$sth->execute(array(':filter_name' => $filter_name));
862
-			} catch(PDOException $e) {
862
+			} catch (PDOException $e) {
863 863
 				echo "error : ".$e->getMessage();
864 864
 			}
865 865
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
866 866
 			$all = $result[0]['nb_airline'];
867
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
867
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
868 868
 		if (empty($all)) {
869 869
             		$filters = array();
870
-			$filters = array('year' => $year,'month' => $month);
870
+			$filters = array('year' => $year, 'month' => $month);
871 871
             		if ($filter_name != '') {
872
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
872
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
873 873
 			}
874 874
 			$Spotter = new Spotter($this->db);
875 875
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -877,7 +877,7 @@  discard block
 block discarded – undo
877 877
 		}
878 878
 		return $all;
879 879
 	}
880
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
880
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
881 881
 		global $globalStatsFilters;
882 882
 		if ($filter_name == '') $filter_name = $this->filter_name;
883 883
 		if ($year == '' && $month == '') {
@@ -886,18 +886,18 @@  discard block
 block discarded – undo
886 886
 			try {
887 887
 				$sth = $this->db->prepare($query);
888 888
 				$sth->execute($query_values);
889
-			} catch(PDOException $e) {
889
+			} catch (PDOException $e) {
890 890
 				echo "error : ".$e->getMessage();
891 891
 			}
892 892
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
893 893
 			$all = $result[0]['nb'];
894 894
 		} else {
895
-			$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
895
+			$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
896 896
 		}
897 897
 		if (empty($all)) {
898
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
898
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
899 899
 			if ($filter_name != '') {
900
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
900
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
901 901
 			}
902 902
 			$Spotter = new Spotter($this->db);
903 903
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -905,7 +905,7 @@  discard block
 block discarded – undo
905 905
 		}
906 906
 		return $all;
907 907
 	}
908
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
908
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
909 909
 		global $globalStatsFilters;
910 910
 		if ($filter_name == '') $filter_name = $this->filter_name;
911 911
 		//if ($year == '') $year = date('Y');
@@ -915,18 +915,18 @@  discard block
 block discarded – undo
915 915
 			try {
916 916
 				$sth = $this->db->prepare($query);
917 917
 				$sth->execute($query_values);
918
-			} catch(PDOException $e) {
918
+			} catch (PDOException $e) {
919 919
 				echo "error : ".$e->getMessage();
920 920
 			}
921 921
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
922 922
 			$all = $result[0]['nb'];
923 923
 		} else {
924
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
924
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
925 925
 		}
926 926
 		if (empty($all)) {
927
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
927
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
928 928
 			if ($filter_name != '') {
929
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
929
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
930 930
 			}
931 931
 			$Spotter = new Spotter($this->db);
932 932
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -935,67 +935,67 @@  discard block
 block discarded – undo
935 935
 		return $all;
936 936
 	}
937 937
 
938
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
938
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
939 939
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
941
-		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
941
+		$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942 942
                  try {
943 943
                         $sth = $this->db->prepare($query);
944 944
                         $sth->execute($query_values);
945
-                } catch(PDOException $e) {
945
+                } catch (PDOException $e) {
946 946
                         echo "error : ".$e->getMessage();
947 947
                 }
948 948
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
949 949
                 return $all;
950 950
 	}
951
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
951
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
952 952
 		if ($filter_name == '') $filter_name = $this->filter_name;
953 953
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
954
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
955 955
                  try {
956 956
                         $sth = $this->db->prepare($query);
957 957
                         $sth->execute($query_values);
958
-                } catch(PDOException $e) {
958
+                } catch (PDOException $e) {
959 959
                         echo "error : ".$e->getMessage();
960 960
                 }
961 961
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
962 962
                 return $all;
963 963
         }
964
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
964
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
965 965
 		if ($filter_name == '') $filter_name = $this->filter_name;
966 966
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
967
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
968 968
                  try {
969 969
                         $sth = $this->db->prepare($query);
970 970
                         $sth->execute($query_values);
971
-                } catch(PDOException $e) {
971
+                } catch (PDOException $e) {
972 972
                         echo "error : ".$e->getMessage();
973 973
                 }
974 974
         }
975
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
975
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
976 976
 		if ($filter_name == '') $filter_name = $this->filter_name;
977 977
     		global $globalArchiveMonths, $globalDBdriver;
978 978
     		if ($globalDBdriver == 'mysql') {
979 979
     			if ($month == '') {
980 980
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
981
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
981
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
982 982
 			} else {
983 983
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
984
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
984
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
985 985
 			}
986 986
 		} else {
987 987
 			if ($month == '') {
988 988
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
989
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
989
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
990 990
 			} else {
991 991
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
992
-				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
992
+				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
993 993
 			}
994 994
                 }
995 995
                  try {
996 996
                         $sth = $this->db->prepare($query);
997 997
                         $sth->execute($query_values);
998
-                } catch(PDOException $e) {
998
+                } catch (PDOException $e) {
999 999
                         echo "error : ".$e->getMessage();
1000 1000
                 }
1001 1001
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
                  try {
1014 1014
                         $sth = $this->db->prepare($query);
1015 1015
                         $sth->execute($query_values);
1016
-                } catch(PDOException $e) {
1016
+                } catch (PDOException $e) {
1017 1017
                         echo "error : ".$e->getMessage();
1018 1018
                 }
1019 1019
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
                  try {
1031 1031
                         $sth = $this->db->prepare($query);
1032 1032
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033
-                } catch(PDOException $e) {
1033
+                } catch (PDOException $e) {
1034 1034
                         echo "error : ".$e->getMessage();
1035 1035
                 }
1036 1036
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
                  try {
1048 1048
                         $sth = $this->db->prepare($query);
1049 1049
                         $sth->execute(array(':filter_name' => $filter_name));
1050
-                } catch(PDOException $e) {
1050
+                } catch (PDOException $e) {
1051 1051
                         echo "error : ".$e->getMessage();
1052 1052
                 }
1053 1053
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1064,20 +1064,20 @@  discard block
 block discarded – undo
1064 1064
                  try {
1065 1065
                         $sth = $this->db->prepare($query);
1066 1066
                         $sth->execute(array(':filter_name' => $filter_name));
1067
-                } catch(PDOException $e) {
1067
+                } catch (PDOException $e) {
1068 1068
                         echo "error : ".$e->getMessage();
1069 1069
                 }
1070 1070
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071 1071
                 return $all[0]['total'];
1072 1072
         }
1073
-	public function getStatsOwner($owner_name,$filter_name = '') {
1073
+	public function getStatsOwner($owner_name, $filter_name = '') {
1074 1074
     		global $globalArchiveMonths, $globalDBdriver;
1075 1075
 		if ($filter_name == '') $filter_name = $this->filter_name;
1076 1076
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077 1077
                  try {
1078 1078
                         $sth = $this->db->prepare($query);
1079
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080
-                } catch(PDOException $e) {
1079
+                        $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1080
+                } catch (PDOException $e) {
1081 1081
                         echo "error : ".$e->getMessage();
1082 1082
                 }
1083 1083
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1095,20 +1095,20 @@  discard block
 block discarded – undo
1095 1095
                  try {
1096 1096
                         $sth = $this->db->prepare($query);
1097 1097
                         $sth->execute(array(':filter_name' => $filter_name));
1098
-                } catch(PDOException $e) {
1098
+                } catch (PDOException $e) {
1099 1099
                         echo "error : ".$e->getMessage();
1100 1100
                 }
1101 1101
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102 1102
                 return $all[0]['total'];
1103 1103
         }
1104
-	public function getStatsPilot($pilot,$filter_name = '') {
1104
+	public function getStatsPilot($pilot, $filter_name = '') {
1105 1105
     		global $globalArchiveMonths, $globalDBdriver;
1106 1106
 		if ($filter_name == '') $filter_name = $this->filter_name;
1107 1107
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108 1108
                  try {
1109 1109
                         $sth = $this->db->prepare($query);
1110
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111
-                } catch(PDOException $e) {
1110
+                        $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1111
+                } catch (PDOException $e) {
1112 1112
                         echo "error : ".$e->getMessage();
1113 1113
                 }
1114 1114
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
                 else return 0;
1117 1117
         }
1118 1118
 
1119
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1119
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1120 1120
 		global $globalDBdriver;
1121 1121
 		if ($filter_name == '') $filter_name = $this->filter_name;
1122 1122
 		if ($globalDBdriver == 'mysql') {
@@ -1124,15 +1124,15 @@  discard block
 block discarded – undo
1124 1124
                 } else {
1125 1125
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1126 1126
 		}
1127
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1127
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1128 1128
                  try {
1129 1129
                         $sth = $this->db->prepare($query);
1130 1130
                         $sth->execute($query_values);
1131
-                } catch(PDOException $e) {
1131
+                } catch (PDOException $e) {
1132 1132
                         return "error : ".$e->getMessage();
1133 1133
                 }
1134 1134
         }
1135
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1135
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1136 1136
 		global $globalDBdriver;
1137 1137
 		if ($filter_name == '') $filter_name = $this->filter_name;
1138 1138
 		if ($globalDBdriver == 'mysql') {
@@ -1141,11 +1141,11 @@  discard block
 block discarded – undo
1141 1141
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1142
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1143 1143
                 }
1144
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1144
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1145 1145
                  try {
1146 1146
                         $sth = $this->db->prepare($query);
1147 1147
                         $sth->execute($query_values);
1148
-                } catch(PDOException $e) {
1148
+                } catch (PDOException $e) {
1149 1149
                         return "error : ".$e->getMessage();
1150 1150
                 }
1151 1151
         }
@@ -1169,75 +1169,75 @@  discard block
 block discarded – undo
1169 1169
         }
1170 1170
         */
1171 1171
 
1172
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1172
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1173 1173
 		global $globalDBdriver;
1174 1174
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1175 1175
 		$query_values = array();
1176 1176
 		if ($globalDBdriver == 'mysql') {
1177 1177
 			if ($year != '') {
1178 1178
 				$query .= ' AND YEAR(stats_date) = :year';
1179
-				$query_values = array_merge($query_values,array(':year' => $year));
1179
+				$query_values = array_merge($query_values, array(':year' => $year));
1180 1180
 			}
1181 1181
 			if ($month != '') {
1182 1182
 				$query .= ' AND MONTH(stats_date) = :month';
1183
-				$query_values = array_merge($query_values,array(':month' => $month));
1183
+				$query_values = array_merge($query_values, array(':month' => $month));
1184 1184
 			}
1185 1185
 			if ($day != '') {
1186 1186
 				$query .= ' AND DAY(stats_date) = :day';
1187
-				$query_values = array_merge($query_values,array(':day' => $day));
1187
+				$query_values = array_merge($query_values, array(':day' => $day));
1188 1188
 			}
1189 1189
 		} else {
1190 1190
 			if ($year != '') {
1191 1191
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1192
-				$query_values = array_merge($query_values,array(':year' => $year));
1192
+				$query_values = array_merge($query_values, array(':year' => $year));
1193 1193
 			}
1194 1194
 			if ($month != '') {
1195 1195
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1196
-				$query_values = array_merge($query_values,array(':month' => $month));
1196
+				$query_values = array_merge($query_values, array(':month' => $month));
1197 1197
 			}
1198 1198
 			if ($day != '') {
1199 1199
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1200
-				$query_values = array_merge($query_values,array(':day' => $day));
1200
+				$query_values = array_merge($query_values, array(':day' => $day));
1201 1201
 			}
1202 1202
 		}
1203 1203
 		$query .= " ORDER BY source_name";
1204
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1204
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1205 1205
 		try {
1206 1206
 			$sth = $this->db->prepare($query);
1207 1207
 			$sth->execute($query_values);
1208
-		} catch(PDOException $e) {
1208
+		} catch (PDOException $e) {
1209 1209
 			echo "error : ".$e->getMessage();
1210 1210
 		}
1211 1211
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1212 1212
 		return $all;
1213 1213
 	}
1214 1214
 
1215
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1215
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1216 1216
 		global $globalDBdriver;
1217 1217
 		if ($globalDBdriver == 'mysql') {
1218 1218
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1219 1219
 		} else {
1220 1220
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1221 1221
                 }
1222
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1222
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1223 1223
                  try {
1224 1224
                         $sth = $this->db->prepare($query);
1225 1225
                         $sth->execute($query_values);
1226
-                } catch(PDOException $e) {
1226
+                } catch (PDOException $e) {
1227 1227
                         return "error : ".$e->getMessage();
1228 1228
                 }
1229 1229
         }
1230
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1230
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1231 1231
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1232
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1233 1233
                  try {
1234 1234
                         $sth = $this->db->prepare($query);
1235 1235
                         $sth->execute($query_values);
1236
-                } catch(PDOException $e) {
1236
+                } catch (PDOException $e) {
1237 1237
                         return "error : ".$e->getMessage();
1238 1238
                 }
1239 1239
         }
1240
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1240
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1241 1241
 		global $globalDBdriver;
1242 1242
 		if ($globalDBdriver == 'mysql') {
1243 1243
 			if ($reset) {
@@ -1252,15 +1252,15 @@  discard block
 block discarded – undo
1252 1252
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1253 1253
 			}
1254 1254
 		}
1255
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1255
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256 1256
                  try {
1257 1257
                         $sth = $this->db->prepare($query);
1258 1258
                         $sth->execute($query_values);
1259
-                } catch(PDOException $e) {
1259
+                } catch (PDOException $e) {
1260 1260
                         return "error : ".$e->getMessage();
1261 1261
                 }
1262 1262
         }
1263
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1263
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1264 1264
 		global $globalDBdriver;
1265 1265
 		if ($globalDBdriver == 'mysql') {
1266 1266
 			if ($reset) {
@@ -1275,15 +1275,15 @@  discard block
 block discarded – undo
1275 1275
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1276 1276
 			}
1277 1277
 		}
1278
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1278
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1279 1279
                  try {
1280 1280
                         $sth = $this->db->prepare($query);
1281 1281
                         $sth->execute($query_values);
1282
-                } catch(PDOException $e) {
1282
+                } catch (PDOException $e) {
1283 1283
                         return "error : ".$e->getMessage();
1284 1284
                 }
1285 1285
         }
1286
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1286
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1287 1287
 		global $globalDBdriver;
1288 1288
 		if ($globalDBdriver == 'mysql') {
1289 1289
 			if ($reset) {
@@ -1298,15 +1298,15 @@  discard block
 block discarded – undo
1298 1298
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1299 1299
 			}
1300 1300
 		}
1301
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1301
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1302 1302
                  try {
1303 1303
                         $sth = $this->db->prepare($query);
1304 1304
                         $sth->execute($query_values);
1305
-                } catch(PDOException $e) {
1305
+                } catch (PDOException $e) {
1306 1306
                         return "error : ".$e->getMessage();
1307 1307
                 }
1308 1308
         }
1309
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1309
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1310 1310
 		global $globalDBdriver;
1311 1311
 		if ($globalDBdriver == 'mysql') {
1312 1312
 			if ($reset) {
@@ -1321,15 +1321,15 @@  discard block
 block discarded – undo
1321 1321
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1322 1322
 			}
1323 1323
 		}
1324
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1324
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1325 1325
                  try {
1326 1326
                         $sth = $this->db->prepare($query);
1327 1327
                         $sth->execute($query_values);
1328
-                } catch(PDOException $e) {
1328
+                } catch (PDOException $e) {
1329 1329
                         return "error : ".$e->getMessage();
1330 1330
                 }
1331 1331
         }
1332
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1332
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1333 1333
 		global $globalDBdriver;
1334 1334
 		if ($globalDBdriver == 'mysql') {
1335 1335
 			if ($reset) {
@@ -1344,15 +1344,15 @@  discard block
 block discarded – undo
1344 1344
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1345 1345
 			}
1346 1346
 		}
1347
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1347
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1348 1348
                  try {
1349 1349
                         $sth = $this->db->prepare($query);
1350 1350
                         $sth->execute($query_values);
1351
-                } catch(PDOException $e) {
1351
+                } catch (PDOException $e) {
1352 1352
                         return "error : ".$e->getMessage();
1353 1353
                 }
1354 1354
         }
1355
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1355
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1356 1356
 		global $globalDBdriver;
1357 1357
 		if ($globalDBdriver == 'mysql') {
1358 1358
 			if ($reset) {
@@ -1367,15 +1367,15 @@  discard block
 block discarded – undo
1367 1367
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1368 1368
 			}
1369 1369
 		}
1370
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1370
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1371 1371
                  try {
1372 1372
                         $sth = $this->db->prepare($query);
1373 1373
                         $sth->execute($query_values);
1374
-                } catch(PDOException $e) {
1374
+                } catch (PDOException $e) {
1375 1375
                         return "error : ".$e->getMessage();
1376 1376
                 }
1377 1377
         }
1378
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1378
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1379 1379
 		global $globalDBdriver;
1380 1380
 		if ($globalDBdriver == 'mysql') {
1381 1381
 			if ($reset) {
@@ -1390,15 +1390,15 @@  discard block
 block discarded – undo
1390 1390
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1391 1391
 			}
1392 1392
 		}
1393
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1393
+                $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
1394 1394
                  try {
1395 1395
                         $sth = $this->db->prepare($query);
1396 1396
                         $sth->execute($query_values);
1397
-                } catch(PDOException $e) {
1397
+                } catch (PDOException $e) {
1398 1398
                         return "error : ".$e->getMessage();
1399 1399
                 }
1400 1400
         }
1401
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1401
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1402 1402
 		global $globalDBdriver;
1403 1403
 		if ($airport_icao != '') {
1404 1404
 			if ($globalDBdriver == 'mysql') {
@@ -1414,16 +1414,16 @@  discard block
 block discarded – undo
1414 1414
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1415 1415
 				}
1416 1416
 			}
1417
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1417
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1418 1418
 			try {
1419 1419
 				$sth = $this->db->prepare($query);
1420 1420
 				$sth->execute($query_values);
1421
-			} catch(PDOException $e) {
1421
+			} catch (PDOException $e) {
1422 1422
 				return "error : ".$e->getMessage();
1423 1423
 			}
1424 1424
                 }
1425 1425
         }
1426
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1426
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1427 1427
 		global $globalDBdriver;
1428 1428
 		if ($airport_icao != '') {
1429 1429
 			if ($globalDBdriver == 'mysql') {
@@ -1431,16 +1431,16 @@  discard block
 block discarded – undo
1431 1431
 			} else {
1432 1432
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1433 1433
 			}
1434
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1434
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1435 1435
 			 try {
1436 1436
 				$sth = $this->db->prepare($query);
1437 1437
 				$sth->execute($query_values);
1438
-			} catch(PDOException $e) {
1438
+			} catch (PDOException $e) {
1439 1439
 				return "error : ".$e->getMessage();
1440 1440
 			}
1441 1441
                 }
1442 1442
         }
1443
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1443
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1444 1444
 		global $globalDBdriver;
1445 1445
 		if ($airport_icao != '') {
1446 1446
 			if ($globalDBdriver == 'mysql') {
@@ -1456,16 +1456,16 @@  discard block
 block discarded – undo
1456 1456
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1457 1457
 				}
1458 1458
 			}
1459
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1459
+	                $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1460 1460
 			 try {
1461 1461
                     		$sth = $this->db->prepare($query);
1462 1462
 	                        $sth->execute($query_values);
1463
-    		        } catch(PDOException $e) {
1463
+    		        } catch (PDOException $e) {
1464 1464
             		        return "error : ".$e->getMessage();
1465 1465
 	                }
1466 1466
 	        }
1467 1467
         }
1468
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1468
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1469 1469
 		global $globalDBdriver;
1470 1470
 		if ($airport_icao != '') {
1471 1471
 			if ($globalDBdriver == 'mysql') {
@@ -1473,11 +1473,11 @@  discard block
 block discarded – undo
1473 1473
 			} else {
1474 1474
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1475 1475
 			}
1476
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1476
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1477 1477
 			try {
1478 1478
 				$sth = $this->db->prepare($query);
1479 1479
 				$sth->execute($query_values);
1480
-			} catch(PDOException $e) {
1480
+			} catch (PDOException $e) {
1481 1481
 				return "error : ".$e->getMessage();
1482 1482
 			}
1483 1483
                 }
@@ -1489,7 +1489,7 @@  discard block
 block discarded – undo
1489 1489
                  try {
1490 1490
                         $sth = $this->db->prepare($query);
1491 1491
                         $sth->execute($query_values);
1492
-                } catch(PDOException $e) {
1492
+                } catch (PDOException $e) {
1493 1493
                         return "error : ".$e->getMessage();
1494 1494
                 }
1495 1495
         }
@@ -1499,7 +1499,7 @@  discard block
 block discarded – undo
1499 1499
                  try {
1500 1500
                         $sth = $this->db->prepare($query);
1501 1501
                         $sth->execute($query_values);
1502
-                } catch(PDOException $e) {
1502
+                } catch (PDOException $e) {
1503 1503
                         return "error : ".$e->getMessage();
1504 1504
                 }
1505 1505
         }
@@ -1509,13 +1509,13 @@  discard block
 block discarded – undo
1509 1509
                  try {
1510 1510
                         $sth = $this->db->prepare($query);
1511 1511
                         $sth->execute($query_values);
1512
-                } catch(PDOException $e) {
1512
+                } catch (PDOException $e) {
1513 1513
                         return "error : ".$e->getMessage();
1514 1514
                 }
1515 1515
         }
1516 1516
         
1517 1517
         public function addOldStats() {
1518
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1518
+    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1519 1519
     		$Common = new Common();
1520 1520
     		$Connection = new Connection();
1521 1521
     		date_default_timezone_set('UTC');
@@ -1533,41 +1533,41 @@  discard block
 block discarded – undo
1533 1533
 			$Spotter = new Spotter($this->db);
1534 1534
 
1535 1535
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1536
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1536
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
1537 1537
 			foreach ($alldata as $number) {
1538
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
1538
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
1539 1539
 			}
1540 1540
 			if ($globalDebug) echo 'Count all airlines...'."\n";
1541
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1541
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
1542 1542
 			foreach ($alldata as $number) {
1543
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
1543
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
1544 1544
 			}
1545 1545
 			if ($globalDebug) echo 'Count all registrations...'."\n";
1546
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1546
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
1547 1547
 			foreach ($alldata as $number) {
1548
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
1548
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
1549 1549
 			}
1550 1550
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
1551
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1551
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
1552 1552
 			foreach ($alldata as $number) {
1553
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1553
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
1554 1554
 			}
1555 1555
 			if ($globalDebug) echo 'Count all owners...'."\n";
1556
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1556
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
1557 1557
 			foreach ($alldata as $number) {
1558
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
1558
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
1559 1559
 			}
1560 1560
 			if ($globalDebug) echo 'Count all pilots...'."\n";
1561
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1561
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
1562 1562
 			foreach ($alldata as $number) {
1563 1563
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
1564
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
1564
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
1565 1565
 			}
1566 1566
 			
1567 1567
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1568
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1568
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
1569 1569
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1570
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
1571 1571
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1572 1572
 	        	$alldata = array();
1573 1573
 	        	
@@ -1585,14 +1585,14 @@  discard block
 block discarded – undo
1585 1585
     			foreach ($alldata as $key => $row) {
1586 1586
     				$count[$key] = $row['airport_departure_icao_count'];
1587 1587
         		}
1588
-			array_multisort($count,SORT_DESC,$alldata);
1588
+			array_multisort($count, SORT_DESC, $alldata);
1589 1589
 			foreach ($alldata as $number) {
1590
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
1590
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
1591 1591
 			}
1592 1592
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1593
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1593
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
1594 1594
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1595
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
1596 1596
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1597 1597
 	        	$alldata = array();
1598 1598
     			foreach ($pall as $value) {
@@ -1609,18 +1609,18 @@  discard block
 block discarded – undo
1609 1609
         		foreach ($alldata as $key => $row) {
1610 1610
         			$count[$key] = $row['airport_arrival_icao_count'];
1611 1611
 	        	}
1612
-    			array_multisort($count,SORT_DESC,$alldata);
1612
+    			array_multisort($count, SORT_DESC, $alldata);
1613 1613
                         foreach ($alldata as $number) {
1614
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1614
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
1615 1615
 			}
1616 1616
 			if ($Connection->tableExists('countries')) {
1617 1617
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1618 1618
 				//$SpotterArchive = new SpotterArchive();
1619 1619
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1620 1620
 				$Spotter = new Spotter($this->db);
1621
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
1621
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
1622 1622
 				foreach ($alldata as $number) {
1623
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
1623
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
1624 1624
 				}
1625 1625
 			}
1626 1626
 			
@@ -1630,12 +1630,12 @@  discard block
 block discarded – undo
1630 1630
 				$this->deleteStatsByType('fatalities_byyear');
1631 1631
 				$alldata = $Accident->countFatalitiesByYear();
1632 1632
 				foreach ($alldata as $number) {
1633
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
1633
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
1634 1634
 				}
1635 1635
 				$this->deleteStatsByType('fatalities_bymonth');
1636 1636
 				$alldata = $Accident->countFatalitiesLast12Months();
1637 1637
 				foreach ($alldata as $number) {
1638
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
1638
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
1639 1639
 				}
1640 1640
 			}
1641 1641
 
@@ -1649,37 +1649,37 @@  discard block
 block discarded – undo
1649 1649
 			$lastyear = false;
1650 1650
 			foreach ($alldata as $number) {
1651 1651
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1652
-				$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'])));
1652
+				$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'])));
1653 1653
 			}
1654 1654
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1655 1655
 			$alldata = $Spotter->countAllMilitaryMonths();
1656 1656
 			foreach ($alldata as $number) {
1657
-				$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'])));
1657
+				$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'])));
1658 1658
 			}
1659 1659
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
1660 1660
 			$alldata = $Spotter->countAllMonthsOwners();
1661 1661
 			foreach ($alldata as $number) {
1662
-				$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'])));
1662
+				$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'])));
1663 1663
 			}
1664 1664
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1665 1665
 			$alldata = $Spotter->countAllMonthsPilots();
1666 1666
 			foreach ($alldata as $number) {
1667
-				$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'])));
1667
+				$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'])));
1668 1668
 			}
1669 1669
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1670 1670
 			$alldata = $Spotter->countAllMonthsAirlines();
1671 1671
 			foreach ($alldata as $number) {
1672
-				$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'])));
1672
+				$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'])));
1673 1673
 			}
1674 1674
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1675 1675
 			$alldata = $Spotter->countAllMonthsAircrafts();
1676 1676
 			foreach ($alldata as $number) {
1677
-				$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'])));
1677
+				$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'])));
1678 1678
 			}
1679 1679
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1680 1680
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1681 1681
 			foreach ($alldata as $number) {
1682
-				$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'])));
1682
+				$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'])));
1683 1683
 			}
1684 1684
 			if ($globalDebug) echo 'Airports data...'."\n";
1685 1685
 			if ($globalDebug) echo '...Departure'."\n";
@@ -1724,7 +1724,7 @@  discard block
 block discarded – undo
1724 1724
     			}
1725 1725
     			$alldata = $pall;
1726 1726
 			foreach ($alldata as $number) {
1727
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1727
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
1728 1728
 			}
1729 1729
 			echo '...Arrival'."\n";
1730 1730
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -1766,7 +1766,7 @@  discard block
 block discarded – undo
1766 1766
     			}
1767 1767
     			$alldata = $pall;
1768 1768
 			foreach ($alldata as $number) {
1769
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1769
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
1770 1770
 			}
1771 1771
 
1772 1772
 			echo 'Flights data...'."\n";
@@ -1774,28 +1774,28 @@  discard block
 block discarded – undo
1774 1774
 			echo '-> countAllDatesLastMonth...'."\n";
1775 1775
 			$alldata = $Spotter->countAllDatesLastMonth();
1776 1776
 			foreach ($alldata as $number) {
1777
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
1777
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
1778 1778
 			}
1779 1779
 			echo '-> countAllDates...'."\n";
1780 1780
 			$previousdata = $this->countAllDates();
1781 1781
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
1782 1782
 			$this->deleteStatFlight('date');
1783
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates());
1783
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates());
1784 1784
 			$values = array();
1785 1785
 			foreach ($alldata as $cnt) {
1786 1786
 				$values[] = $cnt['date_count'];
1787 1787
 			}
1788
-			array_multisort($values,SORT_DESC,$alldata);
1789
-			array_splice($alldata,11);
1788
+			array_multisort($values, SORT_DESC, $alldata);
1789
+			array_splice($alldata, 11);
1790 1790
 			foreach ($alldata as $number) {
1791
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
1791
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
1792 1792
 			}
1793 1793
 			
1794 1794
 			$this->deleteStatFlight('hour');
1795 1795
 			echo '-> countAllHours...'."\n";
1796 1796
 			$alldata = $Spotter->countAllHours('hour');
1797 1797
 			foreach ($alldata as $number) {
1798
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
1798
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
1799 1799
 			}
1800 1800
 
1801 1801
 
@@ -1806,42 +1806,42 @@  discard block
 block discarded – undo
1806 1806
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
1807 1807
 				$SpotterArchive = new SpotterArchive();
1808 1808
 				//$Spotter = new Spotter($this->db);
1809
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
1809
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
1810 1810
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
1811 1811
 				foreach ($alldata as $number) {
1812
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
1812
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
1813 1813
 				}
1814 1814
 			}
1815 1815
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
1816 1816
 			$Spotter = new Spotter($this->db);
1817
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1817
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
1818 1818
 			foreach ($alldata as $number) {
1819
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
1819
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
1820 1820
 			}
1821 1821
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
1822
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1822
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
1823 1823
 			foreach ($alldata as $number) {
1824
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
1824
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
1825 1825
 			}
1826 1826
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
1827
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1827
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
1828 1828
 			foreach ($alldata as $number) {
1829
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1829
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
1830 1830
 			}
1831 1831
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
1832
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1832
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
1833 1833
 			foreach ($alldata as $number) {
1834
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
1834
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
1835 1835
 			}
1836 1836
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
1837
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1837
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
1838 1838
 			foreach ($alldata as $number) {
1839
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
1839
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
1840 1840
 			}
1841 1841
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1842
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1842
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
1843 1843
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1844
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1844
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
1845 1845
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1846 1846
 	        	//$alldata = array();
1847 1847
     			foreach ($dall as $value) {
@@ -1861,12 +1861,12 @@  discard block
 block discarded – undo
1861 1861
     			}
1862 1862
     			$alldata = $pall;
1863 1863
 			foreach ($alldata as $number) {
1864
-				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);
1864
+				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);
1865 1865
 			}
1866 1866
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1867
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1867
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
1868 1868
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1869
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1869
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
1870 1870
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1871 1871
 	        	//$alldata = array();
1872 1872
     			foreach ($dall as $value) {
@@ -1886,7 +1886,7 @@  discard block
 block discarded – undo
1886 1886
     			}
1887 1887
     			$alldata = $pall;
1888 1888
                         foreach ($alldata as $number) {
1889
-				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);
1889
+				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);
1890 1890
 			}
1891 1891
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1892 1892
 			$Spotter = new Spotter($this->db);
@@ -1894,27 +1894,27 @@  discard block
 block discarded – undo
1894 1894
 			$lastyear = false;
1895 1895
 			foreach ($alldata as $number) {
1896 1896
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1897
-				$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']);
1897
+				$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']);
1898 1898
 			}
1899 1899
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
1900 1900
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1901 1901
 			foreach ($alldata as $number) {
1902
-				$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']);
1902
+				$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']);
1903 1903
 			}
1904 1904
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
1905 1905
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1906 1906
 			foreach ($alldata as $number) {
1907
-				$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']);
1907
+				$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']);
1908 1908
 			}
1909 1909
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
1910 1910
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1911 1911
 			foreach ($alldata as $number) {
1912
-				$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']);
1912
+				$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']);
1913 1913
 			}
1914 1914
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
1915 1915
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1916 1916
 			foreach ($alldata as $number) {
1917
-				$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']);
1917
+				$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']);
1918 1918
 			}
1919 1919
 			if ($globalDebug) echo '...Departure'."\n";
1920 1920
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -1937,7 +1937,7 @@  discard block
 block discarded – undo
1937 1937
     			}
1938 1938
     			$alldata = $pall;
1939 1939
 			foreach ($alldata as $number) {
1940
-				$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']);
1940
+				$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']);
1941 1941
 			}
1942 1942
 			if ($globalDebug) echo '...Arrival'."\n";
1943 1943
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -1960,32 +1960,32 @@  discard block
 block discarded – undo
1960 1960
     			}
1961 1961
     			$alldata = $pall;
1962 1962
 			foreach ($alldata as $number) {
1963
-				$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']);
1963
+				$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']);
1964 1964
 			}
1965 1965
 
1966 1966
 			if ($globalDebug) echo 'Flights data...'."\n";
1967 1967
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
1968 1968
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1969 1969
 			foreach ($alldata as $number) {
1970
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1970
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
1971 1971
 			}
1972 1972
 			if ($globalDebug) echo '-> countAllDates...'."\n";
1973 1973
 			//$previousdata = $this->countAllDatesByAirlines();
1974
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1974
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines());
1975 1975
 			$values = array();
1976 1976
 			foreach ($alldata as $cnt) {
1977 1977
 				$values[] = $cnt['date_count'];
1978 1978
 			}
1979
-			array_multisort($values,SORT_DESC,$alldata);
1980
-			array_splice($alldata,11);
1979
+			array_multisort($values, SORT_DESC, $alldata);
1980
+			array_splice($alldata, 11);
1981 1981
 			foreach ($alldata as $number) {
1982
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1982
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
1983 1983
 			}
1984 1984
 			
1985 1985
 			if ($globalDebug) echo '-> countAllHours...'."\n";
1986 1986
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1987 1987
 			foreach ($alldata as $number) {
1988
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
1988
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
1989 1989
 			}
1990 1990
 			
1991 1991
 
@@ -2009,7 +2009,7 @@  discard block
 block discarded – undo
2009 2009
 						$last_update_day = date('Y').'-01-01 00:00:00';
2010 2010
 					}
2011 2011
 				}
2012
-				if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2012
+				if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2013 2013
 					$last_update_day = date('Y').'-01-01 00:00:00';
2014 2014
 					$reset = true;
2015 2015
 				}
@@ -2018,32 +2018,32 @@  discard block
 block discarded – undo
2018 2018
 				// Count by filter
2019 2019
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2020 2020
 				$Spotter = new Spotter($this->db);
2021
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2021
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2022 2022
 				foreach ($alldata as $number) {
2023
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2023
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2024 2024
 				}
2025
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2025
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2026 2026
 				foreach ($alldata as $number) {
2027
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2027
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2028 2028
 				}
2029
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2029
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2030 2030
 				foreach ($alldata as $number) {
2031
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2031
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2032 2032
 				}
2033
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2033
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2034 2034
 				foreach ($alldata as $number) {
2035
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2035
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2036 2036
 				}
2037
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2037
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2038 2038
 				foreach ($alldata as $number) {
2039
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2039
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2040 2040
 				}
2041
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2041
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2042 2042
 				foreach ($alldata as $number) {
2043
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2043
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2044 2044
 				}
2045
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2046
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2045
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2046
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2047 2047
 		        	$alldata = array();
2048 2048
 	    			foreach ($pall as $value) {
2049 2049
 		        		$icao = $value['airport_departure_icao'];
@@ -2059,12 +2059,12 @@  discard block
 block discarded – undo
2059 2059
     				foreach ($alldata as $key => $row) {
2060 2060
     					$count[$key] = $row['airport_departure_icao_count'];
2061 2061
     				}
2062
-				array_multisort($count,SORT_DESC,$alldata);
2062
+				array_multisort($count, SORT_DESC, $alldata);
2063 2063
 				foreach ($alldata as $number) {
2064
-    					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);
2064
+    					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);
2065 2065
 				}
2066
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2067
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2066
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2067
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2068 2068
 				$alldata = array();
2069 2069
     				foreach ($pall as $value) {
2070 2070
 		        		$icao = $value['airport_arrival_icao'];
@@ -2080,40 +2080,40 @@  discard block
 block discarded – undo
2080 2080
         			foreach ($alldata as $key => $row) {
2081 2081
     					$count[$key] = $row['airport_arrival_icao_count'];
2082 2082
 		        	}
2083
-        			array_multisort($count,SORT_DESC,$alldata);
2083
+        			array_multisort($count, SORT_DESC, $alldata);
2084 2084
 				foreach ($alldata as $number) {
2085
-					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);
2085
+					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);
2086 2086
 				}
2087 2087
 				$Spotter = new Spotter($this->db);
2088 2088
 				$alldata = $Spotter->countAllMonths($filter);
2089 2089
 				$lastyear = false;
2090 2090
 				foreach ($alldata as $number) {
2091 2091
 					if ($number['year_name'] != date('Y')) $lastyear = true;
2092
-					$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);
2092
+					$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);
2093 2093
 				}
2094 2094
 				$alldata = $Spotter->countAllMonthsOwners($filter);
2095 2095
 				foreach ($alldata as $number) {
2096
-					$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);
2096
+					$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);
2097 2097
 				}
2098 2098
 				$alldata = $Spotter->countAllMonthsPilots($filter);
2099 2099
 				foreach ($alldata as $number) {
2100
-					$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);
2100
+					$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);
2101 2101
 				}
2102 2102
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
2103 2103
 				foreach ($alldata as $number) {
2104
-					$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);
2104
+					$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);
2105 2105
 				}
2106 2106
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
2107 2107
 				foreach ($alldata as $number) {
2108
-					$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);
2108
+					$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);
2109 2109
 				}
2110 2110
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2111 2111
 				foreach ($alldata as $number) {
2112
-					$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);
2112
+					$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);
2113 2113
 				}
2114 2114
 				echo '...Departure'."\n";
2115
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2116
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2115
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2116
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2117 2117
 				foreach ($dall as $value) {
2118 2118
     					$icao = $value['departure_airport_icao'];
2119 2119
     					$ddate = $value['date'];
@@ -2131,11 +2131,11 @@  discard block
 block discarded – undo
2131 2131
     				}
2132 2132
 	    			$alldata = $pall;
2133 2133
 				foreach ($alldata as $number) {
2134
-					$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);
2134
+					$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);
2135 2135
 				}
2136 2136
 				echo '...Arrival'."\n";
2137
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2138
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2137
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2138
+    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2139 2139
 				foreach ($dall as $value) {
2140 2140
 					$icao = $value['arrival_airport_icao'];
2141 2141
 					$ddate = $value['date'];
@@ -2153,40 +2153,40 @@  discard block
 block discarded – undo
2153 2153
     				}
2154 2154
     				$alldata = $pall;
2155 2155
 				foreach ($alldata as $number) {
2156
-					$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);
2156
+					$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);
2157 2157
 				}
2158 2158
     
2159 2159
 				echo 'Flights data...'."\n";
2160 2160
 				echo '-> countAllDatesLastMonth...'."\n";
2161 2161
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
2162 2162
 				foreach ($alldata as $number) {
2163
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2163
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2164 2164
 				}
2165 2165
 				echo '-> countAllDates...'."\n";
2166
-				$previousdata = $this->countAllDates('',$filter_name);
2167
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2166
+				$previousdata = $this->countAllDates('', $filter_name);
2167
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2168 2168
 				$values = array();
2169 2169
 				foreach ($alldata as $cnt) {
2170 2170
 					$values[] = $cnt['date_count'];
2171 2171
 				}
2172
-				array_multisort($values,SORT_DESC,$alldata);
2173
-				array_splice($alldata,11);
2172
+				array_multisort($values, SORT_DESC, $alldata);
2173
+				array_splice($alldata, 11);
2174 2174
 				foreach ($alldata as $number) {
2175
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2175
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2176 2176
 				}
2177 2177
 				
2178 2178
 				echo '-> countAllHours...'."\n";
2179
-				$alldata = $Spotter->countAllHours('hour',$filter);
2179
+				$alldata = $Spotter->countAllHours('hour', $filter);
2180 2180
 				foreach ($alldata as $number) {
2181
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2181
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2182 2182
 				}
2183 2183
 				echo 'Insert last stats update date...'."\n";
2184 2184
 				date_default_timezone_set('UTC');
2185
-				$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2185
+				$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2186 2186
 				if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2187
-					if (date('Y',strtotime($last_update_day)) != date('Y')) {
2187
+					if (date('Y', strtotime($last_update_day)) != date('Y')) {
2188 2188
 						$this->deleteOldStats($filter_name);
2189
-						$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2189
+						$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2190 2190
 					}
2191 2191
 				}
2192 2192
 
@@ -2199,16 +2199,16 @@  discard block
 block discarded – undo
2199 2199
 				// SUM all previous month to put as year
2200 2200
 				$previous_year = date('Y');
2201 2201
 				$previous_year--;
2202
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2203
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2204
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2205
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2202
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2203
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2204
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2205
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2206 2206
 				$allairlines = $this->getAllAirlineNames();
2207 2207
 				foreach ($allairlines as $data) {
2208
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2209
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2210
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2211
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2208
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2209
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2210
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2211
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2212 2212
 				}
2213 2213
 				
2214 2214
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2217,7 +2217,7 @@  discard block
 block discarded – undo
2217 2217
 						try {
2218 2218
 							$sth = $this->db->prepare($query);
2219 2219
 							$sth->execute();
2220
-						} catch(PDOException $e) {
2220
+						} catch (PDOException $e) {
2221 2221
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2222 2222
 						}
2223 2223
 					}
@@ -2226,15 +2226,15 @@  discard block
 block discarded – undo
2226 2226
 					try {
2227 2227
 						$sth = $this->db->prepare($query);
2228 2228
 						$sth->execute();
2229
-					} catch(PDOException $e) {
2229
+					} catch (PDOException $e) {
2230 2230
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2231 2231
 					}
2232 2232
 				}
2233 2233
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2234 2234
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2235
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2235
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2236 2236
 						$this->deleteOldStats();
2237
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2237
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2238 2238
 						$lastyearupdate = true;
2239 2239
 					}
2240 2240
 				}
@@ -2256,7 +2256,7 @@  discard block
 block discarded – undo
2256 2256
 					try {
2257 2257
 						$sth = $this->db->prepare($query);
2258 2258
 						$sth->execute();
2259
-					} catch(PDOException $e) {
2259
+					} catch (PDOException $e) {
2260 2260
 						return "error : ".$e->getMessage();
2261 2261
 					}
2262 2262
 				}
@@ -2270,14 +2270,14 @@  discard block
 block discarded – undo
2270 2270
 				try {
2271 2271
 					$sth = $this->db->prepare($query);
2272 2272
 					$sth->execute();
2273
-				} catch(PDOException $e) {
2273
+				} catch (PDOException $e) {
2274 2274
 					return "error : ".$e->getMessage();
2275 2275
 				}
2276 2276
 			}
2277 2277
 			if (!isset($lastyearupdate)) {
2278 2278
 				echo 'Insert last stats update date...'."\n";
2279 2279
 				date_default_timezone_set('UTC');
2280
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2280
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2281 2281
 			}
2282 2282
 			if ($globalStatsResetYear) {
2283 2283
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.