Completed
Push — master ( 561404...142633 )
by Yannick
08:13
created
require/class.Stats.php 1 patch
Indentation   +820 added lines, -820 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, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
265 265
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
266
-                 try {
267
-                        $sth = $this->db->prepare($query);
268
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
-                } catch(PDOException $e) {
270
-                        echo "error : ".$e->getMessage();
271
-                }
272
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
-                if (empty($all)) {
266
+				 try {
267
+						$sth = $this->db->prepare($query);
268
+						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
269
+				} catch(PDOException $e) {
270
+						echo "error : ".$e->getMessage();
271
+				}
272
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
273
+				if (empty($all)) {
274 274
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
275 275
 			if ($filter_name != '') {
276
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
276
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
277 277
 			}
278 278
 			$Spotter = new Spotter($this->db);
279 279
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
280 280
 			$all = $Spotter->countAllDepartureCountries($filters);
281
-                }
282
-                return $all;
281
+				}
282
+				return $all;
283 283
 	}
284 284
 
285 285
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
@@ -305,17 +305,17 @@  discard block
 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 ORDER BY date_count DESC";
618 618
 		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
619
-                 try {
620
-                        $sth = $this->db->prepare($query);
621
-                        $sth->execute($query_data);
622
-                } catch(PDOException $e) {
623
-                        echo "error : ".$e->getMessage();
624
-                }
625
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
-                if (empty($all)) {
619
+				 try {
620
+						$sth = $this->db->prepare($query);
621
+						$sth->execute($query_data);
622
+				} catch(PDOException $e) {
623
+						echo "error : ".$e->getMessage();
624
+				}
625
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
626
+				if (empty($all)) {
627 627
 			$filters = array('airlines' => array($stats_airline));
628 628
 			if ($filter_name != '') {
629
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
629
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
630 630
 			}
631
-            		$Spotter = new Spotter($this->db);
632
-            		$all = $Spotter->countAllDates($filters);
633
-                }
634
-                return $all;
631
+					$Spotter = new Spotter($this->db);
632
+					$all = $Spotter->countAllDates($filters);
633
+				}
634
+				return $all;
635 635
 	}
636 636
 	public function countAllDatesByAirlines($filter_name = '') {
637 637
 		global $globalStatsFilters;
638 638
 		if ($filter_name == '') $filter_name = $this->filter_name;
639 639
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
640 640
 		$query_data = array('filter_name' => $filter_name);
641
-                 try {
642
-                        $sth = $this->db->prepare($query);
643
-                        $sth->execute($query_data);
644
-                } catch(PDOException $e) {
645
-                        echo "error : ".$e->getMessage();
646
-                }
647
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
-                if (empty($all)) {
649
-            		$filters = array();
650
-            		if ($filter_name != '') {
651
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
641
+				 try {
642
+						$sth = $this->db->prepare($query);
643
+						$sth->execute($query_data);
644
+				} catch(PDOException $e) {
645
+						echo "error : ".$e->getMessage();
646
+				}
647
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
648
+				if (empty($all)) {
649
+					$filters = array();
650
+					if ($filter_name != '') {
651
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
652 652
 			}
653
-            		$Spotter = new Spotter($this->db);
654
-            		$all = $Spotter->countAllDatesByAirlines($filters);
655
-                }
656
-                return $all;
653
+					$Spotter = new Spotter($this->db);
654
+					$all = $Spotter->countAllDatesByAirlines($filters);
655
+				}
656
+				return $all;
657 657
 	}
658 658
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
659 659
 		global $globalStatsFilters, $globalDBdriver;
@@ -663,24 +663,24 @@  discard block
 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 ORDER BY date_count DESC";
665 665
 		}
666
-                 try {
667
-                        $sth = $this->db->prepare($query);
668
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
-                } catch(PDOException $e) {
670
-                        echo "error : ".$e->getMessage();
671
-                }
672
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
666
+				 try {
667
+						$sth = $this->db->prepare($query);
668
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
669
+				} catch(PDOException $e) {
670
+						echo "error : ".$e->getMessage();
671
+				}
672
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
673 673
                 
674
-                if (empty($all)) {
674
+				if (empty($all)) {
675 675
 			$filters = array('airlines' => array($stats_airline));
676 676
 			if ($filter_name != '') {
677 677
 				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
678 678
 			}
679
-            		$Spotter = new Spotter($this->db);
680
-            		$all = $Spotter->countAllMonths($filters);
681
-                }
679
+					$Spotter = new Spotter($this->db);
680
+					$all = $Spotter->countAllMonths($filters);
681
+				}
682 682
                 
683
-                return $all;
683
+				return $all;
684 684
 	}
685 685
 	public function countFatalitiesLast12Months() {
686 686
 		global $globalStatsFilters, $globalDBdriver;
@@ -689,19 +689,19 @@  discard block
 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,44 +939,44 @@  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
-        }
966
+				$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
967
+				$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
968
+				 try {
969
+						$sth = $this->db->prepare($query);
970
+						$sth->execute($query_values);
971
+				} catch(PDOException $e) {
972
+						echo "error : ".$e->getMessage();
973
+				}
974
+		}
975 975
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
976 976
 		if ($filter_name == '') $filter_name = $this->filter_name;
