Completed
Push — master ( 363fa2...61adbf )
by Yannick
08:20
created
require/class.Stats.php 2 patches
Indentation   +822 added lines, -822 removed lines patch added patch discarded remove patch
@@ -16,33 +16,33 @@  discard block
 block discarded – undo
16 16
 		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
17 17
 		$Connection = new Connection($dbc);
18 18
 		$this->db = $Connection->db();
19
-        }
19
+		}
20 20
               
21 21
 	public function addLastStatsUpdate($type,$stats_date) {
22
-                $query = "DELETE FROM config WHERE name = :type;
22
+				$query = "DELETE FROM config WHERE name = :type;
23 23
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
24
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
25
-                 try {
26
-                        $sth = $this->db->prepare($query);
27
-                        $sth->execute($query_values);
28
-                } catch(PDOException $e) {
29
-                        return "error : ".$e->getMessage();
30
-                }
31
-        }
24
+				$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+				 try {
26
+						$sth = $this->db->prepare($query);
27
+						$sth->execute($query_values);
28
+				} catch(PDOException $e) {
29
+						return "error : ".$e->getMessage();
30
+				}
31
+		}
32 32
 
33 33
 	public function getLastStatsUpdate($type = 'last_update_stats') {
34
-                $query = "SELECT value FROM config WHERE name = :type";
35
-                 try {
36
-                        $sth = $this->db->prepare($query);
37
-                        $sth->execute(array(':type' => $type));
38
-                } catch(PDOException $e) {
39
-                        echo "error : ".$e->getMessage();
40
-                }
41
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
42
-                return $all;
43
-        }
44
-        public function deleteStats($filter_name = '') {
45
-        	/*
34
+				$query = "SELECT value FROM config WHERE name = :type";
35
+				 try {
36
+						$sth = $this->db->prepare($query);
37
+						$sth->execute(array(':type' => $type));
38
+				} catch(PDOException $e) {
39
+						echo "error : ".$e->getMessage();
40
+				}
41
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
42
+				return $all;
43
+		}
44
+		public function deleteStats($filter_name = '') {
45
+			/*
46 46
         	$query = "DELETE FROM config WHERE name = 'last_update_stats'";
47 47
                  try {
48 48
                         $sth = $this->db->prepare($query);
@@ -51,109 +51,109 @@  discard block
 block discarded – undo
51 51
                         return "error : ".$e->getMessage();
52 52
                 }
53 53
                 */
54
-        	$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
55
-                 try {
56
-                        $sth = $this->db->prepare($query);
57
-                        $sth->execute(array(':filter_name' => $filter_name));
58
-                } catch(PDOException $e) {
59
-                        return "error : ".$e->getMessage();
60
-                }
61
-        }
62
-        public function deleteOldStats($filter_name = '') {
63
-        	if ($filter_name == '') {
64
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65
-        	} else {
66
-        		$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67
-        	}
68
-                 try {
69
-                        $sth = $this->db->prepare($query);
70
-                        $sth->execute();
71
-                } catch(PDOException $e) {
72
-                        return "error : ".$e->getMessage();
73
-                }
54
+			$query = "DELETE FROM stats WHERE filter_name = :filter_name;DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_airport WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_flight WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
55
+				 try {
56
+						$sth = $this->db->prepare($query);
57
+						$sth->execute(array(':filter_name' => $filter_name));
58
+				} catch(PDOException $e) {
59
+						return "error : ".$e->getMessage();
60
+				}
61
+		}
62
+		public function deleteOldStats($filter_name = '') {
63
+			if ($filter_name == '') {
64
+				$query = "DELETE FROM config WHERE name = 'last_update_stats'";
65
+			} else {
66
+				$query = "DELETE FROM config WHERE name = 'last_update_stats_".$filter_name."'";
67
+			}
68
+				 try {
69
+						$sth = $this->db->prepare($query);
70
+						$sth->execute();
71
+				} catch(PDOException $e) {
72
+						return "error : ".$e->getMessage();
73
+				}
74 74
                 
75
-        	$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
76
-                 try {
77
-                        $sth = $this->db->prepare($query);
78
-                        $sth->execute(array(':filter_name' => $filter_name));
79
-                } catch(PDOException $e) {
80
-                        return "error : ".$e->getMessage();
81
-                }
82
-        }
75
+			$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
76
+				 try {
77
+						$sth = $this->db->prepare($query);
78
+						$sth->execute(array(':filter_name' => $filter_name));
79
+				} catch(PDOException $e) {
80
+						return "error : ".$e->getMessage();
81
+				}
82
+		}
83 83
 	public function getAllAirlineNames($filter_name = '') {
84 84
 		if ($filter_name == '') $filter_name = $this->filter_name;
85
-                $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86
-                 try {
87
-                        $sth = $this->db->prepare($query);
88
-                        $sth->execute(array(':filter_name' => $filter_name));
89
-                } catch(PDOException $e) {
90
-                        echo "error : ".$e->getMessage();
91
-                }
92
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
93
-                return $all;
94
-        }
85
+				$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86
+				 try {
87
+						$sth = $this->db->prepare($query);
88
+						$sth->execute(array(':filter_name' => $filter_name));
89
+				} catch(PDOException $e) {
90
+						echo "error : ".$e->getMessage();
91
+				}
92
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
93
+				return $all;
94
+		}
95 95
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96 96
 		if ($filter_name == '') $filter_name = $this->filter_name;
97
-                $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98
-                 try {
99
-                        $sth = $this->db->prepare($query);
100
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101
-                } catch(PDOException $e) {
102
-                        echo "error : ".$e->getMessage();
103
-                }
104
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
105
-                return $all;
106
-        }
97
+				$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98
+				 try {
99
+						$sth = $this->db->prepare($query);
100
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
101
+				} catch(PDOException $e) {
102
+						echo "error : ".$e->getMessage();
103
+				}
104
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
105
+				return $all;
106
+		}
107 107
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108 108
 		if ($filter_name == '') $filter_name = $this->filter_name;
109
-                $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110
-                 try {
111
-                        $sth = $this->db->prepare($query);
112
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113
-                } catch(PDOException $e) {
114
-                        echo "error : ".$e->getMessage();
115
-                }
116
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
-                return $all;
118
-        }
109
+				$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110
+				 try {
111
+						$sth = $this->db->prepare($query);
112
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
113
+				} catch(PDOException $e) {
114
+						echo "error : ".$e->getMessage();
115
+				}
116
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
117
+				return $all;
118
+		}
119 119
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120 120
 		if ($filter_name == '') $filter_name = $this->filter_name;
121
-                $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122
-                 try {
123
-                        $sth = $this->db->prepare($query);
124
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125
-                } catch(PDOException $e) {
126
-                        echo "error : ".$e->getMessage();
127
-                }
128
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
129
-                return $all;
130
-        }
121
+				$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122
+				 try {
123
+						$sth = $this->db->prepare($query);
124
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
125
+				} catch(PDOException $e) {
126
+						echo "error : ".$e->getMessage();
127
+				}
128
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
129
+				return $all;
130
+		}
131 131
 
132 132
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133 133
 		if ($filter_name == '') $filter_name = $this->filter_name;
134
-                $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135
-                 try {
136
-                        $sth = $this->db->prepare($query);
137
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138
-                } catch(PDOException $e) {
139
-                        echo "error : ".$e->getMessage();
140
-                }
141
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
142
-                return $all;
143
-        }
134
+				$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135
+				 try {
136
+						$sth = $this->db->prepare($query);
137
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138
+				} catch(PDOException $e) {
139
+						echo "error : ".$e->getMessage();
140
+				}
141
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
142
+				return $all;
143
+		}
144 144
 
145 145
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146 146
 		if ($filter_name == '') $filter_name = $this->filter_name;
147
-                $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148
-                 try {
149
-                        $sth = $this->db->prepare($query);
150
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151
-                } catch(PDOException $e) {
152
-                        echo "error : ".$e->getMessage();
153
-                }
154
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
155
-                return $all;
156
-        }
147
+				$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148
+				 try {
149
+						$sth = $this->db->prepare($query);
150
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151
+				} catch(PDOException $e) {
152
+						echo "error : ".$e->getMessage();
153
+				}
154
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
155
+				return $all;
156
+		}
157 157
 
158 158
 
159 159
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
@@ -170,16 +170,16 @@  discard block
 block discarded – undo
170 170
 			}
171 171
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172 172
 		} else $all = array();
173
-                if (empty($all)) {
174
-            	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175
-            	    if ($filter_name != '') {
176
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177
-            	    }
178
-            	    $Spotter = new Spotter($this->db);
179
-            	    //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181
-                }
182
-                return $all;
173
+				if (empty($all)) {
174
+					$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175
+					if ($filter_name != '') {
176
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
177
+					}
178
+					$Spotter = new Spotter($this->db);
179
+					//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
180
+					$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
181
+				}
182
+				return $all;
183 183
 	}
184 184
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 185
 		global $globalStatsFilters;
@@ -195,17 +195,17 @@  discard block
 block discarded – undo
195 195
 			}
196 196
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197 197
 		} else $all = array();
198
-                if (empty($all)) {
199
-            		$Spotter = new Spotter($this->db);
200
-            		$filters = array();
201
-            		$filters = array('year' => $year,'month' => $month);
202
-            		if ($filter_name != '') {
203
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204
-			}
205
-            		//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
207
-                }
208
-                return $all;
198
+				if (empty($all)) {
199
+					$Spotter = new Spotter($this->db);
200
+					$filters = array();
201
+					$filters = array('year' => $year,'month' => $month);
202
+					if ($filter_name != '') {
203
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
204
+			}
205
+					//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
206
+					$all = $Spotter->countAllAirlineCountries($limit,$filters);
207
+				}
208
+				return $all;
209 209
 	}
210 210
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 211
 		global $globalStatsFilters;
@@ -247,39 +247,39 @@  discard block
 block discarded – undo
247 247
 			}
248 248
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249 249
 		} else $all = array();
250
-                if (empty($all)) {
250
+				if (empty($all)) {
251 251
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 252
 			if ($filter_name != '') {
253
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
253
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
254 254
 			}
255 255
 			$Spotter = new Spotter($this->db);
256 256
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
257 257
 			$all = $Spotter->countAllArrivalCountries($limit,$filters);
258
-                }
259
-                return $all;
258
+				}
259
+				return $all;
260 260
 	}
261 261
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 262
 		global $globalStatsFilters;
263 263
 		if ($filter_name == '') $filter_name = $this->filter_name;
264 264
 		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
265 265
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
266
-                 try {
267
-                        $sth = $this->db->prepare($query);
268
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
-                } catch(PDOException $e) {
270
-                        echo "error : ".$e->getMessage();
271
-                }
272
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
-                if (empty($all)) {
266
+				 try {
267
+						$sth = $this->db->prepare($query);
268
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
+				} catch(PDOException $e) {
270
+						echo "error : ".$e->getMessage();
271
+				}
272
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
+				if (empty($all)) {
274 274
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
275 275
 			if ($filter_name != '') {
276
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
276
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
277 277
 			}
278 278
 			$Spotter = new Spotter($this->db);
279 279
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
280 280
 			$all = $Spotter->countAllDepartureCountries($filters);
281
-                }
282
-                return $all;
281
+				}
282
+				return $all;
283 283
 	}
284 284
 
285 285
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
@@ -305,17 +305,17 @@  discard block
 block discarded – undo
305 305
 			}
306 306
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307 307
 		} else $all = array();
308
-                if (empty($all)) {
309
-	                $Spotter = new Spotter($this->db);
310
-            		$filters = array();
308
+				if (empty($all)) {
309
+					$Spotter = new Spotter($this->db);
310
+					$filters = array();
311 311
 			$filters = array('year' => $year,'month' => $month);
312
-            		if ($filter_name != '') {
313
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
312
+					if ($filter_name != '') {
313
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
314 314
 			}
315 315
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
316
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
317
-                }
318
-                return $all;
316
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
317
+				}
318
+				return $all;
319 319
 	}
320 320
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 321
 		global $globalStatsFilters;
@@ -331,16 +331,16 @@  discard block
 block discarded – undo
331 331
 			}
332 332
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333 333
 		} else $all = array();
334
-                if (empty($all)) {
334
+				if (empty($all)) {
335 335
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 336
 			if ($filter_name != '') {
337 337
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
338 338
 			}
339
-	                $Spotter = new Spotter($this->db);
340
-    		        //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342
-                }
343
-                return $all;
339
+					$Spotter = new Spotter($this->db);
340
+					//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
341
+					$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
342
+				}
343
+				return $all;
344 344
 	}
345 345
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 346
 		global $globalStatsFilters;
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
 					echo "error : ".$e->getMessage();
382 382
 				}