977
-    		global $globalArchiveMonths, $globalDBdriver;
978
-    		if ($globalDBdriver == 'mysql') {
979
-    			if ($month == '') {
977
+			global $globalArchiveMonths, $globalDBdriver;
978
+			if ($globalDBdriver == 'mysql') {
979
+				if ($month == '') {
980 980
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
981 981
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
982 982
 			} else {
@@ -991,165 +991,165 @@  discard block
 block discarded – undo
991 991
 				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
992 992
 				$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
993 993
 			}
994
-                }
995
-                 try {
996
-                        $sth = $this->db->prepare($query);
997
-                        $sth->execute($query_values);
998
-                } catch(PDOException $e) {
999
-                        echo "error : ".$e->getMessage();
1000
-                }
1001
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002
-                return $all[0]['total'];
1003
-        }
994
+				}
995
+				 try {
996
+						$sth = $this->db->prepare($query);
997
+						$sth->execute($query_values);
998
+				} catch(PDOException $e) {
999
+						echo "error : ".$e->getMessage();
1000
+				}
1001
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1002
+				return $all[0]['total'];
1003
+		}
1004 1004
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1005
-    		global $globalArchiveMonths, $globalDBdriver;
1005
+			global $globalArchiveMonths, $globalDBdriver;
1006 1006
 		if ($filter_name == '') $filter_name = $this->filter_name;
1007
-    		if ($globalDBdriver == 'mysql') {
1007
+			if ($globalDBdriver == 'mysql') {
1008 1008
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
1009 1009
 		} else {
1010 1010
 			$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1011
-                }
1012
-                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013
-                 try {
1014
-                        $sth = $this->db->prepare($query);
1015
-                        $sth->execute($query_values);
1016
-                } catch(PDOException $e) {
1017
-                        echo "error : ".$e->getMessage();
1018
-                }
1019
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020
-                return $all[0]['total'];
1021
-        }
1011
+				}
1012
+				$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1013
+				 try {
1014
+						$sth = $this->db->prepare($query);
1015
+						$sth->execute($query_values);
1016
+				} catch(PDOException $e) {
1017
+						echo "error : ".$e->getMessage();
1018
+				}
1019
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1020
+				return $all[0]['total'];
1021
+		}
1022 1022
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1023
-    		global $globalArchiveMonths, $globalDBdriver;
1023
+			global $globalArchiveMonths, $globalDBdriver;
1024 1024
 		if ($filter_name == '') $filter_name = $this->filter_name;
1025
-    		if ($globalDBdriver == 'mysql') {
1025
+			if ($globalDBdriver == 'mysql') {
1026 1026
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1027
-                } else {
1027
+				} else {
1028 1028
 			$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1029
-                }
1030
-                 try {
1031
-                        $sth = $this->db->prepare($query);
1032
-                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033
-                } catch(PDOException $e) {
1034
-                        echo "error : ".$e->getMessage();
1035
-                }
1036
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037
-                return $all[0]['total'];
1038
-        }
1029
+				}
1030
+				 try {
1031
+						$sth = $this->db->prepare($query);
1032
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1033
+				} catch(PDOException $e) {
1034
+						echo "error : ".$e->getMessage();
1035
+				}
1036
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1037
+				return $all[0]['total'];
1038
+		}
1039 1039
 	public function getStatsAirlineTotal($filter_name = '') {
1040
-    		global $globalArchiveMonths, $globalDBdriver;
1040
+			global $globalArchiveMonths, $globalDBdriver;
1041 1041
 		if ($filter_name == '') $filter_name = $this->filter_name;
1042
-    		if ($globalDBdriver == 'mysql') {
1042
+			if ($globalDBdriver == 'mysql') {
1043 1043
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1044
-                } else {
1044
+				} else {
1045 1045
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1046
-                }
1047
-                 try {
1048
-                        $sth = $this->db->prepare($query);
1049
-                        $sth->execute(array(':filter_name' => $filter_name));
1050
-                } catch(PDOException $e) {
1051
-                        echo "error : ".$e->getMessage();
1052
-                }
1053
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054
-                return $all[0]['total'];
1055
-        }
1046
+				}
1047
+				 try {
1048
+						$sth = $this->db->prepare($query);
1049
+						$sth->execute(array(':filter_name' => $filter_name));
1050
+				} catch(PDOException $e) {
1051
+						echo "error : ".$e->getMessage();
1052
+				}
1053
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1054
+				return $all[0]['total'];
1055
+		}
1056 1056
 	public function getStatsOwnerTotal($filter_name = '') {
1057
-    		global $globalArchiveMonths, $globalDBdriver;
1057
+			global $globalArchiveMonths, $globalDBdriver;
1058 1058
 		if ($filter_name == '') $filter_name = $this->filter_name;
1059
-    		if ($globalDBdriver == 'mysql') {
1059
+			if ($globalDBdriver == 'mysql') {
1060 1060
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1061 1061
 		} else {
1062 1062
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1063
-                }
1064
-                 try {
1065
-                        $sth = $this->db->prepare($query);
1066
-                        $sth->execute(array(':filter_name' => $filter_name));
1067
-                } catch(PDOException $e) {
1068
-                        echo "error : ".$e->getMessage();
1069
-                }
1070
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071
-                return $all[0]['total'];
1072
-        }
1063
+				}
1064
+				 try {
1065
+						$sth = $this->db->prepare($query);
1066
+						$sth->execute(array(':filter_name' => $filter_name));
1067
+				} catch(PDOException $e) {
1068
+						echo "error : ".$e->getMessage();
1069
+				}
1070
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071
+				return $all[0]['total'];
1072
+		}
1073 1073
 	public function getStatsOwner($owner_name,$filter_name = '') {
1074
-    		global $globalArchiveMonths, $globalDBdriver;
1074
+			global $globalArchiveMonths, $globalDBdriver;
1075 1075
 		if ($filter_name == '') $filter_name = $this->filter_name;
1076 1076
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1077
-                 try {
1078
-                        $sth = $this->db->prepare($query);
1079
-                        $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080
-                } catch(PDOException $e) {
1081
-                        echo "error : ".$e->getMessage();
1082
-                }
1083
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085
-                else return 0;
1086
-        }
1077
+				 try {
1078
+						$sth = $this->db->prepare($query);
1079
+						$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1080
+				} catch(PDOException $e) {
1081
+						echo "error : ".$e->getMessage();
1082
+				}
1083
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1084
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1085
+				else return 0;
1086
+		}
1087 1087
 	public function getStatsPilotTotal($filter_name = '') {
1088
-    		global $globalArchiveMonths, $globalDBdriver;
1088
+			global $globalArchiveMonths, $globalDBdriver;
1089 1089
 		if ($filter_name == '') $filter_name = $this->filter_name;
1090
-    		if ($globalDBdriver == 'mysql') {
1091
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092
-            	} else {
1093
-            		$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
-            	}
1095
-                 try {
1096
-                        $sth = $this->db->prepare($query);
1097
-                        $sth->execute(array(':filter_name' => $filter_name));
1098
-                } catch(PDOException $e) {
1099
-                        echo "error : ".$e->getMessage();
1100
-                }
1101
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102
-                return $all[0]['total'];
1103
-        }
1090
+			if ($globalDBdriver == 'mysql') {
1091
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1092
+				} else {
1093
+					$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1094
+				}
1095
+				 try {
1096
+						$sth = $this->db->prepare($query);
1097
+						$sth->execute(array(':filter_name' => $filter_name));
1098
+				} catch(PDOException $e) {
1099
+						echo "error : ".$e->getMessage();
1100
+				}
1101
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1102
+				return $all[0]['total'];
1103
+		}
1104 1104
 	public function getStatsPilot($pilot,$filter_name = '') {
1105
-    		global $globalArchiveMonths, $globalDBdriver;
1105
+			global $globalArchiveMonths, $globalDBdriver;
1106 1106
 		if ($filter_name == '') $filter_name = $this->filter_name;
1107 1107
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1108
-                 try {
1109
-                        $sth = $this->db->prepare($query);
1110
-                        $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111
-                } catch(PDOException $e) {
1112
-                        echo "error : ".$e->getMessage();
1113
-                }
1114
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115
-                if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116
-                else return 0;
1117
-        }
1108
+				 try {
1109
+						$sth = $this->db->prepare($query);
1110
+						$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1111
+				} catch(PDOException $e) {
1112
+						echo "error : ".$e->getMessage();
1113
+				}
1114
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1115
+				if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1116
+				else return 0;
1117
+		}
1118 1118
 