383 383
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
384
-                /*
384
+				/*
385 385
                 if (empty($all)) {
386 386
 	                $Spotter = new Spotter($this->db);
387 387
     		        $all = $Spotter->countAllFlightOverCountries($limit);
@@ -433,16 +433,16 @@  discard block
 block discarded – undo
433 433
 			}
434 434
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435 435
 		} else $all = array();
436
-                if (empty($all)) {
436
+				if (empty($all)) {
437 437
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 438
 			if ($filter_name != '') {
439 439
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
440 440
 			}
441
-            		$Spotter = new Spotter($this->db);
442
-            		//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
444
-                }
445
-                return $all;
441
+					$Spotter = new Spotter($this->db);
442
+					//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
443
+					$all = $Spotter->countAllOwners($limit,0,'',$filters);
444
+				}
445
+				return $all;
446 446
 	}
447 447
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 448
 		global $globalStatsFilters;
@@ -458,35 +458,35 @@  discard block
 block discarded – undo
458 458
 			}
459 459
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460 460
 		} else $all = array();
461
-                if (empty($all)) {
461
+				if (empty($all)) {
462 462
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463
-            		if ($filter_name != '') {
464
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
463
+					if ($filter_name != '') {
464
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
465 465
 			}
466
-            		$Spotter = new Spotter($this->db);
466
+					$Spotter = new Spotter($this->db);
467 467
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
468 468
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
469
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471
-        		$all = array();
472
-        		foreach ($pall as $value) {
473
-        			$icao = $value['airport_departure_icao'];
474
-        			$all[$icao] = $value;
475
-        		}
469
+					$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
470
+				$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
471
+				$all = array();
472
+				foreach ($pall as $value) {
473
+					$icao = $value['airport_departure_icao'];
474
+					$all[$icao] = $value;
475
+				}
476 476
         		
477
-        		foreach ($dall as $value) {
478
-        			$icao = $value['airport_departure_icao'];
479
-        			if (isset($all[$icao])) {
480
-        				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
-        			} else $all[$icao] = $value;
482
-        		}
483
-        		$count = array();
484
-        		foreach ($all as $key => $row) {
485
-        			$count[$key] = $row['airport_departure_icao_count'];
486
-        		}
487
-        		array_multisort($count,SORT_DESC,$all);
488
-                }
489
-                return $all;
477
+				foreach ($dall as $value) {
478
+					$icao = $value['airport_departure_icao'];
479
+					if (isset($all[$icao])) {
480
+						$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
+					} else $all[$icao] = $value;
482
+				}
483
+				$count = array();
484
+				foreach ($all as $key => $row) {
485
+					$count[$key] = $row['airport_departure_icao_count'];
486
+				}
487
+				array_multisort($count,SORT_DESC,$all);
488
+				}
489
+				return $all;
490 490
 	}
491 491
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 492
 		global $globalStatsFilters;
@@ -512,26 +512,26 @@  discard block
 block discarded – undo
512 512
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
513 513
 			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
514 514
 			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
515
-        		$all = array();
516
-        		foreach ($pall as $value) {
517
-        			$icao = $value['airport_arrival_icao'];
518
-        			$all[$icao] = $value;
519
-        		}
515
+				$all = array();
516
+				foreach ($pall as $value) {
517
+					$icao = $value['airport_arrival_icao'];
518
+					$all[$icao] = $value;
519
+				}
520 520
         		
521
-        		foreach ($dall as $value) {
522
-        			$icao = $value['airport_arrival_icao'];
523
-        			if (isset($all[$icao])) {
524
-        				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
-        			} else $all[$icao] = $value;
526
-        		}
527
-        		$count = array();
528
-        		foreach ($all as $key => $row) {
529
-        			$count[$key] = $row['airport_arrival_icao_count'];
530
-        		}
531
-        		array_multisort($count,SORT_DESC,$all);
532
-                }
521
+				foreach ($dall as $value) {
522
+					$icao = $value['airport_arrival_icao'];
523
+					if (isset($all[$icao])) {
524
+						$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
+					} else $all[$icao] = $value;
526
+				}
527
+				$count = array();
528
+				foreach ($all as $key => $row) {
529
+					$count[$key] = $row['airport_arrival_icao_count'];
530
+				}
531
+				array_multisort($count,SORT_DESC,$all);
532
+				}
533 533
  
534
-                return $all;
534
+				return $all;
535 535
 	}
536 536
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 537
 		global $globalDBdriver, $globalStatsFilters;
@@ -544,23 +544,23 @@  discard block
 block discarded – undo
544 544
 			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
545 545
 		}
546 546
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547
-                 try {
548
-                        $sth = $this->db->prepare($query);
549
-                        $sth->execute($query_data);
550
-                } catch(PDOException $e) {
551
-                        echo "error : ".$e->getMessage();
552
-                }
553
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
554
-                if (empty($all)) {
547
+				 try {
548
+						$sth = $this->db->prepare($query);
549
+						$sth->execute($query_data);
550
+				} catch(PDOException $e) {
551
+						echo "error : ".$e->getMessage();
552
+				}
553
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554
+				if (empty($all)) {
555 555
 			$filters = array('airlines' => array($stats_airline));
556 556
 			if ($filter_name != '') {
557 557
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
558 558
 			}
559
-            		$Spotter = new Spotter($this->db);
560
-            		$all = $Spotter->countAllMonthsLastYear($filters);
561
-                }
559
+					$Spotter = new Spotter($this->db);
560
+					$all = $Spotter->countAllMonthsLastYear($filters);
561
+				}
562 562
                 
563
-                return $all;
563
+				return $all;
564 564
 	}
565 565
 	
566 566
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
@@ -568,22 +568,22 @@  discard block
 block discarded – undo
568 568
 		if ($filter_name == '') $filter_name = $this->filter_name;
569 569
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
570 570
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571
-                 try {
572
-                        $sth = $this->db->prepare($query);
573
-                        $sth->execute($query_data);
574
-                } catch(PDOException $e) {
575
-                        echo "error : ".$e->getMessage();
576
-                }
577
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
-                if (empty($all)) {
571
+				 try {
572
+						$sth = $this->db->prepare($query);
573
+						$sth->execute($query_data);
574
+				} catch(PDOException $e) {
575
+						echo "error : ".$e->getMessage();
576
+				}
577
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
+				if (empty($all)) {
579 579
 			$filters = array('airlines' => array($stats_airline));
580 580
 			if ($filter_name != '') {
581 581
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582 582
 			}
583
-            		$Spotter = new Spotter($this->db);
584
-            		$all = $Spotter->countAllDatesLastMonth($filters);
585
-                }
586
-                return $all;
583
+					$Spotter = new Spotter($this->db);
584
+					$all = $Spotter->countAllDatesLastMonth($filters);
585
+				}
586
+				return $all;
587 587
 	}
588 588
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 589
 		global $globalDBdriver, $globalStatsFilters;
@@ -594,66 +594,66 @@  discard block
 block discarded – undo
594 594
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
595 595
 		}
596 596
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
597
-                 try {
598
-                        $sth = $this->db->prepare($query);
599
-                        $sth->execute($query_data);
600
-                } catch(PDOException $e) {
601
-                        echo "error : ".$e->getMessage();
602
-                }
603
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
604
-                if (empty($all)) {
597
+				 try {
598
+						$sth = $this->db->prepare($query);
599
+						$sth->execute($query_data);
600
+				} catch(PDOException $e) {
601
+						echo "error : ".$e->getMessage();
602
+				}
603
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
604
+				if (empty($all)) {
605 605
 			$filters = array('airlines' => array($stats_airline));
606 606
 			if ($filter_name != '') {
607 607
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
608 608
 			}
609
-            		$Spotter = new Spotter($this->db);
610
-            		$all = $Spotter->countAllDatesLast7Days($filters);
611
-                }
612
-                return $all;
609
+					$Spotter = new Spotter($this->db);
610
+					$all = $Spotter->countAllDatesLast7Days($filters);
611
+				}
612
+				return $all;
613 613
 	}
614 614
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 615
 		global $globalStatsFilters;
616 616
 		if ($filter_name == '') $filter_name = $this->filter_name;
617 617
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
618 618
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619
-                 try {
620
-                        $sth = $this->db->prepare($query);
621
-                        $sth->execute($query_data);
622
-                } catch(PDOException $e) {
623
-                        echo "error : ".$e->getMessage();
624
-                }
625
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
-                if (empty($all)) {
619
+				 try {
620
+						$sth = $this->db->prepare($query);
621
+						$sth->execute($query_data);
622
+				} catch(PDOException $e) {
623
+						echo "error : ".$e->getMessage();
624
+				}
625
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
+				if (empty($all)) {
627 627
 			$filters = array('airlines' => array($stats_airline));
628 628
 			if ($filter_name != '') {
629
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
629
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
630 630
 			}
631
-            		$Spotter = new Spotter($this->db);
632
-            		$all = $Spotter->countAllDates($filters);
633
-                }
634
-                return $all;
631
+					$Spotter = new Spotter($this->db);
632
+					$all = $Spotter->countAllDates($filters);
633
+				}
634
+				return $all;
635 635
 	}
636 636
 	public function countAllDatesByAirlines($filter_name = '') {
637 637
 		global $globalStatsFilters;
638 638
 		if ($filter_name == '') $filter_name = $this->filter_name;
639 639
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 640
 		$query_data = array('filter_name' => $filter_name);
641
-                 try {
642
-                        $sth = $this->db->prepare($query);
643
-                        $sth->execute($query_data);
644
-                } catch(PDOException $e) {
645
-                        echo "error : ".$e->getMessage();
646
-                }
647
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
-                if (empty($all)) {
649
-            		$filters = array();
650
-            		if ($filter_name != '') {
651
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641
+				 try {
642
+						$sth = $this->db->prepare($query);
643
+						$sth->execute($query_data);
644
+				} catch(PDOException $e) {
645
+						echo "error : ".$e->getMessage();
646
+				}
647
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
+				if (empty($all)) {
649
+					$filters = array();
650
+					if ($filter_name != '') {
651
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
652 652
 			}
653
-            		$Spotter = new Spotter($this->db);
654
-            		$all = $Spotter->countAllDatesByAirlines($filters);
655
-                }
656
-                return $all;
653
+					$Spotter = new Spotter($this->db);
654
+					$all = $Spotter->countAllDatesByAirlines($filters);
655
+				}
656
+				return $all;
657 657
 	}
658 658
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 659
 		global $globalStatsFilters, $globalDBdriver;
@@ -663,24 +663,24 @@  discard block
 block discarded – undo
663 663
 		} else {
664 664
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
665 665
 		}
666
-                 try {
667
-                        $sth = $this->db->prepare($query);
668
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
-                } catch(PDOException $e) {
670
-                        echo "error : ".$e->getMessage();
671
-                }
672
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
666
+				 try {
667
+						$sth = $this->db->prepare($query);
668
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
+				} catch(PDOException $e) {
670
+						echo "error : ".$e->getMessage();
671
+				}
672
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
673 673
                 
674
-                if (empty($all)) {
674
+				if (empty($all)) {
675 675
 			$filters = array('airlines' => array($stats_airline));
676 676
 			if ($filter_name != '') {
677 677
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
678 678
 			}
679
-            		$Spotter = new Spotter($this->db);
680
-            		$all = $Spotter->countAllMonths($filters);
681
-                }
679
+					$Spotter = new Spotter($this->db);
680
+					$all = $Spotter->countAllMonths($filters);
681
+				}
682 682
                 
683
-                return $all;
683
+				return $all;
684 684
 	}
685 685
 	public function countFatalitiesLast12Months() {
686 686
 		global $globalStatsFilters, $globalDBdriver;
@@ -689,19 +689,19 @@  discard block
 block discarded – undo
689 689
 		} else {
690 690
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, EXTRACT(MONTH FROM stats_date) as month,cnt as count FROM stats WHERE stats_type = 'fatalities_bymonth' ORDER BY stats_date";
691 691
 		}
692
-                 try {
693
-                        $sth = $this->db->prepare($query);
694
-                        $sth->execute();
695
-                } catch(PDOException $e) {
696
-                        echo "error : ".$e->getMessage();
697
-                }
698
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
692
+				 try {
693
+						$sth = $this->db->prepare($query);
694
+						$sth->execute();
695
+				} catch(PDOException $e) {
696
+						echo "error : ".$e->getMessage();
697
+				}
698
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
699 699
                 
700
-                if (empty($all)) {
701
-            		$Accident = new Accident($this->db);
702
-            		$all = $Accident->countFatalitiesLast12Months();
703
-                }
704
-                return $all;
700
+				if (empty($all)) {
701
+					$Accident = new Accident($this->db);
702
+					$all = $Accident->countFatalitiesLast12Months();
703
+				}
704
+				return $all;
705 705
 	}
706 706
 	public function countFatalitiesByYear() {
707 707
 		global $globalStatsFilters, $globalDBdriver;
@@ -710,40 +710,40 @@  discard block
 block discarded – undo
710 710
 		} else {
711 711
 			$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year, cnt as count FROM stats WHERE stats_type = 'fatalities_byyear' ORDER BY stats_date";
712 712
 		}
713
-                 try {
714
-                        $sth = $this->db->prepare($query);
715
-                        $sth->execute();
716
-                } catch(PDOException $e) {
717
-                        echo "error : ".$e->getMessage();
718
-                }
719
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
713
+				 try {
714
+						$sth = $this->db->prepare($query);
715
+						$sth->execute();
716
+				} catch(PDOException $e) {
717
+						echo "error : ".$e->getMessage();
718
+				}
719
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
720 720
                 
721
-                if (empty($all)) {
722
-            		$Accident = new Accident($this->db);
723
-            		$all = $Accident->countFatalitiesByYear();
724
-                }
725
-                return $all;
721
+				if (empty($all)) {
722
+					$Accident = new Accident($this->db);
723
+					$all = $Accident->countFatalitiesByYear();
724
+				}
725
+				return $all;
726 726
 	}
727 727
 	public function countAllMilitaryMonths($filter_name = '') {
728 728
 		global $globalStatsFilters;
729 729
 		if ($filter_name == '') $filter_name = $this->filter_name;
730
-	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731
-                 try {
732
-                        $sth = $this->db->prepare($query);
733
-                        $sth->execute(array(':filter_name' => $filter_name));
734
-                } catch(PDOException $e) {
735
-                        echo "error : ".$e->getMessage();
736
-                }
737
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
738
-                if (empty($all)) {
739
-            		$filters = array();
740
-            		if ($filter_name != '') {
741
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
730
+			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731
+				 try {
732
+						$sth = $this->db->prepare($query);
733
+						$sth->execute(array(':filter_name' => $filter_name));
734
+				} catch(PDOException $e) {
735
+						echo "error : ".$e->getMessage();
736
+				}
737
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
738
+				if (empty($all)) {
739
+					$filters = array();
740
+					if ($filter_name != '') {
741
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
742 742
 			}
743
-            		$Spotter = new Spotter($this->db);
744
-            		$all = $Spotter->countAllMilitaryMonths($filters);
745
-                }
746
-                return $all;
743
+					$Spotter = new Spotter($this->db);
744
+					$all = $Spotter->countAllMilitaryMonths($filters);
745
+				}
746
+				return $all;
747 747
 	}
748 748
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 749
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
@@ -759,22 +759,22 @@  discard block
 block discarded – undo
759 759
 			}
760 760
 		}
761 761
 		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
762
-                 try {
763
-                        $sth = $this->db->prepare($query);
764
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765
-                } catch(PDOException $e) {
766
-                        echo "error : ".$e->getMessage();
767
-                }
768
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
769
-                if (empty($all)) {
762
+				 try {
763
+						$sth = $this->db->prepare($query);
764
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
765
+				} catch(PDOException $e) {
766
+						echo "error : ".$e->getMessage();
767
+				}
768
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
769
+				if (empty($all)) {
770 770
 			$filters = array('airlines' => array($stats_airline));
771 771
 			if ($filter_name != '') {
772
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
772
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
773 773
 			}
774
-            		$Spotter = new Spotter($this->db);
775
-            		$all = $Spotter->countAllHours($orderby,$filters);
776
-                }
777
-                return $all;
774
+					$Spotter = new Spotter($this->db);
775
+					$all = $Spotter->countAllHours($orderby,$filters);
776
+				}
777
+				return $all;
778 778
 	}
779 779
 	
780 780
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
@@ -799,10 +799,10 @@  discard block
 block discarded – undo
799 799
 		if ($year == '') $year = date('Y');
800 800
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 801
 		if (empty($all)) {
802
-		        $filters = array();
802
+				$filters = array();
803 803
 			$filters = array('year' => $year,'month' => $month);
804
-            		if ($filter_name != '') {
805
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
804
+					if ($filter_name != '') {
805
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
806 806
 			}
807 807
 			$Spotter = new Spotter($this->db);
808 808
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -866,10 +866,10 @@  discard block
 block discarded – undo
866 866
 			$all = $result[0]['nb_airline'];
867 867
 		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
868 868
 		if (empty($all)) {
869
-            		$filters = array();
869
+					$filters = array();
870 870
 			$filters = array('year' => $year,'month' => $month);
871
-            		if ($filter_name != '') {
872
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
871
+					if ($filter_name != '') {
872
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
873 873
 			}
874 874
 			$Spotter = new Spotter($this->db);
875 875
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -939,46 +939,46 @@  discard block
 block discarded – undo
939 939
 		if ($filter_name == '') $filter_name = $this->filter_name;
940 940
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
941 941
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942
-                 try {
943
-                        $sth = $this->db->prepare($query);
944
-                        $sth->execute($query_values);
945
-                } catch(PDOException $e) {
946
-                        echo "error : ".$e->getMessage();
947
-                }
948
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
949
-                return $all;
942
+				 try {
943
+						$sth = $this->db->prepare($query);
944
+						$sth->execute($query_values);
945
+				} catch(PDOException $e) {
946
+						echo "error : ".$e->getMessage();
947
+				}
948
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
949
+				return $all;
950 950
 	}
951 951
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952 952
 		if ($filter_name == '') $filter_name = $this->filter_name;
953
-                $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955
-                 try {
956
-                        $sth = $this->db->prepare($query);
957
-                        $sth->execute($query_values);
958
-                } catch(PDOException $e) {
959
-                        echo "error : ".$e->getMessage();
960
-                }
961
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
962
-                return $all;
963
-        }
953
+				$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955
+				 try {
956
+						$sth = $this->db->prepare($query);
957
+						$sth->execute($query_values);
958
+				} catch(PDOException $e) {
959
+						echo "error : ".$e->getMessage();
960
+				}
961
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
962
+				return $all;
963
+		}
964 964
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965 965
 		if ($filter_name == '') $filter_name = $this->filter_name;
966
-                $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968
-                 try {
969
-                        $sth = $this->db->prepare($query);
970
-                        $sth->execute($query_values);
971
-                } catch(PDOException $e) {
972
-                        echo "error : ".$e->getMessage();
973
-                }
974
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
975
-                return $all;
976
-        }
966
+				$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968
+				 try {
969
+						$sth = $this->db->prepare($query);
970
+						$sth->execute($query_values);
971
+				} catch(PDOException $e) {
972
+						echo "error : ".$e->getMessage();
973
+				}
974
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
975
+				return $all;
976
+		}
977 977
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
978 978
 		if ($filter_name == '') $filter_name = $this->filter_name;
979
-    		global $globalArchiveMonths, $globalDBdriver;
980
-    		if ($globalDBdriver == 'mysql') {
981
-    			if ($month == '') {
979
+			global $globalArchiveMonths, $globalDBdriver;
980
+			if ($globalDBdriver == 'mysql') {
981
+				if ($month == '') {
982 982
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
983 983
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
984 984
 			} else {
@@ -993,165 +993,165 @@  discard block
 block discarded – undo
993 993
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
994 994
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
995 995
 			}
996
-                }
997
-                 try {
998
-                        $sth = $this->db->prepare($query);
999
-                        $sth->execute($query_values);
1000
-                } catch(PDOException $e) {
1001
-                        echo "error : ".$e->getMessage();
1002
-                }
1003
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1004
-                return $all[0]['total'];
1005
-        }
996
+				}
997
+				 try {
998
+						$sth = $this->db->prepare($query);
999
+						$sth->execute($query_values);
1000
+				} catch(PDOException $e) {
1001
+						echo "error : ".$e->getMessage();
1002
+				}
1003
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1004
+				return $all[0]['total'];
1005
+		}
1006 1006
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1007
-    		global $globalArchiveMonths, $globalDBdriver;
1007
+			global $globalArchiveMonths, $globalDBdriver;
1008 1008
 		if ($filter_name == '') $filter_name = $this->filter_name;
1009
-    		if ($globalDBdriver == 'mysql') {
1009
+			if ($globalDBdriver == 'mysql') {
1010 1010
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1011 1011
 		} else {
1012 1012
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1013
-                }
1014
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1015
-                 try {
1016
-                        $sth = $this->db->prepare($query);
1017
-                        $sth->execute($query_values);
1018
-                } catch(PDOException $e) {
1019
-                        echo "error : ".$e->getMessage();
1020
-                }
1021
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1022
-                return $all[0]['total'];
1023
-        }
1013
+				}
1014
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1015
+				 try {
1016
+						$sth = $this->db->prepare($query);
1017
+						$sth->execute($query_values);
1018
+				} catch(PDOException $e) {
1019
+						echo "error : ".$e->getMessage();
1020
+				}
1021
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1022
+				return $all[0]['total'];
1023
+		}
1024 1024
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1025
-    		global $globalArchiveMonths, $globalDBdriver;
1025
+			global $globalArchiveMonths, $globalDBdriver;
1026 1026
 		if ($filter_name == '') $filter_name = $this->filter_name;
1027
-    		if ($globalDBdriver == 'mysql') {
1027
+			if ($globalDBdriver == 'mysql') {
1028 1028
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1029
-                } else {
1029
+				} else {
1030 1030
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1031
-                }
1032
-                 try {
1033
-                        $sth = $this->db->prepare($query);
1034
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1035
-                } catch(PDOException $e) {
1036
-                        echo "error : ".$e->getMessage();
1037
-                }
1038
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1039
-                return $all[0]['total'];
1040
-        }
1031
+				}
1032
+				 try {
1033
+						$sth = $this->db->prepare($query);
1034
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1035
+				} catch(PDOException $e) {
1036
+						echo "error : ".$e->getMessage();
1037
+				}
1038
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1039
+				return $all[0]['total'];
1040
+		}
1041 1041
 	public function getStatsAirlineTotal($filter_name = '') {
1042
-    		global $globalArchiveMonths, $globalDBdriver;
1042
+			global $globalArchiveMonths, $globalDBdriver;
1043 1043
 		if ($filter_name == '') $filter_name = $this->filter_name;
1044
-    		if ($globalDBdriver == 'mysql') {
1044
+			if ($globalDBdriver == 'mysql') {
1045 1045
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1046
-                } else {
1046
+				} else {
1047 1047
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1048
-                }
1049
-                 try {
1050
-                        $sth = $this->db->prepare($query);
1051
-                        $sth->execute(array(':filter_name' => $filter_name));
1052
-                } catch(PDOException $e) {
1053
-                        echo "error : ".$e->getMessage();
1054
-                }
1055
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1056
-                return $all[0]['total'];
1057
-        }
1048
+				}
1049
+				 try {
1050
+						$sth = $this->db->prepare($query);
1051
+						$sth->execute(array(':filter_name' => $filter_name));
1052
+				} catch(PDOException $e) {
1053
+						echo "error : ".$e->getMessage();
1054
+				}
1055
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1056
+				return $all[0]['total'];
1057
+		}
1058 1058
 	public function getStatsOwnerTotal($filter_name = '') {
1059
-    		global $globalArchiveMonths, $globalDBdriver;
1059
+			global $globalArchiveMonths, $globalDBdriver;
1060 1060
 		if ($filter_name == '') $filter_name = $this->filter_name;
1061
-    		if ($globalDBdriver == 'mysql') {
1061
+			if ($globalDBdriver == 'mysql') {
1062 1062
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1063 1063
 		} else {
1064 1064
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1065
-                }
1066
-                 try {
1067
-                        $sth = $this->db->prepare($query);
1068
-                        $sth->execute(array(':filter_name' => $filter_name));
1069
-                } catch(PDOException $e) {
1070
-                        echo "error : ".$e->getMessage();
1071
-                }
1072
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1073
-                return $all[0]['total'];
1074
-        }
1065
+				}
1066
+				 try {
1067
+						$sth = $this->db->prepare($query);
1068
+						$sth->execute(array(':filter_name' => $filter_name));
1069
+				} catch(PDOException $e) {
1070
+						echo "error : ".$e->getMessage();
1071
+				}
1072
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1073
+				return $all[0]['total'];
1074
+		}
1075 1075
 	public function getStatsOwner($owner_name,$filter_name = '') {
1076
-    		global $globalArchiveMonths, $globalDBdriver;
1076
+			global $globalArchiveMonths, $globalDBdriver;
1077 1077
 		if ($filter_name == '') $filter_name = $this->filter_name;
1078 1078
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1079
-                 try {
1080
-                        $sth = $this->db->prepare($query);
1081
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1082
-                } catch(PDOException $e) {
1083
-                        echo "error : ".$e->getMessage();
1084
-                }
1085
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1086
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1087
-                else return 0;
1088
-        }
1079
+				 try {
1080
+						$sth = $this->db->prepare($query);
1081
+						$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1082
+				} catch(PDOException $e) {
1083
+						echo "error : ".$e->getMessage();
1084
+				}
1085
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1086
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1087
+				else return 0;
1088
+		}
1089 1089
 	public function getStatsPilotTotal($filter_name = '') {
1090
-    		global $globalArchiveMonths, $globalDBdriver;
1090
+			global $globalArchiveMonths, $globalDBdriver;
1091 1091
 		if ($filter_name == '') $filter_name = $this->filter_name;
1092
-    		if ($globalDBdriver == 'mysql') {
1093
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
-            	} else {
1095
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1096
-            	}
1097
-                 try {
1098
-                        $sth = $this->db->prepare($query);
1099
-                        $sth->execute(array(':filter_name' => $filter_name));
1100
-                } catch(PDOException $e) {
1101
-                        echo "error : ".$e->getMessage();
1102
-                }
1103
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104
-                return $all[0]['total'];
1105
-        }
1092
+			if ($globalDBdriver == 'mysql') {
1093
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
+				} else {
1095
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1096
+				}
1097
+				 try {
1098
+						$sth = $this->db->prepare($query);
1099
+						$sth->execute(array(':filter_name' => $filter_name));
1100
+				} catch(PDOException $e) {
1101
+						echo "error : ".$e->getMessage();
1102
+				}
1103
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104
+				return $all[0]['total'];
1105
+		}
1106 1106
 	public function getStatsPilot($pilot,$filter_name = '') {
1107
-    		global $globalArchiveMonths, $globalDBdriver;
1107
+			global $globalArchiveMonths, $globalDBdriver;
1108 1108
 		if ($filter_name == '') $filter_name = $this->filter_name;
1109 1109
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1110
-                 try {
1111
-                        $sth = $this->db->prepare($query);
1112
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1113
-                } catch(PDOException $e) {
1114
-                        echo "error : ".$e->getMessage();
1115
-                }
1116
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1117
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1118
-                else return 0;
1119
-        }
1110
+				 try {
1111
+						$sth = $this->db->prepare($query);
1112
+						$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1113
+				} catch(PDOException $e) {
1114
+						echo "error : ".$e->getMessage();
1115
+				}
1116
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1117
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1118
+				else return 0;
1119
+		}
1120 1120
 
1121 1121
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1122 1122
 		global $globalDBdriver;
1123 1123
 		if ($filter_name == '') $filter_name = $this->filter_name;
1124 1124
 		if ($globalDBdriver == 'mysql') {
1125 1125
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1126
-                } else {
1126
+				} else {
1127 1127
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1128 1128
 		}
1129
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1130
-                 try {
1131
-                        $sth = $this->db->prepare($query);
1132
-                        $sth->execute($query_values);
1133
-                } catch(PDOException $e) {
1134
-                        return "error : ".$e->getMessage();
1135
-                }
1136
-        }
1129
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1130
+				 try {
1131
+						$sth = $this->db->prepare($query);
1132
+						$sth->execute($query_values);
1133
+				} catch(PDOException $e) {
1134
+						return "error : ".$e->getMessage();
1135
+				}
1136
+		}
1137 1137
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1138 1138
 		global $globalDBdriver;
1139 1139
 		if ($filter_name == '') $filter_name = $this->filter_name;
1140 1140
 		if ($globalDBdriver == 'mysql') {
1141 1141
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1142
 		} else {
1143
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1143
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1144 1144
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1145
-                }
1146
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1147
-                 try {
1148
-                        $sth = $this->db->prepare($query);
1149
-                        $sth->execute($query_values);
1150
-                } catch(PDOException $e) {
1151
-                        return "error : ".$e->getMessage();
1152
-                }
1153
-        }
1154
-        /*
1145
+				}
1146
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1147
+				 try {
1148
+						$sth = $this->db->prepare($query);
1149
+						$sth->execute($query_values);
1150
+				} catch(PDOException $e) {
1151
+						return "error : ".$e->getMessage();
1152
+				}
1153
+		}
1154
+		/*
1155 1155
 	public function getStatsSource($date,$stats_type = '') {
1156 1156
 		if ($stats_type == '') {
1157 1157
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -1220,25 +1220,25 @@  discard block
 block discarded – undo
1220 1220
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1221 1221
 		} else {
1222 1222
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1223
-                }
1224
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1225
-                 try {
1226
-                        $sth = $this->db->prepare($query);
1227
-                        $sth->execute($query_values);
1228
-                } catch(PDOException $e) {
1229
-                        return "error : ".$e->getMessage();
1230
-                }
1231
-        }
1232
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1233
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1234
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1235
-                 try {
1236
-                        $sth = $this->db->prepare($query);
1237
-                        $sth->execute($query_values);
1238
-                } catch(PDOException $e) {
1239
-                        return "error : ".$e->getMessage();
1240
-                }
1241
-        }
1223
+				}
1224
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1225
+				 try {
1226
+						$sth = $this->db->prepare($query);
1227
+						$sth->execute($query_values);
1228
+				} catch(PDOException $e) {
1229
+						return "error : ".$e->getMessage();
1230
+				}
1231
+		}
1232
+	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1233
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1234
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1235
+				 try {
1236
+						$sth = $this->db->prepare($query);
1237
+						$sth->execute($query_values);
1238
+				} catch(PDOException $e) {
1239
+						return "error : ".$e->getMessage();
1240
+				}
1241
+		}
1242 1242
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1243 1243
 		global $globalDBdriver;
1244 1244
 		if ($globalDBdriver == 'mysql') {
@@ -1254,14 +1254,14 @@  discard block
 block discarded – undo
1254 1254
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1255 1255
 			}
1256 1256
 		}
1257
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1258
-                 try {
1259
-                        $sth = $this->db->prepare($query);
1260
-                        $sth->execute($query_values);
1261
-                } catch(PDOException $e) {
1262
-                        return "error : ".$e->getMessage();
1263
-                }
1264
-        }
1257
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1258
+				 try {
1259
+						$sth = $this->db->prepare($query);
1260
+						$sth->execute($query_values);
1261
+				} catch(PDOException $e) {
1262
+						return "error : ".$e->getMessage();
1263
+				}
1264
+		}
1265 1265
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1266 1266
 		global $globalDBdriver;
1267 1267
 		if ($globalDBdriver == 'mysql') {
@@ -1277,14 +1277,14 @@  discard block
 block discarded – undo
1277 1277
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1278 1278
 			}
1279 1279
 		}
1280
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1281
-                 try {
1282
-                        $sth = $this->db->prepare($query);
1283
-                        $sth->execute($query_values);
1284
-                } catch(PDOException $e) {
1285
-                        return "error : ".$e->getMessage();
1286
-                }
1287
-        }
1280
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1281
+				 try {
1282
+						$sth = $this->db->prepare($query);
1283
+						$sth->execute($query_values);
1284
+				} catch(PDOException $e) {
1285
+						return "error : ".$e->getMessage();
1286
+				}
1287
+		}
1288 1288
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1289 1289
 		global $globalDBdriver;
1290 1290
 		if ($globalDBdriver == 'mysql') {
@@ -1300,14 +1300,14 @@  discard block
 block discarded – undo
1300 1300
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1301 1301
 			}
1302 1302
 		}
1303
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1304
-                 try {
1305
-                        $sth = $this->db->prepare($query);
1306
-                        $sth->execute($query_values);
1307
-                } catch(PDOException $e) {
1308
-                        return "error : ".$e->getMessage();
1309
-                }
1310
-        }
1303
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1304
+				 try {
1305
+						$sth = $this->db->prepare($query);
1306
+						$sth->execute($query_values);
1307
+				} catch(PDOException $e) {
1308
+						return "error : ".$e->getMessage();
1309
+				}
1310
+		}
1311 1311
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1312 1312
 		global $globalDBdriver;
1313 1313
 		if ($globalDBdriver == 'mysql') {
@@ -1323,14 +1323,14 @@  discard block
 block discarded – undo
1323 1323
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1324 1324
 			}
1325 1325
 		}
1326
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1327
-                 try {
1328
-                        $sth = $this->db->prepare($query);
1329
-                        $sth->execute($query_values);
1330
-                } catch(PDOException $e) {
1331
-                        return "error : ".$e->getMessage();
1332
-                }
1333
-        }
1326
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1327
+				 try {
1328
+						$sth = $this->db->prepare($query);
1329
+						$sth->execute($query_values);
1330
+				} catch(PDOException $e) {
1331
+						return "error : ".$e->getMessage();
1332
+				}
1333
+		}
1334 1334
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1335 1335
 		global $globalDBdriver;
1336 1336
 		if ($globalDBdriver == 'mysql') {
@@ -1346,14 +1346,14 @@  discard block
 block discarded – undo
1346 1346
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1347 1347
 			}
1348 1348
 		}
1349
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1350
-                 try {
1351
-                        $sth = $this->db->prepare($query);
1352
-                        $sth->execute($query_values);
1353
-                } catch(PDOException $e) {
1354
-                        return "error : ".$e->getMessage();
1355
-                }
1356
-        }
1349
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1350
+				 try {
1351
+						$sth = $this->db->prepare($query);
1352
+						$sth->execute($query_values);
1353
+				} catch(PDOException $e) {
1354
+						return "error : ".$e->getMessage();
1355
+				}
1356
+		}
1357 1357
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1358 1358
 		global $globalDBdriver;
1359 1359
 		if ($globalDBdriver == 'mysql') {
@@ -1369,14 +1369,14 @@  discard block
 block discarded – undo
1369 1369
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1370 1370
 			}
1371 1371
 		}
1372
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1373
-                 try {
1374
-                        $sth = $this->db->prepare($query);
1375
-                        $sth->execute($query_values);
1376
-                } catch(PDOException $e) {
1377
-                        return "error : ".$e->getMessage();
1378
-                }
1379
-        }
1372
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1373
+				 try {
1374
+						$sth = $this->db->prepare($query);
1375
+						$sth->execute($query_values);
1376
+				} catch(PDOException $e) {
1377
+						return "error : ".$e->getMessage();
1378
+				}
1379
+		}
1380 1380
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1381 1381
 		global $globalDBdriver;
1382 1382
 		if ($globalDBdriver == 'mysql') {
@@ -1392,14 +1392,14 @@  discard block
 block discarded – undo
1392 1392
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1393 1393
 			}
1394 1394
 		}
1395
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1396
-                 try {
1397
-                        $sth = $this->db->prepare($query);
1398
-                        $sth->execute($query_values);
1399
-                } catch(PDOException $e) {
1400
-                        return "error : ".$e->getMessage();
1401
-                }
1402
-        }
1395
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1396
+				 try {
1397
+						$sth = $this->db->prepare($query);
1398
+						$sth->execute($query_values);
1399
+				} catch(PDOException $e) {
1400
+						return "error : ".$e->getMessage();
1401
+				}
1402
+		}
1403 1403
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1404 1404
 		global $globalDBdriver;
1405 1405
 		if ($airport_icao != '') {
@@ -1423,8 +1423,8 @@  discard block
 block discarded – undo
1423 1423
 			} catch(PDOException $e) {
1424 1424
 				return "error : ".$e->getMessage();
1425 1425
 			}
1426
-                }
1427
-        }
1426
+				}
1427
+		}
1428 1428
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1429 1429
 		global $globalDBdriver;
1430 1430
 		if ($airport_icao != '') {
@@ -1440,8 +1440,8 @@  discard block
 block discarded – undo
1440 1440
 			} catch(PDOException $e) {
1441 1441
 				return "error : ".$e->getMessage();
1442 1442
 			}
1443
-                }
1444
-        }
1443
+				}
1444
+		}
1445 1445
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1446 1446
 		global $globalDBdriver;
1447 1447
 		if ($airport_icao != '') {
@@ -1458,15 +1458,15 @@  discard block
 block discarded – undo
1458 1458
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1459 1459
 				}
1460 1460
 			}
1461
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1461
+					$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1462 1462
 			 try {
1463
-                    		$sth = $this->db->prepare($query);
1464
-	                        $sth->execute($query_values);
1465
-    		        } catch(PDOException $e) {
1466
-            		        return "error : ".$e->getMessage();
1467
-	                }
1468
-	        }
1469
-        }
1463
+							$sth = $this->db->prepare($query);
1464
+							$sth->execute($query_values);
1465
+					} catch(PDOException $e) {
1466
+							return "error : ".$e->getMessage();
1467
+					}
1468
+			}
1469
+		}
1470 1470
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1471 1471
 		global $globalDBdriver;
1472 1472
 		if ($airport_icao != '') {
@@ -1482,46 +1482,46 @@  discard block
 block discarded – undo
1482 1482
 			} catch(PDOException $e) {
1483 1483
 				return "error : ".$e->getMessage();
1484 1484
 			}
1485
-                }
1486
-        }
1485
+				}
1486
+		}
1487 1487
 
1488 1488
 	public function deleteStat($id) {
1489
-                $query = "DELETE FROM stats WHERE stats_id = :id";
1490
-                $query_values = array(':id' => $id);
1491
-                 try {
1492
-                        $sth = $this->db->prepare($query);
1493
-                        $sth->execute($query_values);
1494
-                } catch(PDOException $e) {
1495
-                        return "error : ".$e->getMessage();
1496
-                }
1497
-        }
1489
+				$query = "DELETE FROM stats WHERE stats_id = :id";
1490
+				$query_values = array(':id' => $id);
1491
+				 try {
1492
+						$sth = $this->db->prepare($query);
1493
+						$sth->execute($query_values);
1494
+				} catch(PDOException $e) {
1495
+						return "error : ".$e->getMessage();
1496
+				}
1497
+		}
1498 1498
 	public function deleteStatFlight($type) {
1499
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
1500
-                $query_values = array(':type' => $type);
1501
-                 try {
1502
-                        $sth = $this->db->prepare($query);
1503
-                        $sth->execute($query_values);
1504
-                } catch(PDOException $e) {
1505
-                        return "error : ".$e->getMessage();
1506
-                }
1507
-        }
1499
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1500
+				$query_values = array(':type' => $type);
1501
+				 try {
1502
+						$sth = $this->db->prepare($query);
1503
+						$sth->execute($query_values);
1504
+				} catch(PDOException $e) {
1505
+						return "error : ".$e->getMessage();
1506
+				}
1507
+		}
1508 1508
 	public function deleteStatAirport($type) {
1509
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
1510
-                $query_values = array(':type' => $type);
1511
-                 try {
1512
-                        $sth = $this->db->prepare($query);
1513
-                        $sth->execute($query_values);
1514
-                } catch(PDOException $e) {
1515
-                        return "error : ".$e->getMessage();
1516
-                }
1517
-        }
1509
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1510
+				$query_values = array(':type' => $type);
1511
+				 try {
1512
+						$sth = $this->db->prepare($query);
1513
+						$sth->execute($query_values);
1514
+				} catch(PDOException $e) {
1515
+						return "error : ".$e->getMessage();
1516
+				}
1517
+		}
1518 1518
         
1519
-        public function addOldStats() {
1520
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1521
-    		$Common = new Common();
1522
-    		$Connection = new Connection();
1523
-    		date_default_timezone_set('UTC');
1524
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
1519
+		public function addOldStats() {
1520
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear;
1521
+			$Common = new Common();
1522
+			$Connection = new Connection();
1523
+			date_default_timezone_set('UTC');
1524
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
1525 1525
 			if ($globalDebug) echo 'Update stats !'."\n";
1526 1526
 			if (isset($last_update[0]['value'])) {
1527 1527
 				$last_update_day = $last_update[0]['value'];
@@ -1568,24 +1568,24 @@  discard block
 block discarded – undo
1568 1568
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1569 1569
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1570 1570
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1571
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1571
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1572 1572
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1573
-	        	$alldata = array();
1573
+				$alldata = array();
1574 1574
 	        	
1575
-    			foreach ($pall as $value) {
1576
-	        		$icao = $value['airport_departure_icao'];
1577
-    				$alldata[$icao] = $value;
1578
-	        	}
1579
-	        	foreach ($dall as $value) {
1580
-    				$icao = $value['airport_departure_icao'];
1581
-        			if (isset($alldata[$icao])) {
1582
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1583
-        			} else $alldata[$icao] = $value;
1584
-			}
1585
-    			$count = array();
1586
-    			foreach ($alldata as $key => $row) {
1587
-    				$count[$key] = $row['airport_departure_icao_count'];
1588
-        		}
1575
+				foreach ($pall as $value) {
1576
+					$icao = $value['airport_departure_icao'];
1577
+					$alldata[$icao] = $value;
1578
+				}
1579
+				foreach ($dall as $value) {
1580
+					$icao = $value['airport_departure_icao'];
1581
+					if (isset($alldata[$icao])) {
1582
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1583
+					} else $alldata[$icao] = $value;
1584
+			}
1585
+				$count = array();
1586
+				foreach ($alldata as $key => $row) {
1587
+					$count[$key] = $row['airport_departure_icao_count'];
1588
+				}
1589 1589
 			array_multisort($count,SORT_DESC,$alldata);
1590 1590
 			foreach ($alldata as $number) {
1591 1591
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
@@ -1593,25 +1593,25 @@  discard block
 block discarded – undo
1593 1593
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1594 1594
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1595 1595
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1596
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1596
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1597 1597
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1598
-	        	$alldata = array();
1599
-    			foreach ($pall as $value) {
1600
-	        		$icao = $value['airport_arrival_icao'];
1601
-    				$alldata[$icao] = $value;
1602
-	        	}
1603
-	        	foreach ($dall as $value) {
1604
-    				$icao = $value['airport_arrival_icao'];
1605
-        			if (isset($alldata[$icao])) {
1606
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1607
-	        		} else $alldata[$icao] = $value;
1608
-    			}
1609
-        		$count = array();
1610
-        		foreach ($alldata as $key => $row) {
1611
-        			$count[$key] = $row['airport_arrival_icao_count'];
1612
-	        	}
1613
-    			array_multisort($count,SORT_DESC,$alldata);
1614
-                        foreach ($alldata as $number) {
1598
+				$alldata = array();
1599
+				foreach ($pall as $value) {
1600
+					$icao = $value['airport_arrival_icao'];
1601
+					$alldata[$icao] = $value;
1602
+				}
1603
+				foreach ($dall as $value) {
1604
+					$icao = $value['airport_arrival_icao'];
1605
+					if (isset($alldata[$icao])) {
1606
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1607
+					} else $alldata[$icao] = $value;
1608
+				}
1609
+				$count = array();
1610
+				foreach ($alldata as $key => $row) {
1611
+					$count[$key] = $row['airport_arrival_icao_count'];
1612
+				}
1613
+				array_multisort($count,SORT_DESC,$alldata);
1614
+						foreach ($alldata as $number) {
1615 1615
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1616 1616
 			}
1617 1617
 			if ($Connection->tableExists('countries')) {
@@ -1684,8 +1684,8 @@  discard block
 block discarded – undo
1684 1684
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 1685
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1686 1686
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
1687
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1688
-        		/*
1687
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1688
+				/*
1689 1689
 	        	$alldata = array();
1690 1690
     			foreach ($pall as $value) {
1691 1691
 	        		$icao = $value['departure_airport_icao'];
@@ -1704,29 +1704,29 @@  discard block
 block discarded – undo
1704 1704
 	        	}
1705 1705
     			array_multisort($count,SORT_DESC,$alldata);
1706 1706
     			*/
1707
-    			foreach ($dall as $value) {
1708
-    				$icao = $value['departure_airport_icao'];
1709
-    				$ddate = $value['date'];
1710
-    				$find = false;
1711
-    				foreach ($pall as $pvalue) {
1712
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1713
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1714
-    						$find = true;
1715
-    						break;
1716
-    					}
1717
-    				}
1718
-    				if ($find === false) {
1719
-    					$pall[] = $value;
1720
-    				}
1721
-    			}
1722
-    			$alldata = $pall;
1707
+				foreach ($dall as $value) {
1708
+					$icao = $value['departure_airport_icao'];
1709
+					$ddate = $value['date'];
1710
+					$find = false;
1711
+					foreach ($pall as $pvalue) {
1712
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1713
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1714
+							$find = true;
1715
+							break;
1716
+						}
1717
+					}
1718
+					if ($find === false) {
1719
+						$pall[] = $value;
1720
+					}
1721
+				}
1722
+				$alldata = $pall;
1723 1723
 			foreach ($alldata as $number) {
1724 1724
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1725 1725
 			}
1726 1726
 			echo '...Arrival'."\n";
1727 1727
 			$pall = $Spotter->getLast7DaysAirportsArrival();
1728
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1729
-        		/*
1728
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1729
+				/*
1730 1730
 	        	$alldata = array();
1731 1731
     			foreach ($pall as $value) {
1732 1732
 	        		$icao = $value['arrival_airport_icao'];
@@ -1746,22 +1746,22 @@  discard block
 block discarded – undo
1746 1746
     			*/