1119 1119
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1120 1120
 		global $globalDBdriver;
1121 1121
 		if ($filter_name == '') $filter_name = $this->filter_name;
1122 1122
 		if ($globalDBdriver == 'mysql') {
1123 1123
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1124
-                } else {
1124
+				} else {
1125 1125
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1126 1126
 		}
1127
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128
-                 try {
1129
-                        $sth = $this->db->prepare($query);
1130
-                        $sth->execute($query_values);
1131
-                } catch(PDOException $e) {
1132
-                        return "error : ".$e->getMessage();
1133
-                }
1134
-        }
1127
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1128
+				 try {
1129
+						$sth = $this->db->prepare($query);
1130
+						$sth->execute($query_values);
1131
+				} catch(PDOException $e) {
1132
+						return "error : ".$e->getMessage();
1133
+				}
1134
+		}
1135 1135
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1136 1136
 		global $globalDBdriver;
1137 1137
 		if ($filter_name == '') $filter_name = $this->filter_name;
1138 1138
 		if ($globalDBdriver == 'mysql') {
1139 1139
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1140 1140
 		} else {
1141
-            		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1141
+					//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1142 1142
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1143
-                }
1144
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145
-                 try {
1146
-                        $sth = $this->db->prepare($query);
1147
-                        $sth->execute($query_values);
1148
-                } catch(PDOException $e) {
1149
-                        return "error : ".$e->getMessage();
1150
-                }
1151
-        }
1152
-        /*
1143
+				}
1144
+				$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1145
+				 try {
1146
+						$sth = $this->db->prepare($query);
1147
+						$sth->execute($query_values);
1148
+				} catch(PDOException $e) {
1149
+						return "error : ".$e->getMessage();
1150
+				}
1151
+		}
1152
+		/*
1153 1153
 	public function getStatsSource($date,$stats_type = '') {
1154 1154
 		if ($stats_type == '') {
1155 1155
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -1218,25 +1218,25 @@  discard block
 block discarded – undo
1218 1218
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1219 1219
 		} else {
1220 1220
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1221
-                }
1222
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223
-                 try {
1224
-                        $sth = $this->db->prepare($query);
1225
-                        $sth->execute($query_values);
1226
-                } catch(PDOException $e) {
1227
-                        return "error : ".$e->getMessage();
1228
-                }
1229
-        }
1230
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231
-                $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233
-                 try {
1234
-                        $sth = $this->db->prepare($query);
1235
-                        $sth->execute($query_values);
1236
-                } catch(PDOException $e) {
1237
-                        return "error : ".$e->getMessage();
1238
-                }
1239
-        }
1221
+				}
1222
+				$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1223
+				 try {
1224
+						$sth = $this->db->prepare($query);
1225
+						$sth->execute($query_values);
1226
+				} catch(PDOException $e) {
1227
+						return "error : ".$e->getMessage();
1228
+				}
1229
+		}
1230
+	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1231
+				$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1232
+				$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1233
+				 try {
1234
+						$sth = $this->db->prepare($query);
1235
+						$sth->execute($query_values);
1236
+				} catch(PDOException $e) {
1237
+						return "error : ".$e->getMessage();
1238
+				}
1239
+		}
1240 1240
 	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1241 1241
 		global $globalDBdriver;
1242 1242
 		if ($globalDBdriver == 'mysql') {
@@ -1252,14 +1252,14 @@  discard block
 block discarded – undo
1252 1252
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1253 1253
 			}
1254 1254
 		}
1255
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256
-                 try {
1257
-                        $sth = $this->db->prepare($query);
1258
-                        $sth->execute($query_values);
1259
-                } catch(PDOException $e) {
1260
-                        return "error : ".$e->getMessage();
1261
-                }
1262
-        }
1255
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1256
+				 try {
1257
+						$sth = $this->db->prepare($query);
1258
+						$sth->execute($query_values);
1259
+				} catch(PDOException $e) {
1260
+						return "error : ".$e->getMessage();
1261
+				}
1262
+		}
1263 1263
 	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1264 1264
 		global $globalDBdriver;
1265 1265
 		if ($globalDBdriver == 'mysql') {
@@ -1275,14 +1275,14 @@  discard block
 block discarded – undo
1275 1275
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1276 1276
 			}
1277 1277
 		}
1278
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279
-                 try {
1280
-                        $sth = $this->db->prepare($query);
1281
-                        $sth->execute($query_values);
1282
-                } catch(PDOException $e) {
1283
-                        return "error : ".$e->getMessage();
1284
-                }
1285
-        }
1278
+				$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1279
+				 try {
1280
+						$sth = $this->db->prepare($query);
1281
+						$sth->execute($query_values);
1282
+				} catch(PDOException $e) {
1283
+						return "error : ".$e->getMessage();
1284
+				}
1285
+		}
1286 1286
 	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1287 1287
 		global $globalDBdriver;
1288 1288
 		if ($globalDBdriver == 'mysql') {
@@ -1298,14 +1298,14 @@  discard block
 block discarded – undo
1298 1298
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1299 1299
 			}
1300 1300
 		}
1301
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302
-                 try {
1303
-                        $sth = $this->db->prepare($query);
1304
-                        $sth->execute($query_values);
1305
-                } catch(PDOException $e) {
1306
-                        return "error : ".$e->getMessage();
1307
-                }
1308
-        }
1301
+				$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1302
+				 try {
1303
+						$sth = $this->db->prepare($query);
1304
+						$sth->execute($query_values);
1305
+				} catch(PDOException $e) {
1306
+						return "error : ".$e->getMessage();
1307
+				}
1308
+		}
1309 1309
 	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1310 1310
 		global $globalDBdriver;
1311 1311
 		if ($globalDBdriver == 'mysql') {
@@ -1321,14 +1321,14 @@  discard block
 block discarded – undo
1321 1321
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1322 1322
 			}
1323 1323
 		}
1324
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1325
-                 try {
1326
-                        $sth = $this->db->prepare($query);
1327
-                        $sth->execute($query_values);
1328
-                } catch(PDOException $e) {
1329
-                        return "error : ".$e->getMessage();
1330
-                }
1331
-        }
1324
+				$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1325
+				 try {
1326
+						$sth = $this->db->prepare($query);
1327
+						$sth->execute($query_values);
1328
+				} catch(PDOException $e) {
1329
+						return "error : ".$e->getMessage();
1330
+				}
1331
+		}
1332 1332
 	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1333 1333
 		global $globalDBdriver;
1334 1334
 		if ($globalDBdriver == 'mysql') {
@@ -1344,14 +1344,14 @@  discard block
 block discarded – undo
1344 1344
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1345 1345
 			}
1346 1346
 		}
1347
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348
-                 try {
1349
-                        $sth = $this->db->prepare($query);
1350
-                        $sth->execute($query_values);
1351
-                } catch(PDOException $e) {
1352
-                        return "error : ".$e->getMessage();
1353
-                }
1354
-        }
1347
+				$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1348
+				 try {
1349
+						$sth = $this->db->prepare($query);
1350
+						$sth->execute($query_values);
1351
+				} catch(PDOException $e) {
1352
+						return "error : ".$e->getMessage();
1353
+				}
1354
+		}
1355 1355
 	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1356 1356
 		global $globalDBdriver;
1357 1357
 		if ($globalDBdriver == 'mysql') {
@@ -1367,14 +1367,14 @@  discard block
 block discarded – undo
1367 1367
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1368 1368
 			}
1369 1369
 		}
1370
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371
-                 try {
1372
-                        $sth = $this->db->prepare($query);
1373
-                        $sth->execute($query_values);
1374
-                } catch(PDOException $e) {
1375
-                        return "error : ".$e->getMessage();
1376
-                }
1377
-        }
1370
+				$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1371
+				 try {
1372
+						$sth = $this->db->prepare($query);
1373
+						$sth->execute($query_values);
1374
+				} catch(PDOException $e) {
1375
+						return "error : ".$e->getMessage();
1376
+				}
1377
+		}
1378 1378
 	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1379 1379
 		global $globalDBdriver;
1380 1380
 		if ($globalDBdriver == 'mysql') {
@@ -1390,14 +1390,14 @@  discard block
 block discarded – undo
1390 1390
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1391 1391
 			}
1392 1392
 		}
1393
-                $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1394
-                 try {
1395
-                        $sth = $this->db->prepare($query);
1396
-                        $sth->execute($query_values);
1397
-                } catch(PDOException $e) {
1398
-                        return "error : ".$e->getMessage();
1399
-                }
1400
-        }
1393
+				$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1394
+				 try {
1395
+						$sth = $this->db->prepare($query);
1396
+						$sth->execute($query_values);
1397
+				} catch(PDOException $e) {
1398
+						return "error : ".$e->getMessage();
1399
+				}
1400
+		}
1401 1401
 	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1402 1402
 		global $globalDBdriver;
1403 1403
 		if ($airport_icao != '') {
@@ -1421,8 +1421,8 @@  discard block
 block discarded – undo
1421 1421
 			} catch(PDOException $e) {
1422 1422
 				return "error : ".$e->getMessage();
1423 1423
 			}
1424
-                }
1425
-        }
1424
+				}
1425
+		}
1426 1426
 	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1427 1427
 		global $globalDBdriver;
1428 1428
 		if ($airport_icao != '') {
@@ -1438,8 +1438,8 @@  discard block
 block discarded – undo
1438 1438
 			} catch(PDOException $e) {
1439 1439
 				return "error : ".$e->getMessage();
1440 1440
 			}
1441
-                }
1442
-        }
1441
+				}
1442
+		}
1443 1443
 	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1444 1444
 		global $globalDBdriver;
1445 1445
 		if ($airport_icao != '') {
@@ -1456,15 +1456,15 @@  discard block
 block discarded – undo
1456 1456
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1457 1457
 				}
1458 1458
 			}
1459
-	                $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1459
+					$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1460 1460
 			 try {
1461
-                    		$sth = $this->db->prepare($query);
1462
-	                        $sth->execute($query_values);
1463
-    		        } catch(PDOException $e) {
1464
-            		        return "error : ".$e->getMessage();
1465
-	                }
1466
-	        }
1467
-        }
1461
+							$sth = $this->db->prepare($query);
1462
+							$sth->execute($query_values);
1463
+					} catch(PDOException $e) {
1464
+							return "error : ".$e->getMessage();
1465
+					}
1466
+			}
1467
+		}
1468 1468
 	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1469 1469
 		global $globalDBdriver;
1470 1470
 		if ($airport_icao != '') {
@@ -1480,46 +1480,46 @@  discard block
 block discarded – undo
1480 1480
 			} catch(PDOException $e) {
1481 1481
 				return "error : ".$e->getMessage();
1482 1482
 			}
1483
-                }
1484
-        }
1483
+				}
1484
+		}
1485 1485
 
1486 1486
 	public function deleteStat($id) {
1487
-                $query = "DELETE FROM stats WHERE stats_id = :id";
1488
-                $query_values = array(':id' => $id);
1489
-                 try {
1490
-                        $sth = $this->db->prepare($query);
1491
-                        $sth->execute($query_values);
1492
-                } catch(PDOException $e) {
1493
-                        return "error : ".$e->getMessage();
1494
-                }
1495
-        }
1487
+				$query = "DELETE FROM stats WHERE stats_id = :id";
1488
+				$query_values = array(':id' => $id);
1489
+				 try {
1490
+						$sth = $this->db->prepare($query);
1491
+						$sth->execute($query_values);
1492
+				} catch(PDOException $e) {
1493
+						return "error : ".$e->getMessage();
1494
+				}
1495
+		}
1496 1496
 	public function deleteStatFlight($type) {
1497
-                $query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498
-                $query_values = array(':type' => $type);
1499
-                 try {
1500
-                        $sth = $this->db->prepare($query);
1501
-                        $sth->execute($query_values);
1502
-                } catch(PDOException $e) {
1503
-                        return "error : ".$e->getMessage();
1504
-                }
1505
-        }
1497
+				$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1498
+				$query_values = array(':type' => $type);
1499
+				 try {
1500
+						$sth = $this->db->prepare($query);
1501
+						$sth->execute($query_values);
1502
+				} catch(PDOException $e) {
1503
+						return "error : ".$e->getMessage();
1504
+				}
1505
+		}
1506 1506
 	public function deleteStatAirport($type) {
1507
-                $query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508
-                $query_values = array(':type' => $type);
1509
-                 try {
1510
-                        $sth = $this->db->prepare($query);
1511
-                        $sth->execute($query_values);
1512
-                } catch(PDOException $e) {
1513
-                        return "error : ".$e->getMessage();
1514
-                }
1515
-        }
1507
+				$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1508
+				$query_values = array(':type' => $type);
1509
+				 try {
1510
+						$sth = $this->db->prepare($query);
1511
+						$sth->execute($query_values);
1512
+				} catch(PDOException $e) {
1513
+						return "error : ".$e->getMessage();
1514
+				}
1515
+		}
1516 1516
         
1517
-        public function addOldStats() {
1518
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1519
-    		$Common = new Common();
1520
-    		$Connection = new Connection();
1521
-    		date_default_timezone_set('UTC');
1522
-    		$last_update = $this->getLastStatsUpdate('last_update_stats');
1517
+		public function addOldStats() {
1518
+			global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1519
+			$Common = new Common();
1520
+			$Connection = new Connection();
1521
+			date_default_timezone_set('UTC');
1522
+			$last_update = $this->getLastStatsUpdate('last_update_stats');
1523 1523
 			if ($globalDebug) echo 'Update stats !'."\n";
1524 1524
 			if (isset($last_update[0]['value'])) {
1525 1525
 				$last_update_day = $last_update[0]['value'];
@@ -1567,24 +1567,24 @@  discard block
 block discarded – undo
1567 1567
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1568 1568
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1569 1569
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1570
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1570
+				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1571 1571
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1572
-	        	$alldata = array();
1572
+				$alldata = array();
1573 1573
 	        	
1574
-    			foreach ($pall as $value) {
1575
-	        		$icao = $value['airport_departure_icao'];
1576
-    				$alldata[$icao] = $value;
1577
-	        	}
1578
-	        	foreach ($dall as $value) {
1579
-    				$icao = $value['airport_departure_icao'];
1580
-        			if (isset($alldata[$icao])) {
1581
-    					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1582
-        			} else $alldata[$icao] = $value;
1583
-			}
1584
-    			$count = array();
1585
-    			foreach ($alldata as $key => $row) {
1586
-    				$count[$key] = $row['airport_departure_icao_count'];
1587
-        		}
1574
+				foreach ($pall as $value) {
1575
+					$icao = $value['airport_departure_icao'];
1576
+					$alldata[$icao] = $value;
1577
+				}
1578
+				foreach ($dall as $value) {
1579
+					$icao = $value['airport_departure_icao'];
1580
+					if (isset($alldata[$icao])) {
1581
+						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1582
+					} else $alldata[$icao] = $value;
1583
+			}
1584
+				$count = array();
1585
+				foreach ($alldata as $key => $row) {
1586
+					$count[$key] = $row['airport_departure_icao_count'];
1587
+				}
1588 1588
 			array_multisort($count,SORT_DESC,$alldata);
1589 1589
 			foreach ($alldata as $number) {
1590 1590
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
@@ -1592,25 +1592,25 @@  discard block
 block discarded – undo
1592 1592
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1593 1593
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1594 1594
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1595
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1595
+				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1596 1596
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1597
-	        	$alldata = array();
1598
-    			foreach ($pall as $value) {
1599
-	        		$icao = $value['airport_arrival_icao'];
1600
-    				$alldata[$icao] = $value;
1601
-	        	}
1602
-	        	foreach ($dall as $value) {
1603
-    				$icao = $value['airport_arrival_icao'];
1604
-        			if (isset($alldata[$icao])) {
1605
-        				$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1606
-	        		} else $alldata[$icao] = $value;
1607
-    			}
1608
-        		$count = array();
1609
-        		foreach ($alldata as $key => $row) {
1610
-        			$count[$key] = $row['airport_arrival_icao_count'];
1611
-	        	}
1612
-    			array_multisort($count,SORT_DESC,$alldata);
1613
-                        foreach ($alldata as $number) {
1597
+				$alldata = array();
1598
+				foreach ($pall as $value) {
1599
+					$icao = $value['airport_arrival_icao'];
1600
+					$alldata[$icao] = $value;
1601
+				}
1602
+				foreach ($dall as $value) {
1603
+					$icao = $value['airport_arrival_icao'];
1604
+					if (isset($alldata[$icao])) {
1605
+						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1606
+					} else $alldata[$icao] = $value;
1607
+				}
1608
+				$count = array();
1609
+				foreach ($alldata as $key => $row) {
1610
+					$count[$key] = $row['airport_arrival_icao_count'];
1611
+				}
1612
+				array_multisort($count,SORT_DESC,$alldata);
1613
+						foreach ($alldata as $number) {
1614 1614
 				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
1615 1615
 			}
1616 1616
 			if ($Connection->tableExists('countries')) {
@@ -1687,8 +1687,8 @@  discard block
 block discarded – undo
1687 1687
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
1688 1688
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1689 1689
 			$pall = $Spotter->getLast7DaysAirportsDeparture();
1690
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1691
-        		/*
1690
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
1691
+				/*
1692 1692
 	        	$alldata = array();
1693 1693
     			foreach ($pall as $value) {
1694 1694
 	        		$icao = $value['departure_airport_icao'];
@@ -1707,29 +1707,29 @@  discard block
 block discarded – undo
1707 1707
 	        	}
1708 1708
     			array_multisort($count,SORT_DESC,$alldata);
1709 1709
     			*/