1747 1747
 
1748 1748
 
1749
-    			foreach ($dall as $value) {
1750
-    				$icao = $value['arrival_airport_icao'];
1751
-    				$ddate = $value['date'];
1752
-    				$find = false;
1753
-    				foreach ($pall as $pvalue) {
1754
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1755
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1756
-    						$find = true;
1757
-    						break;
1758
-    					}
1759
-    				}
1760
-    				if ($find === false) {
1761
-    					$pall[] = $value;
1762
-    				}
1763
-    			}
1764
-    			$alldata = $pall;
1749
+				foreach ($dall as $value) {
1750
+					$icao = $value['arrival_airport_icao'];
1751
+					$ddate = $value['date'];
1752
+					$find = false;
1753
+					foreach ($pall as $pvalue) {
1754
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1755
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1756
+							$find = true;
1757
+							break;
1758
+						}
1759
+					}
1760
+					if ($find === false) {
1761
+						$pall[] = $value;
1762
+					}
1763
+				}
1764
+				$alldata = $pall;
1765 1765
 			foreach ($alldata as $number) {
1766 1766
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1767 1767
 			}
@@ -1836,51 +1836,51 @@  discard block
 block discarded – undo
1836 1836
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1837 1837
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1838 1838
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1839
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1839
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1840 1840
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1841
-	        	//$alldata = array();
1842
-    			foreach ($dall as $value) {
1843
-    				$icao = $value['airport_departure_icao'];
1844
-    				$dicao = $value['airline_icao'];
1845
-    				$find = false;
1846
-    				foreach ($pall as $pvalue) {
1847
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1848
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1849
-    						$find = true;
1850
-    						break;
1851
-    					}
1852
-    				}
1853
-    				if ($find === false) {
1854
-    					$pall[] = $value;
1855
-    				}
1856
-    			}
1857
-    			$alldata = $pall;
1841
+				//$alldata = array();
1842
+				foreach ($dall as $value) {
1843
+					$icao = $value['airport_departure_icao'];
1844
+					$dicao = $value['airline_icao'];
1845
+					$find = false;
1846
+					foreach ($pall as $pvalue) {
1847
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1848
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1849
+							$find = true;
1850
+							break;
1851
+						}
1852
+					}
1853
+					if ($find === false) {
1854
+						$pall[] = $value;
1855
+					}
1856
+				}
1857
+				$alldata = $pall;
1858 1858
 			foreach ($alldata as $number) {
1859 1859
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
1860 1860
 			}