1710
-    			foreach ($dall as $value) {
1711
-    				$icao = $value['departure_airport_icao'];
1712
-    				$ddate = $value['date'];
1713
-    				$find = false;
1714
-    				foreach ($pall as $pvalue) {
1715
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1716
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1717
-    						$find = true;
1718
-    						break;
1719
-    					}
1720
-    				}
1721
-    				if ($find === false) {
1722
-    					$pall[] = $value;
1723
-    				}
1724
-    			}
1725
-    			$alldata = $pall;
1710
+				foreach ($dall as $value) {
1711
+					$icao = $value['departure_airport_icao'];
1712
+					$ddate = $value['date'];
1713
+					$find = false;
1714
+					foreach ($pall as $pvalue) {
1715
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1716
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1717
+							$find = true;
1718
+							break;
1719
+						}
1720
+					}
1721
+					if ($find === false) {
1722
+						$pall[] = $value;
1723
+					}
1724
+				}
1725
+				$alldata = $pall;
1726 1726
 			foreach ($alldata as $number) {
1727 1727
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1728 1728
 			}
1729 1729
 			echo '...Arrival'."\n";
1730 1730
 			$pall = $Spotter->getLast7DaysAirportsArrival();
1731
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1732
-        		/*
1731
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival();
1732
+				/*
1733 1733
 	        	$alldata = array();
1734 1734
     			foreach ($pall as $value) {
1735 1735
 	        		$icao = $value['arrival_airport_icao'];
@@ -1749,22 +1749,22 @@  discard block
 block discarded – undo
1749 1749
     			*/