1861 1861
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1862 1862
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1863 1863
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1864
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1864
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1865 1865
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1866
-	        	//$alldata = array();
1867
-    			foreach ($dall as $value) {
1868
-    				$icao = $value['airport_arrival_icao'];
1869
-    				$dicao = $value['airline_icao'];
1870
-    				$find = false;
1871
-    				foreach ($pall as $pvalue) {
1872
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1873
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1874
-    						$find = true;
1875
-    						break;
1876
-    					}
1877
-    				}
1878
-    				if ($find === false) {
1879
-    					$pall[] = $value;
1880
-    				}
1881
-    			}
1882
-    			$alldata = $pall;
1883
-                        foreach ($alldata as $number) {
1866
+				//$alldata = array();
1867
+				foreach ($dall as $value) {
1868
+					$icao = $value['airport_arrival_icao'];
1869
+					$dicao = $value['airline_icao'];
1870
+					$find = false;
1871
+					foreach ($pall as $pvalue) {
1872
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1873
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1874
+							$find = true;
1875
+							break;
1876
+						}
1877
+					}
1878
+					if ($find === false) {
1879
+						$pall[] = $value;
1880
+					}
1881
+				}
1882
+				$alldata = $pall;
1883
+						foreach ($alldata as $number) {
1884 1884
 				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
1885 1885
 			}
1886 1886
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -1913,47 +1913,47 @@  discard block
 block discarded – undo
1913 1913
 			}
1914 1914
 			if ($globalDebug) echo '...Departure'."\n";
1915 1915
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1916
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1917
-    			foreach ($dall as $value) {
1918
-    				$icao = $value['departure_airport_icao'];
1919
-    				$airline = $value['airline_icao'];
1920
-    				$ddate = $value['date'];
1921
-    				$find = false;
1922
-    				foreach ($pall as $pvalue) {
1923
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1924
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1925
-    						$find = true;
1926
-    						break;
1927
-    					}
1928
-    				}
1929
-    				if ($find === false) {
1930
-    					$pall[] = $value;
1931
-    				}
1932
-    			}
1933
-    			$alldata = $pall;
1916
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1917
+				foreach ($dall as $value) {
1918
+					$icao = $value['departure_airport_icao'];
1919
+					$airline = $value['airline_icao'];
1920
+					$ddate = $value['date'];
1921
+					$find = false;
1922
+					foreach ($pall as $pvalue) {
1923
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1924
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1925
+							$find = true;
1926
+							break;
1927
+						}
1928
+					}
1929
+					if ($find === false) {
1930
+						$pall[] = $value;
1931
+					}
1932
+				}
1933
+				$alldata = $pall;
1934 1934
 			foreach ($alldata as $number) {
1935 1935
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
1936 1936
 			}
1937 1937
 			if ($globalDebug) echo '...Arrival'."\n";
1938 1938
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1939
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1940
-    			foreach ($dall as $value) {
1941
-    				$icao = $value['arrival_airport_icao'];
1942
-    				$airline = $value['airline_icao'];
1943
-    				$ddate = $value['date'];
1944
-    				$find = false;
1945
-    				foreach ($pall as $pvalue) {
1946
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1947
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1948
-    						$find = true;
1949
-    						break;
1950
-    					}
1951
-    				}
1952
-    				if ($find === false) {
1953
-    					$pall[] = $value;
1954
-    				}
1955
-    			}
1956
-    			$alldata = $pall;
1939
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1940
+				foreach ($dall as $value) {
1941
+					$icao = $value['arrival_airport_icao'];
1942
+					$airline = $value['airline_icao'];
1943
+					$ddate = $value['date'];
1944
+					$find = false;
1945
+					foreach ($pall as $pvalue) {
1946
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1947
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1948
+							$find = true;
1949
+							break;
1950
+						}
1951
+					}
1952
+					if ($find === false) {
1953
+						$pall[] = $value;
1954
+					}
1955
+				}
1956
+				$alldata = $pall;
1957 1957
 			foreach ($alldata as $number) {
1958 1958
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
1959 1959
 			}
@@ -2038,44 +2038,44 @@  discard block
 block discarded – undo
2038 2038
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2039 2039
 				}
2040 2040
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2041
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2042
-		        	$alldata = array();
2043
-	    			foreach ($pall as $value) {
2044
-		        		$icao = $value['airport_departure_icao'];
2045
-    					$alldata[$icao] = $value;
2046
-	    			}
2047
-		        	foreach ($dall as $value) {
2048
-	    				$icao = $value['airport_departure_icao'];
2049
-        				if (isset($alldata[$icao])) {
2050
-    						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2051
-        				} else $alldata[$icao] = $value;
2052
-				}
2053
-	    			$count = array();
2054
-    				foreach ($alldata as $key => $row) {
2055
-    					$count[$key] = $row['airport_departure_icao_count'];
2056
-    				}
2041
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2042
+					$alldata = array();
2043
+					foreach ($pall as $value) {
2044
+						$icao = $value['airport_departure_icao'];
2045
+						$alldata[$icao] = $value;
2046
+					}
2047
+					foreach ($dall as $value) {
2048
+						$icao = $value['airport_departure_icao'];
2049
+						if (isset($alldata[$icao])) {
2050
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2051
+						} else $alldata[$icao] = $value;
2052
+				}
2053
+					$count = array();
2054
+					foreach ($alldata as $key => $row) {
2055
+						$count[$key] = $row['airport_departure_icao_count'];
2056
+					}
2057 2057
 				array_multisort($count,SORT_DESC,$alldata);
2058 2058
 				foreach ($alldata as $number) {
2059
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2059
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2060 2060
 				}
2061 2061
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2062
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2062
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2063 2063
 				$alldata = array();
2064
-    				foreach ($pall as $value) {
2065
-		        		$icao = $value['airport_arrival_icao'];
2066
-    					$alldata[$icao] = $value;
2067
-	    			}
2068
-		        	foreach ($dall as $value) {
2069
-	    				$icao = $value['airport_arrival_icao'];
2070
-        				if (isset($alldata[$icao])) {
2071
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2072
-		        		} else $alldata[$icao] = $value;
2073
-	    			}
2074
-        			$count = array();
2075
-        			foreach ($alldata as $key => $row) {
2076
-    					$count[$key] = $row['airport_arrival_icao_count'];
2077
-		        	}
2078
-        			array_multisort($count,SORT_DESC,$alldata);
2064
+					foreach ($pall as $value) {
2065
+						$icao = $value['airport_arrival_icao'];
2066
+						$alldata[$icao] = $value;
2067
+					}
2068
+					foreach ($dall as $value) {
2069
+						$icao = $value['airport_arrival_icao'];
2070
+						if (isset($alldata[$icao])) {
2071
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2072
+						} else $alldata[$icao] = $value;
2073
+					}
2074
+					$count = array();
2075
+					foreach ($alldata as $key => $row) {
2076
+						$count[$key] = $row['airport_arrival_icao_count'];
2077
+					}
2078
+					array_multisort($count,SORT_DESC,$alldata);
2079 2079
 				foreach ($alldata as $number) {
2080 2080
 					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2081 2081
 				}
@@ -2108,45 +2108,45 @@  discard block
 block discarded – undo
2108 2108
 				}
2109 2109
 				echo '...Departure'."\n";
2110 2110
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2111
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2111
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2112 2112
 				foreach ($dall as $value) {
2113
-    					$icao = $value['departure_airport_icao'];
2114
-    					$ddate = $value['date'];
2115
-    					$find = false;
2116
-    					foreach ($pall as $pvalue) {
2117
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2118
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2119
-	    						$find = true;
2120
-    							break;
2121
-    						}
2122
-    					}
2123
-    					if ($find === false) {
2124
-    						$pall[] = $value;
2125
-	    				}
2126
-    				}
2127
-	    			$alldata = $pall;
2113
+						$icao = $value['departure_airport_icao'];
2114
+						$ddate = $value['date'];
2115
+						$find = false;
2116
+						foreach ($pall as $pvalue) {
2117
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2118
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2119
+								$find = true;
2120
+								break;
2121
+							}
2122
+						}
2123
+						if ($find === false) {
2124
+							$pall[] = $value;
2125
+						}
2126
+					}
2127
+					$alldata = $pall;
2128 2128
 				foreach ($alldata as $number) {
2129 2129
 					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
2130 2130
 				}
2131 2131
 				echo '...Arrival'."\n";
2132 2132
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2133
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2133
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2134 2134
 				foreach ($dall as $value) {
2135 2135
 					$icao = $value['arrival_airport_icao'];
2136 2136
 					$ddate = $value['date'];
2137
-    					$find = false;
2137
+						$find = false;
2138 2138
 					foreach ($pall as $pvalue) {
2139
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2140
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2141
-    							$find = true;
2142
-    							break;
2143
-	    					}
2144
-    					}
2145
-    					if ($find === false) {
2146
-    						$pall[] = $value;
2147
-	    				}
2148
-    				}
2149
-    				$alldata = $pall;
2139
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2140
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2141
+								$find = true;
2142
+								break;
2143
+							}
2144
+						}
2145
+						if ($find === false) {
2146
+							$pall[] = $value;
2147
+						}
2148
+					}
2149
+					$alldata = $pall;
2150 2150
 				foreach ($alldata as $number) {
2151 2151
 					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
2152 2152
 				}
Please login to merge, or discard this patch.
Braces   +482 added lines, -167 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	public function __construct($dbc = null) {
15 15
 		global $globalFilterName;
16
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16
+		if (isset($globalFilterName)) {
17
+			$this->filter_name = $globalFilterName;
18
+		}
17 19
 		$Connection = new Connection($dbc);
18 20
 		$this->db = $Connection->db();
19 21
         }
@@ -81,7 +83,9 @@  discard block
 block discarded – undo
81 83
                 }
82 84
         }