1750 1750
 
1751 1751
 
1752
-    			foreach ($dall as $value) {
1753
-    				$icao = $value['arrival_airport_icao'];
1754
-    				$ddate = $value['date'];
1755
-    				$find = false;
1756
-    				foreach ($pall as $pvalue) {
1757
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1758
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1759
-    						$find = true;
1760
-    						break;
1761
-    					}
1762
-    				}
1763
-    				if ($find === false) {
1764
-    					$pall[] = $value;
1765
-    				}
1766
-    			}
1767
-    			$alldata = $pall;
1752
+				foreach ($dall as $value) {
1753
+					$icao = $value['arrival_airport_icao'];
1754
+					$ddate = $value['date'];
1755
+					$find = false;
1756
+					foreach ($pall as $pvalue) {
1757
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
1758
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1759
+							$find = true;
1760
+							break;
1761
+						}
1762
+					}
1763
+					if ($find === false) {
1764
+						$pall[] = $value;
1765
+					}
1766
+				}
1767
+				$alldata = $pall;
1768 1768
 			foreach ($alldata as $number) {
1769 1769
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1770 1770
 			}
@@ -1841,51 +1841,51 @@  discard block
 block discarded – undo
1841 1841
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1842 1842
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1843 1843
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1844
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1844
+	   			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1845 1845
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1846
-	        	//$alldata = array();
1847
-    			foreach ($dall as $value) {
1848
-    				$icao = $value['airport_departure_icao'];
1849
-    				$dicao = $value['airline_icao'];
1850
-    				$find = false;
1851
-    				foreach ($pall as $pvalue) {
1852
-    					if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1853
-    						$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1854
-    						$find = true;
1855
-    						break;
1856
-    					}
1857
-    				}
1858
-    				if ($find === false) {
1859
-    					$pall[] = $value;
1860
-    				}
1861
-    			}
1862
-    			$alldata = $pall;
1846
+				//$alldata = array();
1847
+				foreach ($dall as $value) {
1848
+					$icao = $value['airport_departure_icao'];
1849
+					$dicao = $value['airline_icao'];
1850
+					$find = false;
1851
+					foreach ($pall as $pvalue) {
1852
+						if ($pvalue['airport_departure_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1853
+							$pvalue['airport_departure_icao_count'] = $pvalue['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
1854
+							$find = true;
1855
+							break;
1856
+						}
1857
+					}
1858
+					if ($find === false) {
1859
+						$pall[] = $value;
1860
+					}
1861
+				}
1862
+				$alldata = $pall;
1863 1863
 			foreach ($alldata as $number) {
1864 1864
 				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
1865 1865
 			}
1866 1866
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1867 1867
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1868 1868
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1869
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1869
+				$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1870 1870
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1871
-	        	//$alldata = array();
1872
-    			foreach ($dall as $value) {
1873
-    				$icao = $value['airport_arrival_icao'];
1874
-    				$dicao = $value['airline_icao'];
1875
-    				$find = false;
1876
-    				foreach ($pall as $pvalue) {
1877
-    					if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1878
-    						$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1879
-    						$find = true;
1880
-    						break;
1881
-    					}
1882
-    				}
1883
-    				if ($find === false) {
1884
-    					$pall[] = $value;
1885
-    				}
1886
-    			}
1887
-    			$alldata = $pall;
1888
-                        foreach ($alldata as $number) {
1871
+				//$alldata = array();
1872
+				foreach ($dall as $value) {
1873
+					$icao = $value['airport_arrival_icao'];
1874
+					$dicao = $value['airline_icao'];
1875
+					$find = false;
1876
+					foreach ($pall as $pvalue) {
1877
+						if ($pvalue['airport_arrival_icao'] == $icao && $pvalue['airline_icao'] = $dicao) {
1878
+							$pvalue['airport_arrival_icao_count'] = $pvalue['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
1879
+							$find = true;
1880
+							break;
1881
+						}
1882
+					}
1883
+					if ($find === false) {
1884
+						$pall[] = $value;
1885
+					}
1886
+				}
1887
+				$alldata = $pall;
1888
+						foreach ($alldata as $number) {
1889 1889
 				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
1890 1890
 			}
1891 1891
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
@@ -1918,47 +1918,47 @@  discard block
 block discarded – undo
1918 1918
 			}
1919 1919
 			if ($globalDebug) echo '...Departure'."\n";
1920 1920
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
1921
-        		$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1922
-    			foreach ($dall as $value) {
1923
-    				$icao = $value['departure_airport_icao'];
1924
-    				$airline = $value['airline_icao'];
1925
-    				$ddate = $value['date'];
1926
-    				$find = false;
1927
-    				foreach ($pall as $pvalue) {
1928
-    					if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1929
-    						$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1930
-    						$find = true;
1931
-    						break;
1932
-    					}
1933
-    				}
1934
-    				if ($find === false) {
1935
-    					$pall[] = $value;
1936
-    				}
1937
-    			}
1938
-    			$alldata = $pall;
1921
+				$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
1922
+				foreach ($dall as $value) {
1923
+					$icao = $value['departure_airport_icao'];
1924
+					$airline = $value['airline_icao'];
1925
+					$ddate = $value['date'];
1926
+					$find = false;
1927
+					foreach ($pall as $pvalue) {
1928
+						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] = $airline) {
1929
+							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
1930
+							$find = true;
1931
+							break;
1932
+						}
1933
+					}
1934
+					if ($find === false) {
1935
+						$pall[] = $value;
1936
+					}
1937
+				}
1938
+				$alldata = $pall;
1939 1939
 			foreach ($alldata as $number) {
1940 1940
 				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
1941 1941
 			}
1942 1942
 			if ($globalDebug) echo '...Arrival'."\n";
1943 1943
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
1944
-        		$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1945
-    			foreach ($dall as $value) {
1946
-    				$icao = $value['arrival_airport_icao'];
1947
-    				$airline = $value['airline_icao'];
1948
-    				$ddate = $value['date'];
1949
-    				$find = false;
1950
-    				foreach ($pall as $pvalue) {
1951
-    					if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1952
-    						$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1953
-    						$find = true;
1954
-    						break;
1955
-    					}
1956
-    				}
1957
-    				if ($find === false) {
1958
-    					$pall[] = $value;
1959
-    				}
1960
-    			}
1961
-    			$alldata = $pall;
1944
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
1945
+				foreach ($dall as $value) {
1946
+					$icao = $value['arrival_airport_icao'];
1947
+					$airline = $value['airline_icao'];
1948
+					$ddate = $value['date'];
1949
+					$find = false;
1950
+					foreach ($pall as $pvalue) {
1951
+						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate && $pvalue['airline_icao'] == $airline) {
1952
+							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
1953
+							$find = true;
1954
+							break;
1955
+						}
1956
+					}
1957
+					if ($find === false) {
1958
+						$pall[] = $value;
1959
+					}
1960
+				}
1961
+				$alldata = $pall;
1962 1962
 			foreach ($alldata as $number) {
1963 1963
 				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
1964 1964
 			}