83 85
 	public function getAllAirlineNames($filter_name = '') {
84
-		if ($filter_name == '') $filter_name = $this->filter_name;
86
+		if ($filter_name == '') {
87
+			$filter_name = $this->filter_name;
88
+		}
85 89
                 $query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
86 90
                  try {
87 91
                         $sth = $this->db->prepare($query);
@@ -93,7 +97,9 @@  discard block
 block discarded – undo
93 97
                 return $all;
94 98
         }
95 99
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
96
-		if ($filter_name == '') $filter_name = $this->filter_name;
100
+		if ($filter_name == '') {
101
+			$filter_name = $this->filter_name;
102
+		}
97 103
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
98 104
                  try {
99 105
                         $sth = $this->db->prepare($query);
@@ -105,7 +111,9 @@  discard block
 block discarded – undo
105 111
                 return $all;
106 112
         }
107 113
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
108
-		if ($filter_name == '') $filter_name = $this->filter_name;
114
+		if ($filter_name == '') {
115
+			$filter_name = $this->filter_name;
116
+		}
109 117
                 $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
110 118
                  try {
111 119
                         $sth = $this->db->prepare($query);
@@ -117,7 +125,9 @@  discard block
 block discarded – undo
117 125
                 return $all;
118 126
         }
119 127
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
120
-		if ($filter_name == '') $filter_name = $this->filter_name;
128
+		if ($filter_name == '') {
129
+			$filter_name = $this->filter_name;
130
+		}
121 131
                 $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
122 132
                  try {
123 133
                         $sth = $this->db->prepare($query);
@@ -130,7 +140,9 @@  discard block
 block discarded – undo
130 140
         }
131 141
 
132 142
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
133
-		if ($filter_name == '') $filter_name = $this->filter_name;
143
+		if ($filter_name == '') {
144
+			$filter_name = $this->filter_name;
145
+		}
134 146
                 $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
135 147
                  try {
136 148
                         $sth = $this->db->prepare($query);
@@ -143,7 +155,9 @@  discard block
 block discarded – undo
143 155
         }
144 156
 
145 157
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
146
-		if ($filter_name == '') $filter_name = $this->filter_name;
158
+		if ($filter_name == '') {
159
+			$filter_name = $this->filter_name;
160
+		}
147 161
                 $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
148 162
                  try {
149 163
                         $sth = $this->db->prepare($query);
@@ -158,10 +172,15 @@  discard block
 block discarded – undo
158 172
 
159 173
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
160 174
 		global $globalStatsFilters;
161
-		if ($filter_name == '') $filter_name = $this->filter_name;
175
+		if ($filter_name == '') {
176
+			$filter_name = $this->filter_name;
177
+		}
162 178
 		if ($year == '' && $month == '') {
163
-			if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
164
-			else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
179
+			if ($limit) {
180
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
181
+			} else {
182
+				$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183
+			}
165 184
 			try {
166 185
 				$sth = $this->db->prepare($query);
167 186
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -169,7 +188,9 @@  discard block
 block discarded – undo
169 188
 				echo "error : ".$e->getMessage();
170 189
 			}
171 190
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
172
-		} else $all = array();
191
+		} else {
192
+			$all = array();
193
+		}
173 194
                 if (empty($all)) {
174 195
             	    $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
175 196
             	    if ($filter_name != '') {
@@ -183,10 +204,15 @@  discard block
 block discarded – undo
183 204
 	}
184 205
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
185 206
 		global $globalStatsFilters;
186
-		if ($filter_name == '') $filter_name = $this->filter_name;
207
+		if ($filter_name == '') {
208
+			$filter_name = $this->filter_name;
209
+		}
187 210
 		if ($year == '' && $month == '') {
188
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
189
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
211
+			if ($limit) {
212
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
213
+			} else {
214
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC";
215
+			}
190 216
 			try {
191 217
 				$sth = $this->db->prepare($query);
192 218
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -194,7 +220,9 @@  discard block
 block discarded – undo
194 220
 				echo "error : ".$e->getMessage();
195 221
 			}
196 222
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
197
-		} else $all = array();
223
+		} else {
224
+			$all = array();
225
+		}
198 226
                 if (empty($all)) {
199 227
             		$Spotter = new Spotter($this->db);
200 228
             		$filters = array();
@@ -209,10 +237,15 @@  discard block
 block discarded – undo
209 237
 	}
210 238
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
211 239
 		global $globalStatsFilters;
212
-		if ($filter_name == '') $filter_name = $this->filter_name;
240
+		if ($filter_name == '') {
241
+			$filter_name = $this->filter_name;
242
+		}
213 243
 		if ($year == '' && $month == '') {
214
-			if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
215
-			else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
244
+			if ($limit) {
245
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
246
+			} else {
247
+				$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
248
+			}
216 249
 			try {
217 250
 				$sth = $this->db->prepare($query);
218 251
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -220,7 +253,9 @@  discard block
 block discarded – undo
220 253
 				echo "error : ".$e->getMessage();
221 254
 			}
222 255
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
223
-		} else $all = array();
256
+		} else {
257
+			$all = array();
258
+		}
224 259
 		if (empty($all)) {
225 260
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
226 261
 			if ($filter_name != '') {
@@ -235,10 +270,15 @@  discard block
 block discarded – undo
235 270
 
236 271
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
237 272
 		global $globalStatsFilters;
238
-		if ($filter_name == '') $filter_name = $this->filter_name;
273
+		if ($filter_name == '') {
274
+			$filter_name = $this->filter_name;
275
+		}
239 276
 		if ($year == '' && $month == '') {
240
-			if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
241
-			else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
277
+			if ($limit) {
278
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
279
+			} else {
280
+				$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
281
+			}
242 282
 			try {
243 283
 				$sth = $this->db->prepare($query);
244 284
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -246,7 +286,9 @@  discard block
 block discarded – undo
246 286
 				echo "error : ".$e->getMessage();
247 287
 			}
248 288
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
249
-		} else $all = array();
289
+		} else {
290
+			$all = array();
291
+		}
250 292
                 if (empty($all)) {
251 293
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
252 294
 			if ($filter_name != '') {
@@ -260,9 +302,14 @@  discard block
 block discarded – undo
260 302
 	}
261 303
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
262 304
 		global $globalStatsFilters;
263
-		if ($filter_name == '') $filter_name = $this->filter_name;
264
-		if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
265
-		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
305
+		if ($filter_name == '') {
306
+			$filter_name = $this->filter_name;
307
+		}
308
+		if ($limit) {
309
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
310
+		} else {
311
+			$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
312
+		}
266 313
                  try {
267 314
                         $sth = $this->db->prepare($query);
268 315
                         $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -284,17 +331,29 @@  discard block
 block discarded – undo
284 331
 
285 332
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
286 333
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
287
-		if ($filter_name == '') $filter_name = $this->filter_name;
334
+		if ($filter_name == '') {
335
+			$filter_name = $this->filter_name;
336
+		}
288 337
 		if ($year == '' && $month == '') {
289
-			if ($globalVATSIM) $forsource = 'vatsim';
290
-			if ($globalIVAO) $forsource = 'ivao';
338
+			if ($globalVATSIM) {
339
+				$forsource = 'vatsim';
340
+			}
341
+			if ($globalIVAO) {
342
+				$forsource = 'ivao';
343
+			}
291 344
 			if (isset($forsource)) {
292
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
293
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
345
+				if ($limit) {
346
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
347
+				} else {
348
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
349
+				}
294 350
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
295 351
 			} else {
296
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
297
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
352
+				if ($limit) {
353
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
354
+				} else {
355
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
356
+				}
298 357
 				$query_values = array(':filter_name' => $filter_name);
299 358
 			}
300 359
 			try {
@@ -304,7 +363,9 @@  discard block
 block discarded – undo
304 363
 				echo "error : ".$e->getMessage();
305 364
 			}
306 365
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
307
-		} else $all = array();
366
+		} else {
367
+			$all = array();
368
+		}
308 369
                 if (empty($all)) {
309 370
 	                $Spotter = new Spotter($this->db);
310 371
             		$filters = array();
@@ -319,10 +380,15 @@  discard block
 block discarded – undo
319 380
 	}
320 381
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
321 382
 		global $globalStatsFilters;
322
-		if ($filter_name == '') $filter_name = $this->filter_name;
383
+		if ($filter_name == '') {
384
+			$filter_name = $this->filter_name;
385
+		}
323 386
 		if ($year == '' && $month == '') {
324
-			if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
325
-			else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
387
+			if ($limit) {
388
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
389
+			} else {
390
+				$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
391
+			}
326 392
 			try {
327 393
 				$sth = $this->db->prepare($query);
328 394
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -330,7 +396,9 @@  discard block
 block discarded – undo
330 396
 				echo "error : ".$e->getMessage();
331 397
 			}
332 398
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
333
-		} else $all = array();
399
+		} else {
400
+			$all = array();
401
+		}
334 402
                 if (empty($all)) {
335 403
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
336 404
 			if ($filter_name != '') {
@@ -344,10 +412,15 @@  discard block
 block discarded – undo
344 412
 	}
345 413
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
346 414
 		global $globalStatsFilters;
347
-		if ($filter_name == '') $filter_name = $this->filter_name;
415
+		if ($filter_name == '') {
416
+			$filter_name = $this->filter_name;
417
+		}
348 418
 		if ($year == '' && $month == '') {
349
-			if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
350
-			else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
419
+			if ($limit) {
420
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
421
+			} else {
422
+				$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
423
+			}
351 424
 			 try {
352 425
 				$sth = $this->db->prepare($query);
353 426
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -355,7 +428,9 @@  discard block
 block discarded – undo
355 428
 				echo "error : ".$e->getMessage();
356 429
 			}
357 430
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
358
-		} else $all = array();
431
+		} else {
432
+			$all = array();
433
+		}
359 434
 		if (empty($all)) {
360 435
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
361 436
 			if ($filter_name != '') {
@@ -369,11 +444,16 @@  discard block
 block discarded – undo
369 444
 	}
370 445
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
371 446
 		$Connection = new Connection();
372
-		if ($filter_name == '') $filter_name = $this->filter_name;
447
+		if ($filter_name == '') {
448
+			$filter_name = $this->filter_name;
449
+		}
373 450
 		if ($Connection->tableExists('countries')) {
374 451
 			if ($year == '' && $month == '') {
375
-				if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
376
-				else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
452
+				if ($limit) {
453
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
454
+				} else {
455
+					$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
456
+				}
377 457
 				 try {
378 458
 					$sth = $this->db->prepare($query);
379 459
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -388,17 +468,24 @@  discard block
 block discarded – undo
388 468
                 }
389 469
                 */
390 470
 				return $all;
391
-			} else return array();
471
+			} else {
472
+				return array();
473
+			}
392 474
 		} else {
393 475
 			return array();
394 476
 		}
395 477
 	}
396 478
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
397 479
 		global $globalStatsFilters;
398
-		if ($filter_name == '') $filter_name = $this->filter_name;
480
+		if ($filter_name == '') {
481
+			$filter_name = $this->filter_name;
482
+		}
399 483
 		if ($year == '' && $month == '') {
400
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
401
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
484
+			if ($limit) {
485
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
486
+			} else {
487
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
488
+			}
402 489
 			try {
403 490
 				$sth = $this->db->prepare($query);
404 491
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -406,7 +493,9 @@  discard block
 block discarded – undo
406 493
 				echo "error : ".$e->getMessage();
407 494
 			}
408 495
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409
-		} else $all = array();
496
+		} else {
497
+			$all = array();
498
+		}
410 499
 		if (empty($all)) {
411 500
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
412 501
 			if ($filter_name != '') {
@@ -421,10 +510,15 @@  discard block
 block discarded – undo
421 510
 
422 511
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
423 512
 		global $globalStatsFilters;
424
-		if ($filter_name == '') $filter_name = $this->filter_name;
513
+		if ($filter_name == '') {
514
+			$filter_name = $this->filter_name;
515
+		}
425 516
 		if ($year == '' && $month == '') {
426
-			if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
427
-			else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
517
+			if ($limit) {
518
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
519
+			} else {
520
+				$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
521
+			}
428 522
 			try {
429 523
 				$sth = $this->db->prepare($query);
430 524
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -432,7 +526,9 @@  discard block
 block discarded – undo
432 526
 				echo "error : ".$e->getMessage();
433 527
 			}
434 528
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
435
-		} else $all = array();
529
+		} else {
530
+			$all = array();
531
+		}
436 532
                 if (empty($all)) {
437 533
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
438 534
 			if ($filter_name != '') {
@@ -446,10 +542,15 @@  discard block
 block discarded – undo
446 542
 	}
447 543
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 544
 		global $globalStatsFilters;
449
-		if ($filter_name == '') $filter_name = $this->filter_name;
545
+		if ($filter_name == '') {
546
+			$filter_name = $this->filter_name;
547
+		}
450 548
 		if ($year == '' && $month == '') {
451
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
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 FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
549
+			if ($limit) {
550
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
551
+			} else {
552
+				$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
553
+			}
453 554
 			try {
454 555
 				$sth = $this->db->prepare($query);
455 556
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -457,7 +558,9 @@  discard block
 block discarded – undo
457 558
 				echo "error : ".$e->getMessage();
458 559
 			}
459 560
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
460
-		} else $all = array();
561
+		} else {
562
+			$all = array();
563
+		}
461 564
                 if (empty($all)) {
462 565
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
463 566
             		if ($filter_name != '') {
@@ -478,7 +581,9 @@  discard block
 block discarded – undo
478 581
         			$icao = $value['airport_departure_icao'];
479 582
         			if (isset($all[$icao])) {
480 583
         				$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
481
-        			} else $all[$icao] = $value;
584
+        			} else {
585
+        				$all[$icao] = $value;
586
+        			}
482 587
         		}
483 588
         		$count = array();
484 589
         		foreach ($all as $key => $row) {
@@ -490,10 +595,15 @@  discard block
 block discarded – undo
490 595
 	}
491 596
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
492 597
 		global $globalStatsFilters;
493
-		if ($filter_name == '') $filter_name = $this->filter_name;
598
+		if ($filter_name == '') {
599
+			$filter_name = $this->filter_name;
600
+		}
494 601
 		if ($year == '' && $month == '') {
495
-			if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
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 FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
602
+			if ($limit) {
603
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
604
+			} else {
605
+				$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
606
+			}
497 607
 			try {
498 608
 				$sth = $this->db->prepare($query);
499 609
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -501,7 +611,9 @@  discard block
 block discarded – undo
501 611
 				echo "error : ".$e->getMessage();
502 612
 			}
503 613
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
504
-		} else $all = array();
614
+		} else {
615
+			$all = array();
616
+		}
505 617
 		if (empty($all)) {
506 618
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507 619
 			if ($filter_name != '') {
@@ -522,7 +634,9 @@  discard block
 block discarded – undo
522 634
         			$icao = $value['airport_arrival_icao'];
523 635
         			if (isset($all[$icao])) {
524 636
         				$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
525
-        			} else $all[$icao] = $value;
637
+        			} else {
638
+        				$all[$icao] = $value;
639
+        			}
526 640
         		}
527 641
         		$count = array();
528 642
         		foreach ($all as $key => $row) {
@@ -535,13 +649,21 @@  discard block
 block discarded – undo
535 649
 	}
536 650
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
537 651
 		global $globalDBdriver, $globalStatsFilters;
538
-		if ($filter_name == '') $filter_name = $this->filter_name;
652
+		if ($filter_name == '') {
653
+			$filter_name = $this->filter_name;
654
+		}
539 655
 		if ($globalDBdriver == 'mysql') {
540
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
541
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
656
+			if ($limit) {
657
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
658
+			} else {
659
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
660
+			}
542 661
 		} else {
543
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
544
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
662
+			if ($limit) {
663
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
664
+			} else {
665
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
666
+			}
545 667
 		}