@@ -2043,44 +2043,44 @@  discard block
 block discarded – undo
2043 2043
 					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2044 2044
 				}
2045 2045
 				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2046
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2047
-		        	$alldata = array();
2048
-	    			foreach ($pall as $value) {
2049
-		        		$icao = $value['airport_departure_icao'];
2050
-    					$alldata[$icao] = $value;
2051
-	    			}
2052
-		        	foreach ($dall as $value) {
2053
-	    				$icao = $value['airport_departure_icao'];
2054
-        				if (isset($alldata[$icao])) {
2055
-    						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2056
-        				} else $alldata[$icao] = $value;
2057
-				}
2058
-	    			$count = array();
2059
-    				foreach ($alldata as $key => $row) {
2060
-    					$count[$key] = $row['airport_departure_icao_count'];
2061
-    				}
2046
+		   			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2047
+					$alldata = array();
2048
+					foreach ($pall as $value) {
2049
+						$icao = $value['airport_departure_icao'];
2050
+						$alldata[$icao] = $value;
2051
+					}
2052
+					foreach ($dall as $value) {
2053
+						$icao = $value['airport_departure_icao'];
2054
+						if (isset($alldata[$icao])) {
2055
+							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2056
+						} else $alldata[$icao] = $value;
2057
+				}
2058
+					$count = array();
2059
+					foreach ($alldata as $key => $row) {
2060
+						$count[$key] = $row['airport_departure_icao_count'];
2061
+					}
2062 2062
 				array_multisort($count,SORT_DESC,$alldata);
2063 2063
 				foreach ($alldata as $number) {
2064
-    					echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2064
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2065 2065
 				}
2066 2066
 				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2067
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2067
+					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2068 2068
 				$alldata = array();
2069
-    				foreach ($pall as $value) {
2070
-		        		$icao = $value['airport_arrival_icao'];
2071
-    					$alldata[$icao] = $value;
2072
-	    			}
2073
-		        	foreach ($dall as $value) {
2074
-	    				$icao = $value['airport_arrival_icao'];
2075
-        				if (isset($alldata[$icao])) {
2076
-        					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2077
-		        		} else $alldata[$icao] = $value;
2078
-	    			}
2079
-        			$count = array();
2080
-        			foreach ($alldata as $key => $row) {
2081
-    					$count[$key] = $row['airport_arrival_icao_count'];
2082
-		        	}
2083
-        			array_multisort($count,SORT_DESC,$alldata);
2069
+					foreach ($pall as $value) {
2070
+						$icao = $value['airport_arrival_icao'];
2071
+						$alldata[$icao] = $value;
2072
+					}
2073
+					foreach ($dall as $value) {
2074
+						$icao = $value['airport_arrival_icao'];
2075
+						if (isset($alldata[$icao])) {
2076
+							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2077
+						} else $alldata[$icao] = $value;
2078
+					}
2079
+					$count = array();
2080
+					foreach ($alldata as $key => $row) {
2081
+						$count[$key] = $row['airport_arrival_icao_count'];
2082
+					}
2083
+					array_multisort($count,SORT_DESC,$alldata);
2084 2084
 				foreach ($alldata as $number) {
2085 2085
 					echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2086 2086
 				}
@@ -2113,45 +2113,45 @@  discard block
 block discarded – undo
2113 2113
 				}
2114 2114
 				echo '...Departure'."\n";
2115 2115
 				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2116
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2116
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2117 2117
 				foreach ($dall as $value) {
2118
-    					$icao = $value['departure_airport_icao'];
2119
-    					$ddate = $value['date'];
2120
-    					$find = false;
2121
-    					foreach ($pall as $pvalue) {
2122
-    						if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2123
-    							$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2124
-	    						$find = true;
2125
-    							break;
2126
-    						}
2127
-    					}
2128
-    					if ($find === false) {
2129
-    						$pall[] = $value;
2130
-	    				}
2131
-    				}
2132
-	    			$alldata = $pall;
2118
+						$icao = $value['departure_airport_icao'];
2119
+						$ddate = $value['date'];
2120
+						$find = false;
2121
+						foreach ($pall as $pvalue) {
2122
+							if ($pvalue['departure_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2123
+								$pvalue['departure_airport_count'] = $pvalue['departure_airport_count'] + $value['departure_airport_count'];
2124
+								$find = true;
2125
+								break;
2126
+							}
2127
+						}
2128
+						if ($find === false) {
2129
+							$pall[] = $value;
2130
+						}
2131
+					}
2132
+					$alldata = $pall;
2133 2133
 				foreach ($alldata as $number) {
2134 2134
 					$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name);
2135 2135
 				}
2136 2136
 				echo '...Arrival'."\n";
2137 2137
 				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2138
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2138
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2139 2139
 				foreach ($dall as $value) {
2140 2140
 					$icao = $value['arrival_airport_icao'];
2141 2141
 					$ddate = $value['date'];
2142
-    					$find = false;
2142
+						$find = false;
2143 2143
 					foreach ($pall as $pvalue) {
2144
-    						if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2145
-    							$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2146
-    							$find = true;
2147
-    							break;
2148
-	    					}
2149
-    					}
2150
-    					if ($find === false) {
2151
-    						$pall[] = $value;
2152
-	    				}
2153
-    				}
2154
-    				$alldata = $pall;
2144
+							if ($pvalue['arrival_airport_icao'] == $icao && $pvalue['date'] == $ddate) {
2145
+								$pvalue['arrival_airport_count'] = $pvalue['arrival_airport_count'] + $value['arrival_airport_count'];
2146
+								$find = true;
2147
+								break;
2148
+							}
2149
+						}
2150
+						if ($find === false) {
2151
+							$pall[] = $value;
2152
+						}
2153
+					}
2154
+					$alldata = $pall;
2155 2155
 				foreach ($alldata as $number) {
2156 2156
 					$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name);
2157 2157
 				}
Please login to merge, or discard this patch.