546 668
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
547 669
                  try {
@@ -565,7 +687,9 @@  discard block
 block discarded – undo
565 687
 	
566 688
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
567 689
 		global $globalStatsFilters;
568
-		if ($filter_name == '') $filter_name = $this->filter_name;
690
+		if ($filter_name == '') {
691
+			$filter_name = $this->filter_name;
692
+		}
569 693
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
570 694
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
571 695
                  try {
@@ -587,7 +711,9 @@  discard block
 block discarded – undo
587 711
 	}
588 712
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
589 713
 		global $globalDBdriver, $globalStatsFilters;
590
-		if ($filter_name == '') $filter_name = $this->filter_name;
714
+		if ($filter_name == '') {
715
+			$filter_name = $this->filter_name;
716
+		}
591 717
 		if ($globalDBdriver == 'mysql') {
592 718
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline = :stats_airline AND filter_name = :filter_name";
593 719
 		} else {
@@ -613,7 +739,9 @@  discard block
 block discarded – undo
613 739
 	}
614 740
 	public function countAllDates($stats_airline = '',$filter_name = '') {
615 741
 		global $globalStatsFilters;
616
-		if ($filter_name == '') $filter_name = $this->filter_name;
742
+		if ($filter_name == '') {
743
+			$filter_name = $this->filter_name;
744
+		}
617 745
 		$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name";
618 746
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619 747
                  try {
@@ -635,7 +763,9 @@  discard block
 block discarded – undo
635 763
 	}
636 764
 	public function countAllDatesByAirlines($filter_name = '') {
637 765
 		global $globalStatsFilters;
638
-		if ($filter_name == '') $filter_name = $this->filter_name;
766
+		if ($filter_name == '') {
767
+			$filter_name = $this->filter_name;
768
+		}
639 769
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 770
 		$query_data = array('filter_name' => $filter_name);
641 771
                  try {
@@ -657,7 +787,9 @@  discard block
 block discarded – undo
657 787
 	}
658 788
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 789
 		global $globalStatsFilters, $globalDBdriver;
660
-		if ($filter_name == '') $filter_name = $this->filter_name;
790
+		if ($filter_name == '') {
791
+			$filter_name = $this->filter_name;
792
+		}
661 793
 		if ($globalDBdriver == 'mysql') {
662 794
 			$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
663 795
 		} else {
@@ -726,7 +858,9 @@  discard block
 block discarded – undo
726 858
 	}
727 859
 	public function countAllMilitaryMonths($filter_name = '') {
728 860
 		global $globalStatsFilters;
729
-		if ($filter_name == '') $filter_name = $this->filter_name;
861
+		if ($filter_name == '') {
862
+			$filter_name = $this->filter_name;
863
+		}
730 864
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
731 865
                  try {
732 866
                         $sth = $this->db->prepare($query);
@@ -747,9 +881,14 @@  discard block
 block discarded – undo
747 881
 	}
748 882
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
749 883
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
750
-		if ($filter_name == '') $filter_name = $this->filter_name;
751
-		if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
752
-		else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
884
+		if ($filter_name == '') {
885
+			$filter_name = $this->filter_name;
886
+		}
887
+		if ($limit) {
888
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
889
+		} else {
890
+			$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
891
+		}
753 892
 		if ($orderby == 'hour') {
754 893
 			if ($globalDBdriver == 'mysql') {
755 894
 				//$query .= " ORDER BY flight_date ASC";
@@ -758,7 +897,9 @@  discard block
 block discarded – undo
758 897
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
759 898
 			}
760 899
 		}
761
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
900
+		if ($orderby == 'count') {
901
+			$query .= " ORDER BY hour_count DESC";
902
+		}
762 903
                  try {
763 904
                         $sth = $this->db->prepare($query);
764 905
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
@@ -779,8 +920,12 @@  discard block
 block discarded – undo
779 920
 	
780 921
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
781 922
 		global $globalStatsFilters;
782
-		if ($filter_name == '') $filter_name = $this->filter_name;
783
-		if ($year == '') $year = date('Y');
923
+		if ($filter_name == '') {
924
+			$filter_name = $this->filter_name;
925
+		}
926
+		if ($year == '') {
927
+			$year = date('Y');
928
+		}
784 929
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
785 930
 		if (empty($all)) {
786 931
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -795,8 +940,12 @@  discard block
 block discarded – undo
795 940
 	}
796 941
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
797 942
 		global $globalStatsFilters;
798
-		if ($filter_name == '') $filter_name = $this->filter_name;
799
-		if ($year == '') $year = date('Y');
943
+		if ($filter_name == '') {
944
+			$filter_name = $this->filter_name;
945
+		}
946
+		if ($year == '') {
947
+			$year = date('Y');
948
+		}
800 949
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
801 950
 		if (empty($all)) {
802 951
 		        $filters = array();
@@ -812,8 +961,12 @@  discard block
 block discarded – undo
812 961
 	}
813 962
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
814 963
 		global $globalStatsFilters;
815
-		if ($filter_name == '') $filter_name = $this->filter_name;
816
-		if ($year == '') $year = date('Y');
964
+		if ($filter_name == '') {
965
+			$filter_name = $this->filter_name;
966
+		}
967
+		if ($year == '') {
968
+			$year = date('Y');
969
+		}
817 970
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
818 971
 		if (empty($all)) {
819 972
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
@@ -828,7 +981,9 @@  discard block
 block discarded – undo
828 981
 	}
829 982
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
830 983
 		global $globalStatsFilters;
831
-		if ($filter_name == '') $filter_name = $this->filter_name;
984
+		if ($filter_name == '') {
985
+			$filter_name = $this->filter_name;
986
+		}
832 987
 		if ($year == '' && $month == '') {
833 988
 			$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
834 989
 			try {
@@ -839,7 +994,9 @@  discard block
 block discarded – undo
839 994
 			}
840 995
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
841 996
 			$all = $result[0]['nb'];
842
-		} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
997
+		} else {
998
+			$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
999
+		}
843 1000
 		if (empty($all)) {
844 1001
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
845 1002
 			if ($filter_name != '') {
@@ -853,7 +1010,9 @@  discard block
 block discarded – undo
853 1010
 	}
854 1011
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
855 1012
 		global $globalStatsFilters;
856
-		if ($filter_name == '') $filter_name = $this->filter_name;
1013
+		if ($filter_name == '') {
1014
+			$filter_name = $this->filter_name;
1015
+		}
857 1016
 		if ($year == '' && $month == '') {
858 1017
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
859 1018
 			try {
@@ -864,7 +1023,9 @@  discard block
 block discarded – undo
864 1023
 			}
865 1024
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
866 1025
 			$all = $result[0]['nb_airline'];
867
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1026
+		} else {
1027
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1028
+		}
868 1029
 		if (empty($all)) {
869 1030
             		$filters = array();
870 1031
 			$filters = array('year' => $year,'month' => $month);
@@ -879,7 +1040,9 @@  discard block
 block discarded – undo
879 1040
 	}
880 1041
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
881 1042
 		global $globalStatsFilters;
882
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043
+		if ($filter_name == '') {
1044
+			$filter_name = $this->filter_name;
1045
+		}
883 1046
 		if ($year == '' && $month == '') {
884 1047
 			$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
885 1048
 			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
@@ -907,7 +1070,9 @@  discard block
 block discarded – undo
907 1070
 	}
908 1071
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
909 1072
 		global $globalStatsFilters;
910
-		if ($filter_name == '') $filter_name = $this->filter_name;
1073
+		if ($filter_name == '') {
1074
+			$filter_name = $this->filter_name;
1075
+		}
911 1076
 		//if ($year == '') $year = date('Y');
912 1077
 		if ($year == '' && $month == '') {
913 1078
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -936,7 +1101,9 @@  discard block
 block discarded – undo
936 1101
 	}
937 1102
 
938 1103
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
939
-		if ($filter_name == '') $filter_name = $this->filter_name;
1104
+		if ($filter_name == '') {
1105
+			$filter_name = $this->filter_name;
1106
+		}
940 1107
 		$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
941 1108
 		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
942 1109
                  try {
@@ -949,7 +1116,9 @@  discard block
 block discarded – undo
949 1116
                 return $all;
950 1117
 	}
951 1118
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
952
-		if ($filter_name == '') $filter_name = $this->filter_name;
1119
+		if ($filter_name == '') {
1120
+			$filter_name = $this->filter_name;
1121
+		}
953 1122
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
954 1123
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
955 1124
                  try {
@@ -962,7 +1131,9 @@  discard block
 block discarded – undo
962 1131
                 return $all;
963 1132
         }
964 1133
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
965
-		if ($filter_name == '') $filter_name = $this->filter_name;
1134
+		if ($filter_name == '') {
1135
+			$filter_name = $this->filter_name;
1136
+		}
966 1137
                 $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967 1138
                 $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968 1139
                  try {
@@ -975,7 +1146,9 @@  discard block
 block discarded – undo
975 1146
                 return $all;
976 1147
         }
977 1148
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
978
-		if ($filter_name == '') $filter_name = $this->filter_name;
1149
+		if ($filter_name == '') {
1150
+			$filter_name = $this->filter_name;
1151
+		}
979 1152
     		global $globalArchiveMonths, $globalDBdriver;
980 1153
     		if ($globalDBdriver == 'mysql') {
981 1154
     			if ($month == '') {
@@ -1005,7 +1178,9 @@  discard block
 block discarded – undo
1005 1178
         }
1006 1179
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1007 1180
     		global $globalArchiveMonths, $globalDBdriver;
1008
-		if ($filter_name == '') $filter_name = $this->filter_name;
1181
+		if ($filter_name == '') {
1182
+			$filter_name = $this->filter_name;
1183
+		}
1009 1184
     		if ($globalDBdriver == 'mysql') {
1010 1185
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1011 1186
 		} else {
@@ -1023,7 +1198,9 @@  discard block
 block discarded – undo
1023 1198
         }
1024 1199
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1025 1200
     		global $globalArchiveMonths, $globalDBdriver;
1026
-		if ($filter_name == '') $filter_name = $this->filter_name;
1201
+		if ($filter_name == '') {
1202
+			$filter_name = $this->filter_name;
1203
+		}
1027 1204
     		if ($globalDBdriver == 'mysql') {
1028 1205
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1029 1206
                 } else {
@@ -1040,7 +1217,9 @@  discard block
 block discarded – undo
1040 1217
         }
1041 1218
 	public function getStatsAirlineTotal($filter_name = '') {
1042 1219
     		global $globalArchiveMonths, $globalDBdriver;
1043
-		if ($filter_name == '') $filter_name = $this->filter_name;
1220
+		if ($filter_name == '') {
1221
+			$filter_name = $this->filter_name;
1222
+		}
1044 1223
     		if ($globalDBdriver == 'mysql') {
1045 1224
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1046 1225
                 } else {
@@ -1057,7 +1236,9 @@  discard block
 block discarded – undo
1057 1236
         }
1058 1237
 	public function getStatsOwnerTotal($filter_name = '') {
1059 1238
     		global $globalArchiveMonths, $globalDBdriver;
1060
-		if ($filter_name == '') $filter_name = $this->filter_name;
1239
+		if ($filter_name == '') {
1240
+			$filter_name = $this->filter_name;
1241
+		}
1061 1242
     		if ($globalDBdriver == 'mysql') {
1062 1243
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1063 1244
 		} else {
@@ -1074,7 +1255,9 @@  discard block
 block discarded – undo
1074 1255
         }
1075 1256
 	public function getStatsOwner($owner_name,$filter_name = '') {
1076 1257
     		global $globalArchiveMonths, $globalDBdriver;
1077
-		if ($filter_name == '') $filter_name = $this->filter_name;
1258
+		if ($filter_name == '') {
1259
+			$filter_name = $this->filter_name;
1260
+		}
1078 1261
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1079 1262
                  try {
1080 1263
                         $sth = $this->db->prepare($query);
@@ -1083,12 +1266,17 @@  discard block
 block discarded – undo
1083 1266
                         echo "error : ".$e->getMessage();
1084 1267
                 }
1085 1268
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1086
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1087
-                else return 0;
1269
+                if (isset($all[0]['cnt'])) {
1270
+                	return $all[0]['cnt'];
1271
+                } else {
1272
+                	return 0;
1273
+                }
1088 1274
         }
1089 1275
 	public function getStatsPilotTotal($filter_name = '') {
1090 1276
     		global $globalArchiveMonths, $globalDBdriver;
1091
-		if ($filter_name == '') $filter_name = $this->filter_name;
1277
+		if ($filter_name == '') {
1278
+			$filter_name = $this->filter_name;
1279
+		}
1092 1280
     		if ($globalDBdriver == 'mysql') {
1093 1281
             		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094 1282
             	} else {
@@ -1105,7 +1293,9 @@  discard block
 block discarded – undo
1105 1293
         }
1106 1294
 	public function getStatsPilot($pilot,$filter_name = '') {
1107 1295
     		global $globalArchiveMonths, $globalDBdriver;
1108
-		if ($filter_name == '') $filter_name = $this->filter_name;
1296
+		if ($filter_name == '') {
1297
+			$filter_name = $this->filter_name;
1298
+		}
1109 1299
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1110 1300
                  try {
1111 1301
                         $sth = $this->db->prepare($query);
@@ -1114,13 +1304,18 @@  discard block
 block discarded – undo
1114 1304
                         echo "error : ".$e->getMessage();
1115 1305
                 }
1116 1306
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1117
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1118
-                else return 0;
1307
+                if (isset($all[0]['cnt'])) {
1308
+                	return $all[0]['cnt'];
1309
+                } else {
1310
+                	return 0;
1311
+                }
1119 1312
         }
1120 1313
 
1121 1314
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1122 1315
 		global $globalDBdriver;
1123
-		if ($filter_name == '') $filter_name = $this->filter_name;
1316
+		if ($filter_name == '') {
1317
+			$filter_name = $this->filter_name;
1318
+		}
1124 1319
 		if ($globalDBdriver == 'mysql') {
1125 1320
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1126 1321
                 } else {
@@ -1136,7 +1331,9 @@  discard block
 block discarded – undo
1136 1331
         }
1137 1332
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1138 1333
 		global $globalDBdriver;
1139
-		if ($filter_name == '') $filter_name = $this->filter_name;
1334
+		if ($filter_name == '') {
1335
+			$filter_name = $this->filter_name;
1336
+		}
1140 1337
 		if ($globalDBdriver == 'mysql') {
1141 1338
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1339
 		} else {
@@ -1522,10 +1719,14 @@  discard block
 block discarded – undo
1522 1719
     		$Connection = new Connection();
1523 1720
     		date_default_timezone_set('UTC');
1524 1721
     		$last_update = $this->getLastStatsUpdate('last_update_stats');
1525
-			if ($globalDebug) echo 'Update stats !'."\n";
1722
+			if ($globalDebug) {
1723
+				echo 'Update stats !'."\n";
1724
+			}
1526 1725
 			if (isset($last_update[0]['value'])) {
1527 1726
 				$last_update_day = $last_update[0]['value'];
1528
-			} else $last_update_day = '2012-12-12 12:12:12';
1727
+			} else {
1728
+				$last_update_day = '2012-12-12 12:12:12';
1729
+			}
1529 1730
 			$reset = false;
1530 1731
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1531 1732
 			if ($globalStatsResetYear) {
@@ -1534,42 +1735,60 @@  discard block
 block discarded – undo
1534 1735
 			}
1535 1736
 			$Spotter = new Spotter($this->db);
1536 1737
 
1537
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1738
+			if ($globalDebug) {
1739
+				echo 'Count all aircraft types...'."\n";
1740
+			}
1538 1741
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1539 1742
 			foreach ($alldata as $number) {
1540 1743
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
1541 1744
 			}
1542
-			if ($globalDebug) echo 'Count all airlines...'."\n";
1745
+			if ($globalDebug) {
1746
+				echo 'Count all airlines...'."\n";
1747
+			}
1543 1748
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1544 1749
 			foreach ($alldata as $number) {
1545 1750
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
1546 1751
 			}
1547
-			if ($globalDebug) echo 'Count all registrations...'."\n";
1752
+			if ($globalDebug) {
1753
+				echo 'Count all registrations...'."\n";
1754
+			}
1548 1755
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1549 1756
 			foreach ($alldata as $number) {
1550 1757
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
1551 1758
 			}
1552
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
1759
+			if ($globalDebug) {
1760
+				echo 'Count all callsigns...'."\n";
1761
+			}
1553 1762
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1554 1763
 			foreach ($alldata as $number) {
1555 1764
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1556 1765
 			}
1557
-			if ($globalDebug) echo 'Count all owners...'."\n";
1766
+			if ($globalDebug) {
1767
+				echo 'Count all owners...'."\n";
1768
+			}
1558 1769
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1559 1770
 			foreach ($alldata as $number) {
1560 1771
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
1561 1772
 			}
1562
-			if ($globalDebug) echo 'Count all pilots...'."\n";
1773
+			if ($globalDebug) {
1774
+				echo 'Count all pilots...'."\n";
1775
+			}
1563 1776
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1564 1777
 			foreach ($alldata as $number) {
1565 1778
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
1566 1779
 			}
1567 1780
 			
1568
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
1781
+			if ($globalDebug) {
1782
+				echo 'Count all departure airports...'."\n";
1783
+			}
1569 1784
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1570
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1785
+			if ($globalDebug) {
1786
+				echo 'Count all detected departure airports...'."\n";
1787
+			}
1571 1788
         		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1572
-			if ($globalDebug) echo 'Order departure airports...'."\n";
1789
+			if ($globalDebug) {
1790
+				echo 'Order departure airports...'."\n";
1791
+			}
1573 1792
 	        	$alldata = array();
1574 1793
 	        	
1575 1794
     			foreach ($pall as $value) {
@@ -1580,7 +1799,9 @@  discard block
 block discarded – undo
1580 1799
     				$icao = $value['airport_departure_icao'];
1581 1800
         			if (isset($alldata[$icao])) {
1582 1801
     					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1583
-        			} else $alldata[$icao] = $value;
1802
+        			} else {
1803
+        				$alldata[$icao] = $value;
1804
+        			}
1584 1805
 			}
1585 1806
     			$count = array();
1586 1807
     			foreach ($alldata as $key => $row) {
@@ -1590,11 +1811,17 @@  discard block
 block discarded – undo
1590 1811
 			foreach ($alldata as $number) {
1591 1812
 				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);
1592 1813
 			}
1593
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1814
+			if ($globalDebug) {
1815
+				echo 'Count all arrival airports...'."\n";
1816
+			}
1594 1817
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1595
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1818
+			if ($globalDebug) {
1819
+				echo 'Count all detected arrival airports...'."\n";
1820
+			}
1596 1821
         		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1597
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
1822
+			if ($globalDebug) {
1823
+				echo 'Order arrival airports...'."\n";
1824
+			}
1598 1825
 	        	$alldata = array();
1599 1826
     			foreach ($pall as $value) {
1600 1827
 	        		$icao = $value['airport_arrival_icao'];
@@ -1604,7 +1831,9 @@  discard block
 block discarded – undo
1604 1831
     				$icao = $value['airport_arrival_icao'];
1605 1832
         			if (isset($alldata[$icao])) {
1606 1833
         				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1607
-	        		} else $alldata[$icao] = $value;
1834
+	        		} else {
1835
+	        			$alldata[$icao] = $value;
1836
+	        		}
1608 1837
     			}
1609 1838
         		$count = array();
1610 1839
         		foreach ($alldata as $key => $row) {
@@ -1615,7 +1844,9 @@  discard block
 block discarded – undo
1615 1844
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1616 1845
 			}
1617 1846
 			if ($Connection->tableExists('countries')) {
1618
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1847
+				if ($globalDebug) {
1848
+					echo 'Count all flights by countries...'."\n";
1849
+				}
1619 1850
 				$SpotterArchive = new SpotterArchive();
1620 1851
 				$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1621 1852
 				foreach ($alldata as $number) {
@@ -1623,7 +1854,9 @@  discard block
 block discarded – undo
1623 1854
 				}
1624 1855
 			}
1625 1856
 			
1626
-			if ($globalDebug) echo 'Count fatalities stats...'."\n";
1857
+			if ($globalDebug) {
1858
+				echo 'Count fatalities stats...'."\n";
1859
+			}
1627 1860
 			$Accident = new Accident();
1628 1861
 			$this->deleteStatsByType('fatalities_byyear');
1629 1862
 			$alldata = $Accident->countFatalitiesByYear();
@@ -1640,46 +1873,66 @@  discard block
 block discarded – undo
1640 1873
 			// Add by month using getstat if month finish...
1641 1874
 
1642 1875
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
1643
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
1876
+			if ($globalDebug) {
1877
+				echo 'Count all flights by months...'."\n";
1878
+			}
1644 1879
 			$Spotter = new Spotter($this->db);
1645 1880
 			$alldata = $Spotter->countAllMonths();
1646 1881
 			$lastyear = false;
1647 1882
 			foreach ($alldata as $number) {
1648
-				if ($number['year_name'] != date('Y')) $lastyear = true;
1883
+				if ($number['year_name'] != date('Y')) {
1884
+					$lastyear = true;
1885
+				}
1649 1886
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1650 1887
 			}
1651
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1888
+			if ($globalDebug) {
1889
+				echo 'Count all military flights by months...'."\n";
1890
+			}
1652 1891
 			$alldata = $Spotter->countAllMilitaryMonths();
1653 1892
 			foreach ($alldata as $number) {
1654 1893
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1655 1894
 			}
1656
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
1895
+			if ($globalDebug) {
1896
+				echo 'Count all owners by months...'."\n";
1897
+			}
1657 1898
 			$alldata = $Spotter->countAllMonthsOwners();
1658 1899
 			foreach ($alldata as $number) {
1659 1900
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1660 1901
 			}
1661
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1902
+			if ($globalDebug) {
1903
+				echo 'Count all pilots by months...'."\n";
1904
+			}
1662 1905
 			$alldata = $Spotter->countAllMonthsPilots();
1663 1906
 			foreach ($alldata as $number) {
1664 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'])));
1665 1908
 			}
1666
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1909
+			if ($globalDebug) {
1910
+				echo 'Count all airlines by months...'."\n";
1911
+			}
1667 1912
 			$alldata = $Spotter->countAllMonthsAirlines();
1668 1913
 			foreach ($alldata as $number) {
1669 1914
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1670 1915
 			}
1671
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1916
+			if ($globalDebug) {
1917
+				echo 'Count all aircrafts by months...'."\n";
1918
+			}
1672 1919
 			$alldata = $Spotter->countAllMonthsAircrafts();
1673 1920
 			foreach ($alldata as $number) {
1674 1921
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1675 1922
 			}
1676
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1923
+			if ($globalDebug) {
1924
+				echo 'Count all real arrivals by months...'."\n";
1925
+			}
1677 1926
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1678 1927
 			foreach ($alldata as $number) {
1679 1928
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
1680 1929
 			}
1681
-			if ($globalDebug) echo 'Airports data...'."\n";
1682
-			if ($globalDebug) echo '...Departure'."\n";
1930
+			if ($globalDebug) {
1931
+				echo 'Airports data...'."\n";
1932
+			}
1933
+			if ($globalDebug) {
1934
+				echo '...Departure'."\n";
1935
+			}
1683 1936
 			$this->deleteStatAirport('daily');
1684 1937
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1685 1938
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -1800,44 +2053,62 @@  discard block
 block discarded – undo
1800 2053
 			// Count by airlines
1801 2054
 			echo '--- Stats by airlines ---'."\n";
1802 2055
 			if ($Connection->tableExists('countries')) {
1803
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2056
+				if ($globalDebug) {
2057
+					echo 'Count all flights by countries by airlines...'."\n";
2058
+				}
1804 2059
 				$SpotterArchive = new SpotterArchive();
1805 2060
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
1806 2061
 				foreach ($alldata as $number) {
1807 2062
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
1808 2063
 				}
1809 2064
 			}
1810
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2065
+			if ($globalDebug) {
2066
+				echo 'Count all aircraft types by airlines...'."\n";
2067
+			}
1811 2068
 			$Spotter = new Spotter($this->db);
1812 2069
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1813 2070
 			foreach ($alldata as $number) {
1814 2071
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
1815 2072
 			}
1816
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2073
+			if ($globalDebug) {
2074
+				echo 'Count all aircraft registrations by airlines...'."\n";
2075
+			}
1817 2076
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1818 2077
 			foreach ($alldata as $number) {
1819 2078
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
1820 2079
 			}
1821
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2080
+			if ($globalDebug) {
2081
+				echo 'Count all callsigns by airlines...'."\n";
2082
+			}
1822 2083
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1823 2084
 			foreach ($alldata as $number) {
1824 2085
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
1825 2086
 			}
1826
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2087
+			if ($globalDebug) {
2088
+				echo 'Count all owners by airlines...'."\n";
2089
+			}
1827 2090
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1828 2091
 			foreach ($alldata as $number) {
1829 2092
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
1830 2093
 			}
1831
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2094
+			if ($globalDebug) {
2095
+				echo 'Count all pilots by airlines...'."\n";
2096
+			}
1832 2097
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1833 2098
 			foreach ($alldata as $number) {
1834 2099
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
1835 2100
 			}
1836
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2101
+			if ($globalDebug) {
2102
+				echo 'Count all departure airports by airlines...'."\n";
2103
+			}
1837 2104
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1838
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2105
+			if ($globalDebug) {
2106
+				echo 'Count all detected departure airports by airlines...'."\n";
2107
+			}
1839 2108
        			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1840
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2109
+			if ($globalDebug) {
2110
+				echo 'Order detected departure airports by airlines...'."\n";
2111
+			}
1841 2112
 	        	//$alldata = array();
1842 2113
     			foreach ($dall as $value) {
1843 2114
     				$icao = $value['airport_departure_icao'];
@@ -1858,11 +2129,17 @@  discard block
 block discarded – undo
1858 2129
 			foreach ($alldata as $number) {
1859 2130
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
1860 2131
 			}
1861
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2132
+			if ($globalDebug) {
2133
+				echo 'Count all arrival airports by airlines...'."\n";
2134
+			}
1862 2135
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1863
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2136
+			if ($globalDebug) {
2137
+				echo 'Count all detected arrival airports by airlines...'."\n";
2138
+			}
1864 2139
         		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1865
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2140
+			if ($globalDebug) {
2141
+				echo 'Order arrival airports by airlines...'."\n";
2142
+			}
1866 2143
 	        	//$alldata = array();
1867 2144
     			foreach ($dall as $value) {
1868 2145
     				$icao = $value['airport_arrival_icao'];
@@ -1881,37 +2158,53 @@  discard block
 block discarded – undo
1881 2158
     			}
1882 2159
     			$alldata = $pall;
1883 2160
                         foreach ($alldata as $number) {
1884
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2161
+				if ($number['airline_icao'] != '') {
2162
+					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);
2163
+				}
2164
+			}
2165
+			if ($globalDebug) {
2166
+				echo 'Count all flights by months by airlines...'."\n";
1885 2167
 			}
1886
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1887 2168
 			$Spotter = new Spotter($this->db);
1888 2169
 			$alldata = $Spotter->countAllMonthsByAirlines();
1889 2170
 			$lastyear = false;
1890 2171
 			foreach ($alldata as $number) {
1891
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2172
+				if ($number['year_name'] != date('Y')) {
2173
+					$lastyear = true;
2174
+				}
1892 2175
 				$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']);
1893 2176
 			}
1894
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2177
+			if ($globalDebug) {
2178
+				echo 'Count all owners by months by airlines...'."\n";
2179
+			}
1895 2180
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1896 2181
 			foreach ($alldata as $number) {
1897 2182
 				$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']);
1898 2183
 			}
1899
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2184
+			if ($globalDebug) {
2185
+				echo 'Count all pilots by months by airlines...'."\n";
2186
+			}
1900 2187
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1901 2188
 			foreach ($alldata as $number) {
1902 2189
 				$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']);
1903 2190
 			}
1904
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2191
+			if ($globalDebug) {
2192
+				echo 'Count all aircrafts by months by airlines...'."\n";
2193
+			}
1905 2194
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1906 2195
 			foreach ($alldata as $number) {
1907 2196
 				$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']);
1908 2197
 			}
1909
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2198
+			if ($globalDebug) {
2199
+				echo 'Count all real arrivals by months by airlines...'."\n";
2200
+			}
1910 2201
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1911 2202
 			foreach ($alldata as $number) {
1912 2203
 				$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']);
1913 2204
 			}
1914
-			if ($globalDebug) echo '...Departure'."\n";
2205
+			if ($globalDebug) {
2206
+				echo '...Departure'."\n";
2207
+			}
1915 2208
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1916 2209
         		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1917 2210
     			foreach ($dall as $value) {
@@ -1934,7 +2227,9 @@  discard block
 block discarded – undo
1934 2227
 			foreach ($alldata as $number) {
1935 2228
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
1936 2229
 			}
1937
-			if ($globalDebug) echo '...Arrival'."\n";
2230
+			if ($globalDebug) {
2231
+				echo '...Arrival'."\n";
2232
+			}
1938 2233
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1939 2234
         		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1940 2235
     			foreach ($dall as $value) {
@@ -1958,13 +2253,19 @@  discard block
 block discarded – undo
1958 2253
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
1959 2254
 			}
1960 2255
 
1961
-			if ($globalDebug) echo 'Flights data...'."\n";
1962
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2256
+			if ($globalDebug) {
2257
+				echo 'Flights data...'."\n";
2258
+			}
2259
+			if ($globalDebug) {
2260
+				echo '-> countAllDatesLastMonth...'."\n";
2261
+			}
1963 2262
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1964 2263
 			foreach ($alldata as $number) {
1965 2264
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1966 2265
 			}
1967
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2266
+			if ($globalDebug) {
2267
+				echo '-> countAllDates...'."\n";
2268
+			}
1968 2269
 			//$previousdata = $this->countAllDatesByAirlines();
1969 2270
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1970 2271
 			$values = array();
@@ -1977,7 +2278,9 @@  discard block
 block discarded – undo
1977 2278
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1978 2279
 			}
1979 2280
 			
1980
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2281
+			if ($globalDebug) {
2282
+				echo '-> countAllHours...'."\n";
2283
+			}
1981 2284
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1982 2285
 			foreach ($alldata as $number) {
1983 2286
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
@@ -1985,14 +2288,18 @@  discard block
 block discarded – undo
1985 2288
 			
1986 2289
 
1987 2290
 			// Stats by filters
1988
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2291
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2292
+				$globalStatsFilters = array();
2293
+			}
1989 2294
 			foreach ($globalStatsFilters as $name => $filter) {
1990 2295
 				//$filter_name = $filter['name'];
1991 2296
 				$filter_name = $name;
1992 2297
 				$reset = false;
1993 2298
 				$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
1994 2299
 				if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
1995
-					if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2300
+					if ($globalDebug) {
2301
+						echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2302
+					}
1996 2303
 					$this->deleteOldStats($filter_name);
1997 2304
 					unset($last_update);
1998 2305
 				}
@@ -2011,7 +2318,9 @@  discard block
 block discarded – undo
2011 2318
 				
2012 2319
 
2013 2320
 				// Count by filter
2014
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2321
+				if ($globalDebug) {
2322
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
2323
+				}
2015 2324
 				$Spotter = new Spotter($this->db);
2016 2325
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2017 2326
 				foreach ($alldata as $number) {
@@ -2048,7 +2357,9 @@  discard block
 block discarded – undo
2048 2357
 	    				$icao = $value['airport_departure_icao'];
2049 2358
         				if (isset($alldata[$icao])) {
2050 2359
     						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2051
-        				} else $alldata[$icao] = $value;
2360
+        				} else {
2361
+        					$alldata[$icao] = $value;
2362
+        				}
2052 2363
 				}
2053 2364
 	    			$count = array();
2054 2365
     				foreach ($alldata as $key => $row) {
@@ -2069,7 +2380,9 @@  discard block
 block discarded – undo
2069 2380
 	    				$icao = $value['airport_arrival_icao'];
2070 2381
         				if (isset($alldata[$icao])) {
2071 2382
         					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2072
-		        		} else $alldata[$icao] = $value;
2383
+		        		} else {
2384
+		        			$alldata[$icao] = $value;
2385
+		        		}
2073 2386
 	    			}
2074 2387
         			$count = array();
2075 2388
         			foreach ($alldata as $key => $row) {
@@ -2083,7 +2396,9 @@  discard block
 block discarded – undo
2083 2396
 				$alldata = $Spotter->countAllMonths($filter);
2084 2397
 				$lastyear = false;
2085 2398
 				foreach ($alldata as $number) {
2086
-					if ($number['year_name'] != date('Y')) $lastyear = true;
2399
+					if ($number['year_name'] != date('Y')) {
2400
+						$lastyear = true;
2401
+					}
2087 2402
 					$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);
2088 2403
 				}
2089 2404
 				$alldata = $Spotter->countAllMonthsOwners($filter);
Please login to merge, or discard this patch.