Completed
Push — master ( 599365...1385f8 )
by Yannick
28:45
created
require/class.Stats.php 3 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -405,17 +405,17 @@  discard block
 block discarded – undo
405 405
 			}
406 406
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407 407
 		} else $all = array();
408
-                if (empty($all)) {
409
-	                $Spotter = new Spotter($this->db);
410
-            		$filters = array();
408
+				if (empty($all)) {
409
+					$Spotter = new Spotter($this->db);
410
+					$filters = array();
411 411
 			$filters = array('year' => $year,'month' => $month);
412
-            		if ($filter_name != '') {
413
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
412
+					if ($filter_name != '') {
413
+						$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
417
-                }
418
-                return $all;
416
+					$all = $Spotter->countAllAirlines($limit,0,'',$filters);
417
+				}
418
+				return $all;
419 419
 	}
420 420
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 421
 		global $globalStatsFilters;
@@ -1612,7 +1612,7 @@  discard block
 block discarded – undo
1612 1612
 			return "error : ".$e->getMessage();
1613 1613
 		}
1614 1614
 	}
1615
-        /*
1615
+		/*
1616 1616
 	public function getStatsSource($date,$stats_type = '') {
1617 1617
 		if ($stats_type == '') {
1618 1618
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
@@ -2563,8 +2563,8 @@  discard block
 block discarded – undo
2563 2563
 						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2564 2564
 					}
2565 2565
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2566
-				    	foreach ($alldata as $number) {
2567
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2566
+						foreach ($alldata as $number) {
2567
+							$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2568 2568
 					}
2569 2569
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2570 2570
 					foreach ($alldata as $number) {
Please login to merge, or discard this patch.
Spacing   +540 added lines, -540 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 		if ($this->db === null) die('Error: No DB connection.');
20 20
 	}
21 21
 
22
-	public function addLastStatsUpdate($type,$stats_date) {
22
+	public function addLastStatsUpdate($type, $stats_date) {
23 23
 		$query = "DELETE FROM config WHERE name = :type;
24 24
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
25
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
26 26
 		try {
27 27
 			$sth = $this->db->prepare($query);
28 28
 			$sth->execute($query_values);
29
-		} catch(PDOException $e) {
29
+		} catch (PDOException $e) {
30 30
 			return "error : ".$e->getMessage();
31 31
 		}
32 32
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		try {
37 37
 			$sth = $this->db->prepare($query);
38 38
 			$sth->execute(array(':type' => $type));
39
-		} catch(PDOException $e) {
39
+		} catch (PDOException $e) {
40 40
 			echo "error : ".$e->getMessage();
41 41
 		}
42 42
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		try {
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute(array(':filter_name' => $filter_name));
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error : ".$e->getMessage();
62 62
 		}
63 63
 	}
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		try {
71 71
 			$sth = $this->db->prepare($query);
72 72
 			$sth->execute();
73
-		} catch(PDOException $e) {
73
+		} catch (PDOException $e) {
74 74
 			return "error : ".$e->getMessage();
75 75
 		}
76 76
 		$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;";
77 77
 		try {
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute(array(':filter_name' => $filter_name));
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
83 83
 	}
@@ -89,77 +89,77 @@  discard block
 block discarded – undo
89 89
 		 try {
90 90
 			$sth = $this->db->prepare($query);
91 91
 			$sth->execute(array(':filter_name' => $filter_name));
92
-		} catch(PDOException $e) {
92
+		} catch (PDOException $e) {
93 93
 			echo "error : ".$e->getMessage();
94 94
 		}
95 95
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
96 96
 		if (empty($all)) {
97 97
 			$filters = array();
98 98
 			if ($filter_name != '') {
99
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
99
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
100 100
 			}
101 101
 			$Spotter = new Spotter($this->db);
102
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
102
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
103 103
 		}
104 104
 		return $all;
105 105
 	}
106
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
106
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
107 107
 		if ($filter_name == '') $filter_name = $this->filter_name;
108 108
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 109
 		try {
110 110
 			$sth = $this->db->prepare($query);
111
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
112
-		} catch(PDOException $e) {
111
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
112
+		} catch (PDOException $e) {
113 113
 			echo "error : ".$e->getMessage();
114 114
 		}
115 115
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
116 116
 		return $all;
117 117
 	}
118
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
118
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
119 119
 		if ($filter_name == '') $filter_name = $this->filter_name;
120 120
 		$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";
121 121
 		try {
122 122
 			$sth = $this->db->prepare($query);
123
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
124
-		} catch(PDOException $e) {
123
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
124
+		} catch (PDOException $e) {
125 125
 			echo "error : ".$e->getMessage();
126 126
 		}
127 127
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
128 128
 		return $all;
129 129
 	}
130
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
130
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
131 131
 		if ($filter_name == '') $filter_name = $this->filter_name;
132 132
 		$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";
133 133
 		try {
134 134
 			$sth = $this->db->prepare($query);
135
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
136
-		} catch(PDOException $e) {
135
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
136
+		} catch (PDOException $e) {
137 137
 			echo "error : ".$e->getMessage();
138 138
 		}
139 139
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
140 140
 		return $all;
141 141
 	}
142 142
 
143
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
143
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
144 144
 		if ($filter_name == '') $filter_name = $this->filter_name;
145 145
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 146
 		try {
147 147
 			$sth = $this->db->prepare($query);
148
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
149
-		} catch(PDOException $e) {
148
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
149
+		} catch (PDOException $e) {
150 150
 			echo "error : ".$e->getMessage();
151 151
 		}
152 152
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
153 153
 		return $all;
154 154
 	}
155 155
 
156
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
156
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
157 157
 		if ($filter_name == '') $filter_name = $this->filter_name;
158 158
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 159
 		try {
160 160
 			$sth = $this->db->prepare($query);
161
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
162
-		} catch(PDOException $e) {
161
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
162
+		} catch (PDOException $e) {
163 163
 			echo "error : ".$e->getMessage();
164 164
 		}
165 165
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -167,23 +167,23 @@  discard block
 block discarded – undo
167 167
 	}
168 168
 
169 169
 
170
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
170
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
171 171
 		global $globalStatsFilters;
172 172
 		if ($filter_name == '') $filter_name = $this->filter_name;
173
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
173
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
174 174
 			$Spotter = new Spotter($this->db);
175
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
175
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
176 176
 			$alliance_airlines = array();
177 177
 			foreach ($airlines as $airline) {
178
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
178
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
179 179
 			}
180 180
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
181
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 183
 				try {
184 184
 					$sth = $this->db->prepare($query);
185 185
 					$sth->execute(array(':filter_name' => $filter_name));
186
-				} catch(PDOException $e) {
186
+				} catch (PDOException $e) {
187 187
 					echo "error : ".$e->getMessage();
188 188
 				}
189 189
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -194,29 +194,29 @@  discard block
 block discarded – undo
194 194
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
195 195
 				try {
196 196
 					$sth = $this->db->prepare($query);
197
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
198
-				} catch(PDOException $e) {
197
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
198
+				} catch (PDOException $e) {
199 199
 					echo "error : ".$e->getMessage();
200 200
 				}
201 201
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 202
 			} else $all = array();
203 203
 		}
204 204
 		if (empty($all)) {
205
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
206
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
205
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
206
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
207 207
 			} else {
208
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
208
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
209 209
 			}
210 210
 			if ($filter_name != '') {
211
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212
 			}
213 213
 			$Spotter = new Spotter($this->db);
214 214
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
215
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
215
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
216 216
 		}
217 217
 		return $all;
218 218
 	}
219
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
219
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
220 220
 		global $globalStatsFilters;
221 221
 		if ($filter_name == '') $filter_name = $this->filter_name;
222 222
 		if ($year == '' && $month == '') {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 			try {
226 226
 				$sth = $this->db->prepare($query);
227 227
 				$sth->execute(array(':filter_name' => $filter_name));
228
-			} catch(PDOException $e) {
228
+			} catch (PDOException $e) {
229 229
 				echo "error : ".$e->getMessage();
230 230
 			}
231 231
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -233,32 +233,32 @@  discard block
 block discarded – undo
233 233
 		if (empty($all)) {
234 234
 			$Spotter = new Spotter($this->db);
235 235
 			$filters = array();
236
-			$filters = array('year' => $year,'month' => $month);
236
+			$filters = array('year' => $year, 'month' => $month);
237 237
 			if ($filter_name != '') {
238
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
238
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
239 239
 			}
240 240
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
241
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
241
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
242 242
 		}
243 243
 		return $all;
244 244
 	}
245
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
245
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
246 246
 		global $globalStatsFilters;
247 247
 		if ($filter_name == '') $filter_name = $this->filter_name;
248
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
248
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
249 249
 			$Spotter = new Spotter($this->db);
250
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
250
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
251 251
 			$alliance_airlines = array();
252 252
 			foreach ($airlines as $airline) {
253
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
253
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
254 254
 			}
255 255
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
256
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 258
 				try {
259 259
 					$sth = $this->db->prepare($query);
260 260
 					$sth->execute(array(':filter_name' => $filter_name));
261
-				} catch(PDOException $e) {
261
+				} catch (PDOException $e) {
262 262
 					echo "error : ".$e->getMessage();
263 263
 				}
264 264
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -269,21 +269,21 @@  discard block
 block discarded – undo
269 269
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
270 270
 				try {
271 271
 					$sth = $this->db->prepare($query);
272
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
273
-				} catch(PDOException $e) {
272
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
273
+				} catch (PDOException $e) {
274 274
 					echo "error : ".$e->getMessage();
275 275
 				}
276 276
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 277
 			} else $all = array();
278 278
 		}
279 279
 		if (empty($all)) {
280
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
281
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
280
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
281
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
282 282
 			} else {
283
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
283
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
284 284
 			}
285 285
 			if ($filter_name != '') {
286
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
286
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
287 287
 			}
288 288
 			$Spotter = new Spotter($this->db);
289 289
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -292,23 +292,23 @@  discard block
 block discarded – undo
292 292
 		return $all;
293 293
 	}
294 294
 
295
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
295
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
296 296
 		global $globalStatsFilters;
297 297
 		if ($filter_name == '') $filter_name = $this->filter_name;
298
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
298
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
299 299
 			$Spotter = new Spotter($this->db);
300
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
300
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
301 301
 			$alliance_airlines = array();
302 302
 			foreach ($airlines as $airline) {
303
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
303
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
304 304
 			}
305 305
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
306
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 308
 				try {
309 309
 					$sth = $this->db->prepare($query);
310 310
 					$sth->execute(array(':filter_name' => $filter_name));
311
-				} catch(PDOException $e) {
311
+				} catch (PDOException $e) {
312 312
 					echo "error : ".$e->getMessage();
313 313
 				}
314 314
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -319,61 +319,61 @@  discard block
 block discarded – undo
319 319
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
320 320
 				try {
321 321
 					$sth = $this->db->prepare($query);
322
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
323
-				} catch(PDOException $e) {
322
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
323
+				} catch (PDOException $e) {
324 324
 					echo "error : ".$e->getMessage();
325 325
 				}
326 326
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 327
 			} else $all = array();
328 328
 		}
329 329
 		if (empty($all)) {
330
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
331
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
330
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
331
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
332 332
 			} else {
333
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
333
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
334 334
 			}
335 335
 			if ($filter_name != '') {
336
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
336
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
337 337
 			}
338 338
 			$Spotter = new Spotter($this->db);
339 339
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
340
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
340
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
341 341
 		}
342 342
 		return $all;
343 343
 	}
344 344
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 345
 		global $globalStatsFilters;
346 346
 		if ($filter_name == '') $filter_name = $this->filter_name;
347
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
347
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
348 348
 			$Spotter = new Spotter($this->db);
349
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
349
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
350 350
 			$alliance_airlines = array();
351 351
 			foreach ($airlines as $airline) {
352
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
352
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
353 353
 			}
354
-			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
354
+			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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
+			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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 356
 			$query_values = array(':filter_name' => $filter_name);
357 357
 		} else {
358 358
 			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";
359 359
 			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";
360
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
360
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
361 361
 		}
362 362
 		try {
363 363
 			$sth = $this->db->prepare($query);
364 364
 			$sth->execute($query_values);
365
-		} catch(PDOException $e) {
365
+		} catch (PDOException $e) {
366 366
 			echo "error : ".$e->getMessage();
367 367
 		}
368 368
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
369 369
 		if (empty($all)) {
370
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
371
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
370
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
371
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
372 372
 			} else {
373
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
373
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
374 374
 			}
375 375
 			if ($filter_name != '') {
376
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
376
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
377 377
 			}
378 378
 			$Spotter = new Spotter($this->db);
379 379
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		return $all;
383 383
 	}
384 384
 
385
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
385
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
386 386
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 387
 		if ($filter_name == '') $filter_name = $this->filter_name;
388 388
 		if ($year == '' && $month == '') {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			if (isset($forsource)) {
392 392
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 393
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
394
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
394
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
395 395
 			} else {
396 396
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 397
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			try {
401 401
 				$sth = $this->db->prepare($query);
402 402
 				$sth->execute($query_values);
403
-			} catch(PDOException $e) {
403
+			} catch (PDOException $e) {
404 404
 				echo "error : ".$e->getMessage();
405 405
 			}
406 406
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -408,32 +408,32 @@  discard block
 block discarded – undo
408 408
                 if (empty($all)) {
409 409
 	                $Spotter = new Spotter($this->db);
410 410
             		$filters = array();
411
-			$filters = array('year' => $year,'month' => $month);
411
+			$filters = array('year' => $year, 'month' => $month);
412 412
             		if ($filter_name != '') {
413
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
416
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
417 417
                 }
418 418
                 return $all;
419 419
 	}
420
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
420
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
421 421
 		global $globalStatsFilters;
422 422
 		if ($filter_name == '') $filter_name = $this->filter_name;
423
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
423
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
424 424
 			$Spotter = new Spotter($this->db);
425
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
425
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
426 426
 			$alliance_airlines = array();
427 427
 			foreach ($airlines as $airline) {
428
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
428
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
429 429
 			}
430 430
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
431
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 433
 				try {
434 434
 					$sth = $this->db->prepare($query);
435 435
 					$sth->execute(array(':filter_name' => $filter_name));
436
-				} catch(PDOException $e) {
436
+				} catch (PDOException $e) {
437 437
 					echo "error : ".$e->getMessage();
438 438
 				}
439 439
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -444,45 +444,45 @@  discard block
 block discarded – undo
444 444
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
445 445
 				try {
446 446
 					$sth = $this->db->prepare($query);
447
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
448
-				} catch(PDOException $e) {
447
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
448
+				} catch (PDOException $e) {
449 449
 					echo "error : ".$e->getMessage();
450 450
 				}
451 451
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 452
 			} else $all = array();
453 453
 		}
454 454
 		if (empty($all)) {
455
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
456
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
455
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
456
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
457 457
 			} else {
458
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
458
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
459 459
 			}
460 460
 			if ($filter_name != '') {
461
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
461
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
462 462
 			}
463 463
 			$Spotter = new Spotter($this->db);
464 464
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
465
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
465
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
466 466
 		}
467 467
 		return $all;
468 468
 	}
469
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
469
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
470 470
 		global $globalStatsFilters;
471 471
 		if ($filter_name == '') $filter_name = $this->filter_name;
472
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
472
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
473 473
 			$Spotter = new Spotter($this->db);
474
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
474
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
475 475
 			$alliance_airlines = array();
476 476
 			foreach ($airlines as $airline) {
477
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
477
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
478 478
 			}
479 479
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
480
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 482
 				 try {
483 483
 					$sth = $this->db->prepare($query);
484 484
 					$sth->execute(array(':filter_name' => $filter_name));
485
-				} catch(PDOException $e) {
485
+				} catch (PDOException $e) {
486 486
 					echo "error : ".$e->getMessage();
487 487
 				}
488 488
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -493,46 +493,46 @@  discard block
 block discarded – undo
493 493
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
494 494
 				 try {
495 495
 					$sth = $this->db->prepare($query);
496
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
497
-				} catch(PDOException $e) {
496
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
497
+				} catch (PDOException $e) {
498 498
 					echo "error : ".$e->getMessage();
499 499
 				}
500 500
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 501
 			} else $all = array();
502 502
 		}
503 503
 		if (empty($all)) {
504
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
505
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
504
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
505
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
506 506
 			} else {
507
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
508 508
 			}
509 509
 			if ($filter_name != '') {
510
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
510
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
511 511
 			}
512 512
 			$Spotter = new Spotter($this->db);
513 513
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
514
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
514
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
515 515
 		}
516 516
 		return $all;
517 517
 	}
518
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
518
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
519 519
 		$Connection = new Connection($this->db);
520 520
 		if ($filter_name == '') $filter_name = $this->filter_name;
521 521
 		if ($Connection->tableExists('countries')) {
522
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
522
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
523 523
 				$Spotter = new Spotter($this->db);
524
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
524
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
525 525
 				if ($year == '' && $month == '') {
526 526
 					$alliance_airlines = array();
527 527
 					foreach ($airlines as $airline) {
528
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
528
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
529 529
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
530
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 532
 					 try {
533 533
 						$sth = $this->db->prepare($query);
534 534
 						$sth->execute(array(':filter_name' => $filter_name));
535
-					} catch(PDOException $e) {
535
+					} catch (PDOException $e) {
536 536
 						echo "error : ".$e->getMessage();
537 537
 					}
538 538
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -544,8 +544,8 @@  discard block
 block discarded – undo
544 544
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
545 545
 					 try {
546 546
 						$sth = $this->db->prepare($query);
547
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
548
-					} catch(PDOException $e) {
547
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
548
+					} catch (PDOException $e) {
549 549
 						echo "error : ".$e->getMessage();
550 550
 					}
551 551
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 			return array();
563 563
 		}
564 564
 	}
565
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
565
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
566 566
 		global $globalStatsFilters;
567 567
 		if ($filter_name == '') $filter_name = $this->filter_name;
568 568
 		if ($year == '' && $month == '') {
@@ -570,41 +570,41 @@  discard block
 block discarded – undo
570 570
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
571 571
 			try {
572 572
 				$sth = $this->db->prepare($query);
573
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
574
-			} catch(PDOException $e) {
573
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
574
+			} catch (PDOException $e) {
575 575
 				echo "error : ".$e->getMessage();
576 576
 			}
577 577
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578
 		} else $all = array();
579 579
 		if (empty($all)) {
580
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
580
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
581 581
 			if ($filter_name != '') {
582
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
583 583
 			}
584 584
 			$Spotter = new Spotter($this->db);
585 585
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
586
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
586
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
587 587
 		}
588 588
 		return $all;
589 589
 	}
590 590
 
591
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
591
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
592 592
 		global $globalStatsFilters;
593 593
 		if ($filter_name == '') $filter_name = $this->filter_name;
594
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
594
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
595 595
 			$Spotter = new Spotter($this->db);
596
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
596
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
597 597
 			if ($year == '' && $month == '') {
598 598
 				$alliance_airlines = array();
599 599
 				foreach ($airlines as $airline) {
600
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
600
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
601 601
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
602
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 604
 				try {
605 605
 					$sth = $this->db->prepare($query);
606 606
 					$sth->execute(array(':filter_name' => $filter_name));
607
-				} catch(PDOException $e) {
607
+				} catch (PDOException $e) {
608 608
 					echo "error : ".$e->getMessage();
609 609
 				}
610 610
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -615,45 +615,45 @@  discard block
 block discarded – undo
615 615
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
616 616
 				try {
617 617
 					$sth = $this->db->prepare($query);
618
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
619
-				} catch(PDOException $e) {
618
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
619
+				} catch (PDOException $e) {
620 620
 					echo "error : ".$e->getMessage();
621 621
 				}
622 622
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 623
 			} else $all = array();
624 624
 		}
625 625
 		if (empty($all)) {
626
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
627
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
626
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
627
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
628 628
 			} else {
629
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
629
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
630 630
 			}
631 631
 			if ($filter_name != '') {
632
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
632
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
633 633
 			}
634 634
 			$Spotter = new Spotter($this->db);
635 635
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
636
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
636
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
637 637
 		}
638 638
 		return $all;
639 639
 	}
640
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
640
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
641 641
 		global $globalStatsFilters;
642 642
 		if ($filter_name == '') $filter_name = $this->filter_name;
643
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
643
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
644 644
 			$Spotter = new Spotter($this->db);
645
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
645
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
646 646
 			if ($year == '' && $month == '') {
647 647
 				$alliance_airlines = array();
648 648
 				foreach ($airlines as $airline) {
649
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
649
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
650 650
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
651
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 653
 				try {
654 654
 					$sth = $this->db->prepare($query);
655 655
 					$sth->execute(array(':filter_name' => $filter_name));
656
-				} catch(PDOException $e) {
656
+				} catch (PDOException $e) {
657 657
 					echo "error : ".$e->getMessage();
658 658
 				}
659 659
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -664,27 +664,27 @@  discard block
 block discarded – undo
664 664
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
665 665
 				try {
666 666
 					$sth = $this->db->prepare($query);
667
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
668
-				} catch(PDOException $e) {
667
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
668
+				} catch (PDOException $e) {
669 669
 					echo "error : ".$e->getMessage();
670 670
 				}
671 671
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 672
 			} else $all = array();
673 673
 		}
674 674
 		if (empty($all)) {
675
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
676
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
675
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
676
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
677 677
 			} else {
678
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
678
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
679 679
 			}
680 680
 			if ($filter_name != '') {
681
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
681
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
682 682
 			}
683 683
 			$Spotter = new Spotter($this->db);
684 684
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
685 685
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
686
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
687
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
686
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
687
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
688 688
 			$all = array();
689 689
 			foreach ($pall as $value) {
690 690
 				$icao = $value['airport_departure_icao'];
@@ -700,27 +700,27 @@  discard block
 block discarded – undo
700 700
 			foreach ($all as $key => $row) {
701 701
 				$count[$key] = $row['airport_departure_icao_count'];
702 702
 			}
703
-			array_multisort($count,SORT_DESC,$all);
703
+			array_multisort($count, SORT_DESC, $all);
704 704
 		}
705 705
 		return $all;
706 706
 	}
707
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
707
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
708 708
 		global $globalStatsFilters;
709 709
 		if ($filter_name == '') $filter_name = $this->filter_name;
710
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
710
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 711
 			$Spotter = new Spotter($this->db);
712
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
712
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
713 713
 			if ($year == '' && $month == '') {
714 714
 				$alliance_airlines = array();
715 715
 				foreach ($airlines as $airline) {
716
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
716
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
717 717
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
718
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 720
 				try {
721 721
 					$sth = $this->db->prepare($query);
722 722
 					$sth->execute(array(':filter_name' => $filter_name));
723
-				} catch(PDOException $e) {
723
+				} catch (PDOException $e) {
724 724
 					echo "error : ".$e->getMessage();
725 725
 				}
726 726
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,27 +731,27 @@  discard block
 block discarded – undo
731 731
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
732 732
 				try {
733 733
 					$sth = $this->db->prepare($query);
734
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
735
-				} catch(PDOException $e) {
734
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
735
+				} catch (PDOException $e) {
736 736
 					echo "error : ".$e->getMessage();
737 737
 				}
738 738
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 739
 			} else $all = array();
740 740
 		}
741 741
 		if (empty($all)) {
742
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
743
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
742
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
743
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
744 744
 			} else {
745
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
745
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
746 746
 			}
747 747
 			if ($filter_name != '') {
748
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
748
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
749 749
 			}
750 750
 			$Spotter = new Spotter($this->db);
751 751
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
752 752
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
753
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
754
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
753
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
754
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
755 755
 			$all = array();
756 756
 			foreach ($pall as $value) {
757 757
 				$icao = $value['airport_arrival_icao'];
@@ -767,26 +767,26 @@  discard block
 block discarded – undo
767 767
 			foreach ($all as $key => $row) {
768 768
 				$count[$key] = $row['airport_arrival_icao_count'];
769 769
 			}
770
-			array_multisort($count,SORT_DESC,$all);
770
+			array_multisort($count, SORT_DESC, $all);
771 771
 		}
772 772
 		return $all;
773 773
 	}
774
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
774
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
775 775
 		global $globalDBdriver, $globalStatsFilters;
776 776
 		if ($filter_name == '') $filter_name = $this->filter_name;
777
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
777
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
778 778
 			$Spotter = new Spotter($this->db);
779
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
779
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
780 780
 			$alliance_airlines = array();
781 781
 			foreach ($airlines as $airline) {
782
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
782
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
783 783
 			}
784 784
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
785
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 787
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
788
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 790
 			}
791 791
 			$query_data = array(':filter_name' => $filter_name);
792 792
 		} else {
@@ -797,23 +797,23 @@  discard block
 block discarded – undo
797 797
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 798
 				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";
799 799
 			}
800
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
800
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
801 801
 		}
802 802
 		try {
803 803
 			$sth = $this->db->prepare($query);
804 804
 			$sth->execute($query_data);
805
-		} catch(PDOException $e) {
805
+		} catch (PDOException $e) {
806 806
 			echo "error : ".$e->getMessage();
807 807
 		}
808 808
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
809 809
 		if (empty($all)) {
810
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
811
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
810
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
811
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
812 812
 			} else {
813 813
 				$filters = array('airlines' => array($stats_airline));
814 814
 			}
815 815
 			if ($filter_name != '') {
816
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
816
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
817 817
 			}
818 818
 			$Spotter = new Spotter($this->db);
819 819
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -821,57 +821,57 @@  discard block
 block discarded – undo
821 821
 		return $all;
822 822
 	}
823 823
 	
824
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
824
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
825 825
 		global $globalStatsFilters;
826 826
 		if ($filter_name == '') $filter_name = $this->filter_name;
827
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
827
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
828 828
 			$Spotter = new Spotter($this->db);
829
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
829
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
830 830
 			$alliance_airlines = array();
831 831
 			foreach ($airlines as $airline) {
832
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
832
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
833 833
 			}
834
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
834
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
835 835
 			$query_data = array(':filter_name' => $filter_name);
836 836
 		} else {
837 837
 			$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";
838
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
838
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
839 839
 		}
840 840
 		try {
841 841
 			$sth = $this->db->prepare($query);
842 842
 			$sth->execute($query_data);
843
-		} catch(PDOException $e) {
843
+		} catch (PDOException $e) {
844 844
 			echo "error : ".$e->getMessage();
845 845
 		}
846 846
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
847 847
 		if (empty($all)) {
848
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
849
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
848
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
849
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
850 850
 			} else {
851 851
 				$filters = array('airlines' => array($stats_airline));
852 852
 			}
853 853
 			if ($filter_name != '') {
854
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
854
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
855 855
 			}
856 856
 			$Spotter = new Spotter($this->db);
857 857
 			$all = $Spotter->countAllDatesLastMonth($filters);
858 858
 		}
859 859
 		return $all;
860 860
 	}
861
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
861
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
862 862
 		global $globalDBdriver, $globalStatsFilters;
863 863
 		if ($filter_name == '') $filter_name = $this->filter_name;
864
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
864
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
865 865
 			$Spotter = new Spotter($this->db);
866
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
866
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
867 867
 			$alliance_airlines = array();
868 868
 			foreach ($airlines as $airline) {
869
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
869
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
870 870
 			}
871 871
 			if ($globalDBdriver == 'mysql') {
872
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
872
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
873 873
 			} else {
874
-				$query = "SELECT flight_date as date_name, SUM(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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
874
+				$query = "SELECT flight_date as date_name, SUM(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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
875 875
 			}
876 876
 			$query_data = array(':filter_name' => $filter_name);
877 877
 		} else {
@@ -880,60 +880,60 @@  discard block
 block discarded – undo
880 880
 			} else {
881 881
 				$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";
882 882
 			}
883
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
883
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
884 884
 		}
885 885
 		try {
886 886
 			$sth = $this->db->prepare($query);
887 887
 			$sth->execute($query_data);
888
-		} catch(PDOException $e) {
888
+		} catch (PDOException $e) {
889 889
 			echo "error : ".$e->getMessage();
890 890
 		}
891 891
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
892 892
 		if (empty($all)) {
893
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
894
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
893
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
894
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
895 895
 			} else {
896 896
 				$filters = array('airlines' => array($stats_airline));
897 897
 			}
898 898
 			if ($filter_name != '') {
899
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
899
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
900 900
 			}
901 901
 			$Spotter = new Spotter($this->db);
902 902
 			$all = $Spotter->countAllDatesLast7Days($filters);
903 903
 		}
904 904
 		return $all;
905 905
 	}
906
-	public function countAllDates($stats_airline = '',$filter_name = '') {
906
+	public function countAllDates($stats_airline = '', $filter_name = '') {
907 907
 		global $globalStatsFilters;
908 908
 		if ($filter_name == '') $filter_name = $this->filter_name;
909
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
909
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
910 910
 			$Spotter = new Spotter($this->db);
911
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
911
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
912 912
 			$alliance_airlines = array();
913 913
 			foreach ($airlines as $airline) {
914
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
914
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
915 915
 			}
916
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
916
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
917 917
 			$query_data = array(':filter_name' => $filter_name);
918 918
 		} else {
919 919
 			$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";
920
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
920
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
921 921
 		}
922 922
 		try {
923 923
 			$sth = $this->db->prepare($query);
924 924
 			$sth->execute($query_data);
925
-		} catch(PDOException $e) {
925
+		} catch (PDOException $e) {
926 926
 			echo "error : ".$e->getMessage();
927 927
 		}
928 928
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
929 929
 		if (empty($all)) {
930
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
931
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
930
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
931
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
932 932
 			} else {
933 933
 				$filters = array('airlines' => array($stats_airline));
934 934
 			}
935 935
 			if ($filter_name != '') {
936
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
936
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
937 937
 			}
938 938
 			$Spotter = new Spotter($this->db);
939 939
 			$all = $Spotter->countAllDates($filters);
@@ -948,34 +948,34 @@  discard block
 block discarded – undo
948 948
 		try {
949 949
 			$sth = $this->db->prepare($query);
950 950
 			$sth->execute($query_data);
951
-		} catch(PDOException $e) {
951
+		} catch (PDOException $e) {
952 952
 			echo "error : ".$e->getMessage();
953 953
 		}
954 954
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955
 		if (empty($all)) {
956 956
 			$filters = array();
957 957
 			if ($filter_name != '') {
958
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959
 			}
960 960
 			$Spotter = new Spotter($this->db);
961 961
 			$all = $Spotter->countAllDatesByAirlines($filters);
962 962
 		}
963 963
 		return $all;
964 964
 	}
965
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
965
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
966 966
 		global $globalStatsFilters, $globalDBdriver;
967 967
 		if ($filter_name == '') $filter_name = $this->filter_name;
968
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
968
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
969 969
 			$Spotter = new Spotter($this->db);
970
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
970
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
971 971
 			$alliance_airlines = array();
972 972
 			foreach ($airlines as $airline) {
973
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
973
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
974 974
 			}
975 975
 			if ($globalDBdriver == 'mysql') {
976
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
976
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
977 977
 			} else {
978
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
978
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
979 979
 			}
980 980
 			$query_data = array(':filter_name' => $filter_name);
981 981
 		} else {
@@ -989,18 +989,18 @@  discard block
 block discarded – undo
989 989
 		try {
990 990
 			$sth = $this->db->prepare($query);
991 991
 			$sth->execute($query_data);
992
-		} catch(PDOException $e) {
992
+		} catch (PDOException $e) {
993 993
 			echo "error : ".$e->getMessage();
994 994
 		}
995 995
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
996 996
 		if (empty($all)) {
997
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
998
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
997
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
998
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
999 999
 			} else {
1000 1000
 				$filters = array('airlines' => array($stats_airline));
1001 1001
 			}
1002 1002
 			if ($filter_name != '') {
1003
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1003
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1004 1004
 			}
1005 1005
 			$Spotter = new Spotter($this->db);
1006 1006
 			$all = $Spotter->countAllMonths($filters);
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		try {
1018 1018
 			$sth = $this->db->prepare($query);
1019 1019
 			$sth->execute();
1020
-		} catch(PDOException $e) {
1020
+		} catch (PDOException $e) {
1021 1021
 			echo "error : ".$e->getMessage();
1022 1022
 		}
1023 1023
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		try {
1038 1038
 			$sth = $this->db->prepare($query);
1039 1039
 			$sth->execute();
1040
-		} catch(PDOException $e) {
1040
+		} catch (PDOException $e) {
1041 1041
 			echo "error : ".$e->getMessage();
1042 1042
 		}
1043 1043
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1054,32 +1054,32 @@  discard block
 block discarded – undo
1054 1054
 		try {
1055 1055
 			$sth = $this->db->prepare($query);
1056 1056
 			$sth->execute(array(':filter_name' => $filter_name));
1057
-		} catch(PDOException $e) {
1057
+		} catch (PDOException $e) {
1058 1058
 			echo "error : ".$e->getMessage();
1059 1059
 		}
1060 1060
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1061 1061
 		if (empty($all)) {
1062 1062
 			$filters = array();
1063 1063
 			if ($filter_name != '') {
1064
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1064
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1065 1065
 			}
1066 1066
 			$Spotter = new Spotter($this->db);
1067 1067
 			$all = $Spotter->countAllMilitaryMonths($filters);
1068 1068
 		}
1069 1069
 		return $all;
1070 1070
 	}
1071
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1071
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1072 1072
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 1073
 		if ($filter_name == '') $filter_name = $this->filter_name;
1074
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1074
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1075 1075
 			$Spotter = new Spotter($this->db);
1076
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1076
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1077 1077
 			$alliance_airlines = array();
1078 1078
 			foreach ($airlines as $airline) {
1079
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1079
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1080 1080
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1081
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1083 1083
 			$query_data = array(':filter_name' => $filter_name);
1084 1084
 		} else {
1085 1085
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1097,37 +1097,37 @@  discard block
 block discarded – undo
1097 1097
 		try {
1098 1098
 			$sth = $this->db->prepare($query);
1099 1099
 			$sth->execute($query_data);
1100
-		} catch(PDOException $e) {
1100
+		} catch (PDOException $e) {
1101 1101
 			echo "error : ".$e->getMessage();
1102 1102
 		}
1103 1103
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104 1104
 		if (empty($all)) {
1105
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1106
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1105
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1106
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1107 1107
 			} else {
1108 1108
 				$filters = array('airlines' => array($stats_airline));
1109 1109
 			}
1110 1110
 			if ($filter_name != '') {
1111
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112
 			}
1113 1113
 			$Spotter = new Spotter($this->db);
1114
-			$all = $Spotter->countAllHours($orderby,$filters);
1114
+			$all = $Spotter->countAllHours($orderby, $filters);
1115 1115
 		}
1116 1116
 		return $all;
1117 1117
 	}
1118
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1118
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1119 1119
 		global $globalStatsFilters;
1120 1120
 		if ($filter_name == '') $filter_name = $this->filter_name;
1121 1121
 		if ($year == '') $year = date('Y');
1122
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1122
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1123 1123
 		if (empty($all)) {
1124
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1125
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1124
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1125
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1126 1126
 			} else {
1127
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1127
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1128 1128
 			}
1129 1129
 			if ($filter_name != '') {
1130
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1130
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1131 1131
 			}
1132 1132
 			$Spotter = new Spotter($this->db);
1133 1133
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1135,16 +1135,16 @@  discard block
 block discarded – undo
1135 1135
 		}
1136 1136
 		return $all;
1137 1137
 	}
1138
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1138
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1139 1139
 		global $globalStatsFilters;
1140 1140
 		if ($filter_name == '') $filter_name = $this->filter_name;
1141 1141
 		if ($year == '') $year = date('Y');
1142
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1142
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1143 1143
 		if (empty($all)) {
1144 1144
 			$filters = array();
1145
-			$filters = array('year' => $year,'month' => $month);
1145
+			$filters = array('year' => $year, 'month' => $month);
1146 1146
 			if ($filter_name != '') {
1147
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1147
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1148 1148
 			}
1149 1149
 			$Spotter = new Spotter($this->db);
1150 1150
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1152,19 +1152,19 @@  discard block
 block discarded – undo
1152 1152
 		}
1153 1153
 		return $all;
1154 1154
 	}
1155
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1155
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1156 1156
 		global $globalStatsFilters;
1157 1157
 		if ($filter_name == '') $filter_name = $this->filter_name;
1158 1158
 		if ($year == '') $year = date('Y');
1159
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1159
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1160 1160
 		if (empty($all)) {
1161
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1161
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1163 1163
 			} else {
1164
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1164
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1165 1165
 			}
1166 1166
 			if ($filter_name != '') {
1167
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1167
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1168 1168
 			}
1169 1169
 			$Spotter = new Spotter($this->db);
1170 1170
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1172,48 +1172,48 @@  discard block
 block discarded – undo
1172 1172
 		}
1173 1173
 		return $all;
1174 1174
 	}
1175
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1175
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1176 1176
 		global $globalStatsFilters;
1177 1177
 		if ($filter_name == '') $filter_name = $this->filter_name;
1178
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1178
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1179 1179
 			$Spotter = new Spotter($this->db);
1180
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1180
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1181 1181
 			if ($year == '' && $month == '') {
1182 1182
 				$alliance_airlines = array();
1183 1183
 				foreach ($airlines as $airline) {
1184
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1184
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1185 1185
 				}
1186
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1186
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1187 1187
 				try {
1188 1188
 					$sth = $this->db->prepare($query);
1189 1189
 					$sth->execute(array(':filter_name' => $filter_name));
1190
-				} catch(PDOException $e) {
1190
+				} catch (PDOException $e) {
1191 1191
 					echo "error : ".$e->getMessage();
1192 1192
 				}
1193 1193
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1194
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1195
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1196 1196
 		} else {
1197 1197
 			if ($year == '' && $month == '') {
1198 1198
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1199 1199
 				try {
1200 1200
 					$sth = $this->db->prepare($query);
1201
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1202
-				} catch(PDOException $e) {
1201
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1202
+				} catch (PDOException $e) {
1203 1203
 					echo "error : ".$e->getMessage();
1204 1204
 				}
1205 1205
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1206
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1207
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1208 1208
 		}
1209 1209
 		if (empty($all)) {
1210
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1211
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1210
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1211
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1212 1212
 			} else {
1213
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1213
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1214 1214
 			}
1215 1215
 			if ($filter_name != '') {
1216
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1216
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1217 1217
 			}
1218 1218
 			$Spotter = new Spotter($this->db);
1219 1219
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 		}
1222 1222
 		return $all;
1223 1223
 	}
1224
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1224
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1225 1225
 		global $globalStatsFilters;
1226 1226
 		if ($filter_name == '') $filter_name = $this->filter_name;
1227 1227
 		if ($year == '' && $month == '') {
@@ -1229,17 +1229,17 @@  discard block
 block discarded – undo
1229 1229
 			try {
1230 1230
 				$sth = $this->db->prepare($query);
1231 1231
 				$sth->execute(array(':filter_name' => $filter_name));
1232
-			} catch(PDOException $e) {
1232
+			} catch (PDOException $e) {
1233 1233
 				echo "error : ".$e->getMessage();
1234 1234
 			}
1235 1235
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1236
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1237
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1238 1238
 		if (empty($all)) {
1239 1239
 			$filters = array();
1240
-			$filters = array('year' => $year,'month' => $month);
1240
+			$filters = array('year' => $year, 'month' => $month);
1241 1241
 			if ($filter_name != '') {
1242
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1242
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1243 1243
 			}
1244 1244
 			$Spotter = new Spotter($this->db);
1245 1245
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1247,29 +1247,29 @@  discard block
 block discarded – undo
1247 1247
 		}
1248 1248
 		return $all;
1249 1249
 	}
1250
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1250
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1251 1251
 		global $globalStatsFilters;
1252 1252
 		if ($filter_name == '') $filter_name = $this->filter_name;
1253
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1253
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1254 1254
 			$Spotter = new Spotter($this->db);
1255
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1255
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1256 1256
 			if ($year == '' && $month == '') {
1257 1257
 				$alliance_airlines = array();
1258 1258
 				foreach ($airlines as $airline) {
1259
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1259
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1260 1260
 				}
1261
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1261
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1262 1262
 				$query_values = array(':filter_name' => $filter_name);
1263 1263
 				try {
1264 1264
 					$sth = $this->db->prepare($query);
1265 1265
 					$sth->execute($query_values);
1266
-				} catch(PDOException $e) {
1266
+				} catch (PDOException $e) {
1267 1267
 					echo "error : ".$e->getMessage();
1268 1268
 				}
1269 1269
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1270 1270
 				$all = $result[0]['nb'];
1271 1271
 			} else {
1272
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1272
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1273 1273
 			}
1274 1274
 		} else {
1275 1275
 			if ($year == '' && $month == '') {
@@ -1278,23 +1278,23 @@  discard block
 block discarded – undo
1278 1278
 				try {
1279 1279
 					$sth = $this->db->prepare($query);
1280 1280
 					$sth->execute($query_values);
1281
-				} catch(PDOException $e) {
1281
+				} catch (PDOException $e) {
1282 1282
 					echo "error : ".$e->getMessage();
1283 1283
 				}
1284 1284
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1285 1285
 				$all = $result[0]['nb'];
1286 1286
 			} else {
1287
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1287
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1288 1288
 			}
1289 1289
 		}
1290 1290
 		if (empty($all)) {
1291
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1292
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1291
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1292
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1293 1293
 			} else {
1294
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1294
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1295 1295
 			}
1296 1296
 			if ($filter_name != '') {
1297
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1297
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1298 1298
 			}
1299 1299
 			$Spotter = new Spotter($this->db);
1300 1300
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
 		}
1303 1303
 		return $all;
1304 1304
 	}
1305
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1305
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1306 1306
 		global $globalStatsFilters;
1307 1307
 		if ($filter_name == '') $filter_name = $this->filter_name;
1308 1308
 		//if ($year == '') $year = date('Y');
@@ -1312,18 +1312,18 @@  discard block
 block discarded – undo
1312 1312
 			try {
1313 1313
 				$sth = $this->db->prepare($query);
1314 1314
 				$sth->execute($query_values);
1315
-			} catch(PDOException $e) {
1315
+			} catch (PDOException $e) {
1316 1316
 				echo "error : ".$e->getMessage();
1317 1317
 			}
1318 1318
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1319 1319
 			$all = $result[0]['nb'];
1320 1320
 		} else {
1321
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1321
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1322 1322
 		}
1323 1323
 		if (empty($all)) {
1324
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1324
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1325 1325
 			if ($filter_name != '') {
1326
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1326
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1327 1327
 			}
1328 1328
 			$Spotter = new Spotter($this->db);
1329 1329
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1332,104 +1332,104 @@  discard block
 block discarded – undo
1332 1332
 		return $all;
1333 1333
 	}
1334 1334
 
1335
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1335
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1336 1336
 		if ($filter_name == '') $filter_name = $this->filter_name;
1337
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1337
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 1338
 			$Spotter = new Spotter($this->db);
1339
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1339
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1340 1340
 			$alliance_airlines = array();
1341 1341
 			foreach ($airlines as $airline) {
1342
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1342
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1343 1343
 			}
1344
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1344
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1346 1346
 		} else {
1347 1347
 			$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";
1348
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1348
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1349 1349
 		}
1350 1350
 		try {
1351 1351
 			$sth = $this->db->prepare($query);
1352 1352
 			$sth->execute($query_values);
1353
-		} catch(PDOException $e) {
1353
+		} catch (PDOException $e) {
1354 1354
 			echo "error : ".$e->getMessage();
1355 1355
 		}
1356 1356
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1357 1357
 		return $all;
1358 1358
 	}
1359
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1359
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1360 1360
 		if ($filter_name == '') $filter_name = $this->filter_name;
1361 1361
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1362
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1363
 		try {
1364 1364
 			$sth = $this->db->prepare($query);
1365 1365
 			$sth->execute($query_values);
1366
-		} catch(PDOException $e) {
1366
+		} catch (PDOException $e) {
1367 1367
 			echo "error : ".$e->getMessage();
1368 1368
 		}
1369 1369
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1370
 		return $all;
1371 1371
 	}
1372
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1372
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1373 1373
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1374
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1375
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1376 1376
 		try {
1377 1377
 			$sth = $this->db->prepare($query);
1378 1378
 			$sth->execute($query_values);
1379
-		} catch(PDOException $e) {
1379
+		} catch (PDOException $e) {
1380 1380
 			echo "error : ".$e->getMessage();
1381 1381
 		}
1382 1382
 	}
1383
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1383
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1384 1384
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1385
 		global $globalArchiveMonths, $globalDBdriver;
1386
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1386
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1387 1387
 			$Spotter = new Spotter($this->db);
1388
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1388
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389
 			$alliance_airlines = array();
1390 1390
 			foreach ($airlines as $airline) {
1391
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1391
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1392 1392
 			}
1393 1393
 			if ($globalDBdriver == 'mysql') {
1394 1394
 				if ($month == '') {
1395
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1395
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1396 1396
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1397 1397
 				} else {
1398
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1399
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1398
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1399
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1400 1400
 				}
1401 1401
 			} else {
1402 1402
 				if ($month == '') {
1403
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1403
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1404 1404
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1405 1405
 				} else {
1406
-					$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1407
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1406
+					$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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1407
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1408 1408
 				}
1409 1409
 			}
1410 1410
 		} else {
1411 1411
 			if ($globalDBdriver == 'mysql') {
1412 1412
 				if ($month == '') {
1413 1413
 					$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";
1414
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1414
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1415 1415
 				} else {
1416 1416
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1417
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1417
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1418 1418
 				}
1419 1419
 			} else {
1420 1420
 				if ($month == '') {
1421 1421
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1422
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1423 1423
 				} else {
1424 1424
 					$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";
1425
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1425
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1426 1426
 				}
1427 1427
 			}
1428 1428
 		}
1429 1429
 		try {
1430 1430
 			$sth = $this->db->prepare($query);
1431 1431
 			$sth->execute($query_values);
1432
-		} catch(PDOException $e) {
1432
+		} catch (PDOException $e) {
1433 1433
 			echo "error : ".$e->getMessage();
1434 1434
 		}
1435 1435
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1438,17 +1438,17 @@  discard block
 block discarded – undo
1438 1438
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1439
 		global $globalArchiveMonths, $globalDBdriver;
1440 1440
 		if ($filter_name == '') $filter_name = $this->filter_name;
1441
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1441
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1442 1442
 			$Spotter = new Spotter($this->db);
1443
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1443
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1444 1444
 			$alliance_airlines = array();
1445 1445
 			foreach ($airlines as $airline) {
1446
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1446
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1447 1447
 			}
1448 1448
 			if ($globalDBdriver == 'mysql') {
1449
-				$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1449
+				$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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1450 1450
 			} else {
1451
-				$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1451
+				$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 IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1452 1452
 			}
1453 1453
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1454 1454
 		} else {
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
 		try {
1463 1463
 			$sth = $this->db->prepare($query);
1464 1464
 			$sth->execute($query_values);
1465
-		} catch(PDOException $e) {
1465
+		} catch (PDOException $e) {
1466 1466
 			echo "error : ".$e->getMessage();
1467 1467
 		}
1468 1468
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1471,17 +1471,17 @@  discard block
 block discarded – undo
1471 1471
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1472
 		global $globalArchiveMonths, $globalDBdriver;
1473 1473
 		if ($filter_name == '') $filter_name = $this->filter_name;
1474
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1474
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1475 1475
 			$Spotter = new Spotter($this->db);
1476
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1476
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1477 1477
 			$alliance_airlines = array();
1478 1478
 			foreach ($airlines as $airline) {
1479
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1479
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1480 1480
 			}
1481 1481
 			if ($globalDBdriver == 'mysql') {
1482
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1482
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1483 1483
 			} else {
1484
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1484
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1485 1485
 			}
1486 1486
 		} else {
1487 1487
 			if ($globalDBdriver == 'mysql') {
@@ -1493,7 +1493,7 @@  discard block
 block discarded – undo
1493 1493
 		try {
1494 1494
 			$sth = $this->db->prepare($query);
1495 1495
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1496
-		} catch(PDOException $e) {
1496
+		} catch (PDOException $e) {
1497 1497
 			echo "error : ".$e->getMessage();
1498 1498
 		}
1499 1499
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1510,7 +1510,7 @@  discard block
 block discarded – undo
1510 1510
 		try {
1511 1511
 			$sth = $this->db->prepare($query);
1512 1512
 			$sth->execute(array(':filter_name' => $filter_name));
1513
-		} catch(PDOException $e) {
1513
+		} catch (PDOException $e) {
1514 1514
 			echo "error : ".$e->getMessage();
1515 1515
 		}
1516 1516
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1527,20 +1527,20 @@  discard block
 block discarded – undo
1527 1527
 		try {
1528 1528
 			$sth = $this->db->prepare($query);
1529 1529
 			$sth->execute(array(':filter_name' => $filter_name));
1530
-		} catch(PDOException $e) {
1530
+		} catch (PDOException $e) {
1531 1531
 			echo "error : ".$e->getMessage();
1532 1532
 		}
1533 1533
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1534 1534
 		return $all[0]['total'];
1535 1535
 	}
1536
-	public function getStatsOwner($owner_name,$filter_name = '') {
1536
+	public function getStatsOwner($owner_name, $filter_name = '') {
1537 1537
 		global $globalArchiveMonths, $globalDBdriver;
1538 1538
 		if ($filter_name == '') $filter_name = $this->filter_name;
1539 1539
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1540
 		try {
1541 1541
 			$sth = $this->db->prepare($query);
1542
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1543
-		} catch(PDOException $e) {
1542
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1543
+		} catch (PDOException $e) {
1544 1544
 			echo "error : ".$e->getMessage();
1545 1545
 		}
1546 1546
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1558,20 +1558,20 @@  discard block
 block discarded – undo
1558 1558
 		try {
1559 1559
 			$sth = $this->db->prepare($query);
1560 1560
 			$sth->execute(array(':filter_name' => $filter_name));
1561
-		} catch(PDOException $e) {
1561
+		} catch (PDOException $e) {
1562 1562
 			echo "error : ".$e->getMessage();
1563 1563
 		}
1564 1564
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1565 1565
 		return $all[0]['total'];
1566 1566
 	}
1567
-	public function getStatsPilot($pilot,$filter_name = '') {
1567
+	public function getStatsPilot($pilot, $filter_name = '') {
1568 1568
 		global $globalArchiveMonths, $globalDBdriver;
1569 1569
 		if ($filter_name == '') $filter_name = $this->filter_name;
1570 1570
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1571
 		try {
1572 1572
 			$sth = $this->db->prepare($query);
1573
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1574
-		} catch(PDOException $e) {
1573
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1574
+		} catch (PDOException $e) {
1575 1575
 			echo "error : ".$e->getMessage();
1576 1576
 		}
1577 1577
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 		else return 0;
1580 1580
 	}
1581 1581
 
1582
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1582
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1583 1583
 		global $globalDBdriver;
1584 1584
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585
 		if ($globalDBdriver == 'mysql') {
@@ -1587,15 +1587,15 @@  discard block
 block discarded – undo
1587 1587
 		} else {
1588 1588
 			$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);"; 
1589 1589
 		}
1590
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1590
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1591 1591
 		try {
1592 1592
 			$sth = $this->db->prepare($query);
1593 1593
 			$sth->execute($query_values);
1594
-		} catch(PDOException $e) {
1594
+		} catch (PDOException $e) {
1595 1595
 			return "error : ".$e->getMessage();
1596 1596
 		}
1597 1597
 	}
1598
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1598
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1599 1599
 		global $globalDBdriver;
1600 1600
 		if ($filter_name == '') $filter_name = $this->filter_name;
1601 1601
 		if ($globalDBdriver == 'mysql') {
@@ -1604,11 +1604,11 @@  discard block
 block discarded – undo
1604 1604
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1605 1605
 			$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);"; 
1606 1606
 		}
1607
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1607
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1608 1608
 		try {
1609 1609
 			$sth = $this->db->prepare($query);
1610 1610
 			$sth->execute($query_values);
1611
-		} catch(PDOException $e) {
1611
+		} catch (PDOException $e) {
1612 1612
 			return "error : ".$e->getMessage();
1613 1613
 		}
1614 1614
 	}
@@ -1632,75 +1632,75 @@  discard block
 block discarded – undo
1632 1632
         }
1633 1633
         */
1634 1634
 
1635
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1635
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1636 1636
 		global $globalDBdriver;
1637 1637
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1638 1638
 		$query_values = array();
1639 1639
 		if ($globalDBdriver == 'mysql') {
1640 1640
 			if ($year != '') {
1641 1641
 				$query .= ' AND YEAR(stats_date) = :year';
1642
-				$query_values = array_merge($query_values,array(':year' => $year));
1642
+				$query_values = array_merge($query_values, array(':year' => $year));
1643 1643
 			}
1644 1644
 			if ($month != '') {
1645 1645
 				$query .= ' AND MONTH(stats_date) = :month';
1646
-				$query_values = array_merge($query_values,array(':month' => $month));
1646
+				$query_values = array_merge($query_values, array(':month' => $month));
1647 1647
 			}
1648 1648
 			if ($day != '') {
1649 1649
 				$query .= ' AND DAY(stats_date) = :day';
1650
-				$query_values = array_merge($query_values,array(':day' => $day));
1650
+				$query_values = array_merge($query_values, array(':day' => $day));
1651 1651
 			}
1652 1652
 		} else {
1653 1653
 			if ($year != '') {
1654 1654
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1655
-				$query_values = array_merge($query_values,array(':year' => $year));
1655
+				$query_values = array_merge($query_values, array(':year' => $year));
1656 1656
 			}
1657 1657
 			if ($month != '') {
1658 1658
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1659
-				$query_values = array_merge($query_values,array(':month' => $month));
1659
+				$query_values = array_merge($query_values, array(':month' => $month));
1660 1660
 			}
1661 1661
 			if ($day != '') {
1662 1662
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1663
-				$query_values = array_merge($query_values,array(':day' => $day));
1663
+				$query_values = array_merge($query_values, array(':day' => $day));
1664 1664
 			}
1665 1665
 		}
1666 1666
 		$query .= " ORDER BY source_name";
1667
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1667
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1668 1668
 		try {
1669 1669
 			$sth = $this->db->prepare($query);
1670 1670
 			$sth->execute($query_values);
1671
-		} catch(PDOException $e) {
1671
+		} catch (PDOException $e) {
1672 1672
 			echo "error : ".$e->getMessage();
1673 1673
 		}
1674 1674
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1675 1675
 		return $all;
1676 1676
 	}
1677 1677
 
1678
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1678
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1679 1679
 		global $globalDBdriver;
1680 1680
 		if ($globalDBdriver == 'mysql') {
1681 1681
 			$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";
1682 1682
 		} else {
1683 1683
 			$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);"; 
1684 1684
 		}
1685
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1685
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1686 1686
 		try {
1687 1687
 			$sth = $this->db->prepare($query);
1688 1688
 			$sth->execute($query_values);
1689
-		} catch(PDOException $e) {
1689
+		} catch (PDOException $e) {
1690 1690
 			return "error : ".$e->getMessage();
1691 1691
 		}
1692 1692
 	}
1693
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1693
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1694 1694
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1695
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1696 1696
 		try {
1697 1697
 			$sth = $this->db->prepare($query);
1698 1698
 			$sth->execute($query_values);
1699
-		} catch(PDOException $e) {
1699
+		} catch (PDOException $e) {
1700 1700
 			return "error : ".$e->getMessage();
1701 1701
 		}
1702 1702
 	}
1703
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1703
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1704 1704
 		global $globalDBdriver;
1705 1705
 		if ($globalDBdriver == 'mysql') {
1706 1706
 			if ($reset) {
@@ -1715,15 +1715,15 @@  discard block
 block discarded – undo
1715 1715
 				$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);"; 
1716 1716
 			}
1717 1717
 		}
1718
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1718
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1719 1719
 		try {
1720 1720
 			$sth = $this->db->prepare($query);
1721 1721
 			$sth->execute($query_values);
1722
-		} catch(PDOException $e) {
1722
+		} catch (PDOException $e) {
1723 1723
 			return "error : ".$e->getMessage();
1724 1724
 		}
1725 1725
 	}
1726
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1726
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1727 1727
 		global $globalDBdriver;
1728 1728
 		if ($globalDBdriver == 'mysql') {
1729 1729
 			if ($reset) {
@@ -1738,15 +1738,15 @@  discard block
 block discarded – undo
1738 1738
 				$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);"; 
1739 1739
 			}
1740 1740
 		}
1741
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1741
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1742 1742
 		try {
1743 1743
 			$sth = $this->db->prepare($query);
1744 1744
 			$sth->execute($query_values);
1745
-		} catch(PDOException $e) {
1745
+		} catch (PDOException $e) {
1746 1746
 			return "error : ".$e->getMessage();
1747 1747
 		}
1748 1748
 	}
1749
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1749
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1750 1750
 		global $globalDBdriver;
1751 1751
 		if ($globalDBdriver == 'mysql') {
1752 1752
 			if ($reset) {
@@ -1761,15 +1761,15 @@  discard block
 block discarded – undo
1761 1761
 				$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);"; 
1762 1762
 			}
1763 1763
 		}
1764
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1764
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1765 1765
 		try {
1766 1766
 			$sth = $this->db->prepare($query);
1767 1767
 			$sth->execute($query_values);
1768
-		} catch(PDOException $e) {
1768
+		} catch (PDOException $e) {
1769 1769
 			return "error : ".$e->getMessage();
1770 1770
 		}
1771 1771
 	}
1772
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1772
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1773 1773
 		global $globalDBdriver;
1774 1774
 		if ($globalDBdriver == 'mysql') {
1775 1775
 			if ($reset) {
@@ -1784,15 +1784,15 @@  discard block
 block discarded – undo
1784 1784
 				$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);"; 
1785 1785
 			}
1786 1786
 		}
1787
-		$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);
1787
+		$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);
1788 1788
 		try {
1789 1789
 			$sth = $this->db->prepare($query);
1790 1790
 			$sth->execute($query_values);
1791
-		} catch(PDOException $e) {
1791
+		} catch (PDOException $e) {
1792 1792
 			return "error : ".$e->getMessage();
1793 1793
 		}
1794 1794
 	}
1795
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1795
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1796 1796
 		global $globalDBdriver;
1797 1797
 		if ($globalDBdriver == 'mysql') {
1798 1798
 			if ($reset) {
@@ -1807,15 +1807,15 @@  discard block
 block discarded – undo
1807 1807
 				$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);"; 
1808 1808
 			}
1809 1809
 		}
1810
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1810
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1811 1811
 		try {
1812 1812
 			$sth = $this->db->prepare($query);
1813 1813
 			$sth->execute($query_values);
1814
-		} catch(PDOException $e) {
1814
+		} catch (PDOException $e) {
1815 1815
 			return "error : ".$e->getMessage();
1816 1816
 		}
1817 1817
 	}
1818
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1818
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1819 1819
 		global $globalDBdriver;
1820 1820
 		if ($globalDBdriver == 'mysql') {
1821 1821
 			if ($reset) {
@@ -1830,15 +1830,15 @@  discard block
 block discarded – undo
1830 1830
 				$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);"; 
1831 1831
 			}
1832 1832
 		}
1833
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1833
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1834 1834
 		try {
1835 1835
 			$sth = $this->db->prepare($query);
1836 1836
 			$sth->execute($query_values);
1837
-		} catch(PDOException $e) {
1837
+		} catch (PDOException $e) {
1838 1838
 			return "error : ".$e->getMessage();
1839 1839
 		}
1840 1840
 	}
1841
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1841
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1842 1842
 		global $globalDBdriver;
1843 1843
 		if ($globalDBdriver == 'mysql') {
1844 1844
 			if ($reset) {
@@ -1853,15 +1853,15 @@  discard block
 block discarded – undo
1853 1853
 				$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);"; 
1854 1854
 			}
1855 1855
 		}
1856
-		$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);
1856
+		$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);
1857 1857
 		try {
1858 1858
 			$sth = $this->db->prepare($query);
1859 1859
 			$sth->execute($query_values);
1860
-		} catch(PDOException $e) {
1860
+		} catch (PDOException $e) {
1861 1861
 			return "error : ".$e->getMessage();
1862 1862
 		}
1863 1863
 	}
1864
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1864
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1865 1865
 		global $globalDBdriver;
1866 1866
 		if ($airport_icao != '') {
1867 1867
 			if ($globalDBdriver == 'mysql') {
@@ -1877,16 +1877,16 @@  discard block
 block discarded – undo
1877 1877
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1878 1878
 				}
1879 1879
 			}
1880
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1880
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1881 1881
 			try {
1882 1882
 				$sth = $this->db->prepare($query);
1883 1883
 				$sth->execute($query_values);
1884
-			} catch(PDOException $e) {
1884
+			} catch (PDOException $e) {
1885 1885
 				return "error : ".$e->getMessage();
1886 1886
 			}
1887 1887
 		}
1888 1888
 	}
1889
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1889
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1890 1890
 		global $globalDBdriver;
1891 1891
 		if ($airport_icao != '') {
1892 1892
 			if ($globalDBdriver == 'mysql') {
@@ -1894,16 +1894,16 @@  discard block
 block discarded – undo
1894 1894
 			} else {
1895 1895
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1896 1896
 			}
1897
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1897
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1898 1898
 			 try {
1899 1899
 				$sth = $this->db->prepare($query);
1900 1900
 				$sth->execute($query_values);
1901
-			} catch(PDOException $e) {
1901
+			} catch (PDOException $e) {
1902 1902
 				return "error : ".$e->getMessage();
1903 1903
 			}
1904 1904
 		}
1905 1905
 	}
1906
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1906
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1907 1907
 		global $globalDBdriver;
1908 1908
 		if ($airport_icao != '') {
1909 1909
 			if ($globalDBdriver == 'mysql') {
@@ -1919,16 +1919,16 @@  discard block
 block discarded – undo
1919 1919
 					$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);"; 
1920 1920
 				}
1921 1921
 			}
1922
-			$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);
1922
+			$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);
1923 1923
 			try {
1924 1924
 				$sth = $this->db->prepare($query);
1925 1925
 				$sth->execute($query_values);
1926
-			} catch(PDOException $e) {
1926
+			} catch (PDOException $e) {
1927 1927
 				return "error : ".$e->getMessage();
1928 1928
 			}
1929 1929
 		}
1930 1930
 	}
1931
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1931
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1932 1932
 		global $globalDBdriver;
1933 1933
 		if ($airport_icao != '') {
1934 1934
 			if ($globalDBdriver == 'mysql') {
@@ -1936,11 +1936,11 @@  discard block
 block discarded – undo
1936 1936
 			} else {
1937 1937
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1938 1938
 			}
1939
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1939
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1940 1940
 			try {
1941 1941
 				$sth = $this->db->prepare($query);
1942 1942
 				$sth->execute($query_values);
1943
-			} catch(PDOException $e) {
1943
+			} catch (PDOException $e) {
1944 1944
 				return "error : ".$e->getMessage();
1945 1945
 			}
1946 1946
 		}
@@ -1952,7 +1952,7 @@  discard block
 block discarded – undo
1952 1952
 		try {
1953 1953
 			$sth = $this->db->prepare($query);
1954 1954
 			$sth->execute($query_values);
1955
-		} catch(PDOException $e) {
1955
+		} catch (PDOException $e) {
1956 1956
 			return "error : ".$e->getMessage();
1957 1957
 		}
1958 1958
 	}
@@ -1962,7 +1962,7 @@  discard block
 block discarded – undo
1962 1962
 		try {
1963 1963
 			$sth = $this->db->prepare($query);
1964 1964
 			$sth->execute($query_values);
1965
-		} catch(PDOException $e) {
1965
+		} catch (PDOException $e) {
1966 1966
 			return "error : ".$e->getMessage();
1967 1967
 		}
1968 1968
 	}
@@ -1972,13 +1972,13 @@  discard block
 block discarded – undo
1972 1972
 		try {
1973 1973
 			$sth = $this->db->prepare($query);
1974 1974
 			$sth->execute($query_values);
1975
-		} catch(PDOException $e) {
1975
+		} catch (PDOException $e) {
1976 1976
 			return "error : ".$e->getMessage();
1977 1977
 		}
1978 1978
 	}
1979 1979
 
1980 1980
 	public function addOldStats() {
1981
-		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1981
+		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1982 1982
 		$Common = new Common();
1983 1983
 		$Connection = new Connection($this->db);
1984 1984
 		date_default_timezone_set('UTC');
@@ -1996,41 +1996,41 @@  discard block
 block discarded – undo
1996 1996
 			$Spotter = new Spotter($this->db);
1997 1997
 
1998 1998
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1999
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1999
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2000 2000
 			foreach ($alldata as $number) {
2001
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2001
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2002 2002
 			}
2003 2003
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2004
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2004
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2005 2005
 			foreach ($alldata as $number) {
2006
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2006
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2007 2007
 			}
2008 2008
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2009
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2009
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2010 2010
 			foreach ($alldata as $number) {
2011
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2011
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2012 2012
 			}
2013 2013
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2014
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2014
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2015 2015
 			foreach ($alldata as $number) {
2016
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2016
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2017 2017
 			}
2018 2018
 			if ($globalDebug) echo 'Count all owners...'."\n";
2019
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2019
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2020 2020
 			foreach ($alldata as $number) {
2021
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2021
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2022 2022
 			}
2023 2023
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2024
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2024
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2025 2025
 			foreach ($alldata as $number) {
2026 2026
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2027
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2027
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2028 2028
 			}
2029 2029
 			
2030 2030
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2031
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2031
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2032 2032
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2033
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2033
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2034 2034
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2035 2035
 			$alldata = array();
2036 2036
 			foreach ($pall as $value) {
@@ -2047,14 +2047,14 @@  discard block
 block discarded – undo
2047 2047
 			foreach ($alldata as $key => $row) {
2048 2048
 				$count[$key] = $row['airport_departure_icao_count'];
2049 2049
 			}
2050
-			array_multisort($count,SORT_DESC,$alldata);
2050
+			array_multisort($count, SORT_DESC, $alldata);
2051 2051
 			foreach ($alldata as $number) {
2052
-				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);
2052
+				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);
2053 2053
 			}
2054 2054
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2055
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2055
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2056 2056
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2057
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2057
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2058 2058
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2059 2059
 			$alldata = array();
2060 2060
 			foreach ($pall as $value) {
@@ -2071,18 +2071,18 @@  discard block
 block discarded – undo
2071 2071
 			foreach ($alldata as $key => $row) {
2072 2072
 				$count[$key] = $row['airport_arrival_icao_count'];
2073 2073
 			}
2074
-			array_multisort($count,SORT_DESC,$alldata);
2074
+			array_multisort($count, SORT_DESC, $alldata);
2075 2075
 			foreach ($alldata as $number) {
2076
-				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);
2076
+				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);
2077 2077
 			}
2078 2078
 			if ($Connection->tableExists('countries')) {
2079 2079
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2080 2080
 				//$SpotterArchive = new SpotterArchive();
2081 2081
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2082
 				$Spotter = new Spotter($this->db);
2083
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2083
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2084 2084
 				foreach ($alldata as $number) {
2085
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2085
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2086 2086
 				}
2087 2087
 			}
2088 2088
 			
@@ -2092,12 +2092,12 @@  discard block
 block discarded – undo
2092 2092
 				$this->deleteStatsByType('fatalities_byyear');
2093 2093
 				$alldata = $Accident->countFatalitiesByYear();
2094 2094
 				foreach ($alldata as $number) {
2095
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2095
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2096 2096
 				}
2097 2097
 				$this->deleteStatsByType('fatalities_bymonth');
2098 2098
 				$alldata = $Accident->countFatalitiesLast12Months();
2099 2099
 				foreach ($alldata as $number) {
2100
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2100
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2101 2101
 				}
2102 2102
 			}
2103 2103
 
@@ -2111,37 +2111,37 @@  discard block
 block discarded – undo
2111 2111
 			$lastyear = false;
2112 2112
 			foreach ($alldata as $number) {
2113 2113
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2114
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2114
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2115 2115
 			}
2116 2116
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2117 2117
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2118
 			foreach ($alldata as $number) {
2119
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2119
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2120 2120
 			}
2121 2121
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2122 2122
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2123
 			foreach ($alldata as $number) {
2124
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2124
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2125 2125
 			}
2126 2126
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2127 2127
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2128
 			foreach ($alldata as $number) {
2129
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2129
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2130 2130
 			}
2131 2131
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2132 2132
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2133
 			foreach ($alldata as $number) {
2134
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2134
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2135 2135
 			}
2136 2136
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2137 2137
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2138
 			foreach ($alldata as $number) {
2139
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2139
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2140 2140
 			}
2141 2141
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2142 2142
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2143
 			foreach ($alldata as $number) {
2144
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2144
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2145 2145
 			}
2146 2146
 			if ($globalDebug) echo 'Airports data...'."\n";
2147 2147
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
 			}
2187 2187
 			$alldata = $pall;
2188 2188
 			foreach ($alldata as $number) {
2189
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2189
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2190 2190
 			}
2191 2191
 			echo '...Arrival'."\n";
2192 2192
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2227,7 +2227,7 @@  discard block
 block discarded – undo
2227 2227
 			}
2228 2228
 			$alldata = $pall;
2229 2229
 			foreach ($alldata as $number) {
2230
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2230
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2231 2231
 			}
2232 2232
 
2233 2233
 			echo 'Flights data...'."\n";
@@ -2235,28 +2235,28 @@  discard block
 block discarded – undo
2235 2235
 			echo '-> countAllDatesLastMonth...'."\n";
2236 2236
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2237 2237
 			foreach ($alldata as $number) {
2238
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2238
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2239 2239
 			}
2240 2240
 			echo '-> countAllDates...'."\n";
2241 2241
 			$previousdata = $this->countAllDates();
2242 2242
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2243 2243
 			$this->deleteStatFlight('date');
2244
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2244
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2245 2245
 			$values = array();
2246 2246
 			foreach ($alldata as $cnt) {
2247 2247
 				$values[] = $cnt['date_count'];
2248 2248
 			}
2249
-			array_multisort($values,SORT_DESC,$alldata);
2250
-			array_splice($alldata,11);
2249
+			array_multisort($values, SORT_DESC, $alldata);
2250
+			array_splice($alldata, 11);
2251 2251
 			foreach ($alldata as $number) {
2252
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2252
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2253 2253
 			}
2254 2254
 			
2255 2255
 			$this->deleteStatFlight('hour');
2256 2256
 			echo '-> countAllHours...'."\n";
2257
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2257
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2258 2258
 			foreach ($alldata as $number) {
2259
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2259
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2260 2260
 			}
2261 2261
 
2262 2262
 			// Count by airlines
@@ -2265,42 +2265,42 @@  discard block
 block discarded – undo
2265 2265
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2266 2266
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2267
 				//$Spotter = new Spotter($this->db);
2268
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2268
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2269 2269
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2270 2270
 				foreach ($alldata as $number) {
2271
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2271
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2272 2272
 				}
2273 2273
 			}
2274 2274
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2275 2275
 			$Spotter = new Spotter($this->db);
2276
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2276
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2277 2277
 			foreach ($alldata as $number) {
2278
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2278
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2279 2279
 			}
2280 2280
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2281
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2281
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2282 2282
 			foreach ($alldata as $number) {
2283
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2283
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2284 2284
 			}
2285 2285
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2286
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2286
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2287 2287
 			foreach ($alldata as $number) {
2288
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2288
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2289 2289
 			}
2290 2290
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2291
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2291
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2292 2292
 			foreach ($alldata as $number) {
2293
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2293
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2294 2294
 			}
2295 2295
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2296
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2296
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2297 2297
 			foreach ($alldata as $number) {
2298
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2298
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2299 2299
 			}
2300 2300
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2301
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2301
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2302 2302
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2303
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2303
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2304 2304
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2305 2305
 			//$alldata = array();
2306 2306
 			foreach ($dall as $value) {
@@ -2320,12 +2320,12 @@  discard block
 block discarded – undo
2320 2320
 			}
2321 2321
 			$alldata = $pall;
2322 2322
 			foreach ($alldata as $number) {
2323
-				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);
2323
+				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);
2324 2324
 			}
2325 2325
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2326
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2326
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2327 2327
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2328
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2328
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2329 2329
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2330 2330
 			//$alldata = array();
2331 2331
 			foreach ($dall as $value) {
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 			}
2346 2346
 			$alldata = $pall;
2347 2347
 			foreach ($alldata as $number) {
2348
-				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);
2348
+				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);
2349 2349
 			}
2350 2350
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2351
 			$Spotter = new Spotter($this->db);
@@ -2353,27 +2353,27 @@  discard block
 block discarded – undo
2353 2353
 			$lastyear = false;
2354 2354
 			foreach ($alldata as $number) {
2355 2355
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2356
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2356
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2357 2357
 			}
2358 2358
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2359 2359
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2360
 			foreach ($alldata as $number) {
2361
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2361
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2362 2362
 			}
2363 2363
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2364 2364
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2365
 			foreach ($alldata as $number) {
2366
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2366
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2367 2367
 			}
2368 2368
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2369 2369
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2370
 			foreach ($alldata as $number) {
2371
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2371
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2372 2372
 			}
2373 2373
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2374 2374
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2375
 			foreach ($alldata as $number) {
2376
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2376
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2377 2377
 			}
2378 2378
 			if ($globalDebug) echo '...Departure'."\n";
2379 2379
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
 			}
2397 2397
 			$alldata = $pall;
2398 2398
 			foreach ($alldata as $number) {
2399
-				$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']);
2399
+				$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']);
2400 2400
 			}
2401 2401
 			if ($globalDebug) echo '...Arrival'."\n";
2402 2402
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -2419,32 +2419,32 @@  discard block
 block discarded – undo
2419 2419
 			}
2420 2420
 			$alldata = $pall;
2421 2421
 			foreach ($alldata as $number) {
2422
-				$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']);
2422
+				$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']);
2423 2423
 			}
2424 2424
 
2425 2425
 			if ($globalDebug) echo 'Flights data...'."\n";
2426 2426
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2427 2427
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2428
 			foreach ($alldata as $number) {
2429
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2429
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2430 2430
 			}
2431 2431
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2432 2432
 			//$previousdata = $this->countAllDatesByAirlines();
2433
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2433
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2434 2434
 			$values = array();
2435 2435
 			foreach ($alldata as $cnt) {
2436 2436
 				$values[] = $cnt['date_count'];
2437 2437
 			}
2438
-			array_multisort($values,SORT_DESC,$alldata);
2439
-			array_splice($alldata,11);
2438
+			array_multisort($values, SORT_DESC, $alldata);
2439
+			array_splice($alldata, 11);
2440 2440
 			foreach ($alldata as $number) {
2441
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2441
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2442 2442
 			}
2443 2443
 			
2444 2444
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2445
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2445
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2446 2446
 			foreach ($alldata as $number) {
2447
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2447
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2448 2448
 			}
2449 2449
 
2450 2450
 			// Stats by filters
@@ -2468,7 +2468,7 @@  discard block
 block discarded – undo
2468 2468
 							$last_update_day = date('Y').'-01-01 00:00:00';
2469 2469
 						}
2470 2470
 					}
2471
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2471
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2472 2472
 						$last_update_day = date('Y').'-01-01 00:00:00';
2473 2473
 						$reset = true;
2474 2474
 					}
@@ -2477,32 +2477,32 @@  discard block
 block discarded – undo
2477 2477
 				// Count by filter
2478 2478
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2479 2479
 				$Spotter = new Spotter($this->db);
2480
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2480
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2481 2481
 				foreach ($alldata as $number) {
2482
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2482
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2483 2483
 				}
2484
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2484
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2485 2485
 				foreach ($alldata as $number) {
2486
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2486
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2487 2487
 				}
2488
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2488
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2489 2489
 				foreach ($alldata as $number) {
2490
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2490
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2491 2491
 				}
2492
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2492
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2493 2493
 				foreach ($alldata as $number) {
2494
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2494
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2495 2495
 				}
2496
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2496
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2497 2497
 				foreach ($alldata as $number) {
2498
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2498
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2499 2499
 				}
2500
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2500
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2501 2501
 				foreach ($alldata as $number) {
2502
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2502
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2503 2503
 				}
2504
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2505
-				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2504
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2505
+				$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2506 2506
 				$alldata = array();
2507 2507
 				foreach ($pall as $value) {
2508 2508
 					$icao = $value['airport_departure_icao'];
@@ -2518,12 +2518,12 @@  discard block
 block discarded – undo
2518 2518
 				foreach ($alldata as $key => $row) {
2519 2519
 					$count[$key] = $row['airport_departure_icao_count'];
2520 2520
 				}
2521
-				array_multisort($count,SORT_DESC,$alldata);
2521
+				array_multisort($count, SORT_DESC, $alldata);
2522 2522
 				foreach ($alldata as $number) {
2523
-					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);
2523
+					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);
2524 2524
 				}
2525
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2526
-				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2525
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2526
+				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2527 2527
 				$alldata = array();
2528 2528
 				foreach ($pall as $value) {
2529 2529
 					$icao = $value['airport_arrival_icao'];
@@ -2539,40 +2539,40 @@  discard block
 block discarded – undo
2539 2539
 				foreach ($alldata as $key => $row) {
2540 2540
 					$count[$key] = $row['airport_arrival_icao_count'];
2541 2541
 				}
2542
-				array_multisort($count,SORT_DESC,$alldata);
2542
+				array_multisort($count, SORT_DESC, $alldata);
2543 2543
 				foreach ($alldata as $number) {
2544
-					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);
2544
+					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);
2545 2545
 				}
2546 2546
 					$Spotter = new Spotter($this->db);
2547 2547
 					$alldata = $Spotter->countAllMonths($filter);
2548 2548
 					$lastyear = false;
2549 2549
 					foreach ($alldata as $number) {
2550 2550
 						if ($number['year_name'] != date('Y')) $lastyear = true;
2551
-						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2551
+						$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2552 2552
 					}
2553 2553
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2554 2554
 					foreach ($alldata as $number) {
2555
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2555
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2556 2556
 					}
2557 2557
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2558 2558
 					foreach ($alldata as $number) {
2559
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2559
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2560 2560
 					}
2561 2561
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2562 2562
 					foreach ($alldata as $number) {
2563
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2563
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2564 2564
 					}
2565 2565
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2566 2566
 				    	foreach ($alldata as $number) {
2567
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2567
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2568 2568
 					}
2569 2569
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2570 2570
 					foreach ($alldata as $number) {
2571
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2571
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2572 2572
 					}
2573 2573
 					echo '...Departure'."\n";
2574
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2575
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2574
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2575
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2576 2576
 					foreach ($dall as $value) {
2577 2577
 						$icao = $value['departure_airport_icao'];
2578 2578
 						$ddate = $value['date'];
@@ -2590,11 +2590,11 @@  discard block
 block discarded – undo
2590 2590
 					}
2591 2591
 					$alldata = $pall;
2592 2592
 					foreach ($alldata as $number) {
2593
-						$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);
2593
+						$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);
2594 2594
 					}
2595 2595
 					echo '...Arrival'."\n";
2596
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2597
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2596
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2597
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2598 2598
 					foreach ($dall as $value) {
2599 2599
 						$icao = $value['arrival_airport_icao'];
2600 2600
 						$ddate = $value['date'];
@@ -2612,39 +2612,39 @@  discard block
 block discarded – undo
2612 2612
 					}
2613 2613
 					$alldata = $pall;
2614 2614
 					foreach ($alldata as $number) {
2615
-						$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);
2615
+						$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);
2616 2616
 					}
2617 2617
 					echo 'Flights data...'."\n";
2618 2618
 					echo '-> countAllDatesLastMonth...'."\n";
2619 2619
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
2620 2620
 					foreach ($alldata as $number) {
2621
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2621
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2622 2622
 					}
2623 2623
 					echo '-> countAllDates...'."\n";
2624
-					$previousdata = $this->countAllDates('',$filter_name);
2625
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2624
+					$previousdata = $this->countAllDates('', $filter_name);
2625
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2626 2626
 					$values = array();
2627 2627
 					foreach ($alldata as $cnt) {
2628 2628
 						$values[] = $cnt['date_count'];
2629 2629
 					}
2630
-					array_multisort($values,SORT_DESC,$alldata);
2631
-					array_splice($alldata,11);
2630
+					array_multisort($values, SORT_DESC, $alldata);
2631
+					array_splice($alldata, 11);
2632 2632
 					foreach ($alldata as $number) {
2633
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2633
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2634 2634
 					}
2635 2635
 				
2636 2636
 					echo '-> countAllHours...'."\n";
2637
-					$alldata = $Spotter->countAllHours('hour',$filter);
2637
+					$alldata = $Spotter->countAllHours('hour', $filter);
2638 2638
 					foreach ($alldata as $number) {
2639
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2639
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2640 2640
 					}
2641 2641
 					echo 'Insert last stats update date...'."\n";
2642 2642
 					date_default_timezone_set('UTC');
2643
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2643
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2644 2644
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2645
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
2645
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
2646 2646
 							$this->deleteOldStats($filter_name);
2647
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2647
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2648 2648
 						}
2649 2649
 					}
2650 2650
 				}
@@ -2656,16 +2656,16 @@  discard block
 block discarded – undo
2656 2656
 				// SUM all previous month to put as year
2657 2657
 				$previous_year = date('Y');
2658 2658
 				$previous_year--;
2659
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2660
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2661
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2662
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2659
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2660
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2661
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2662
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2663 2663
 				$allairlines = $this->getAllAirlineNames();
2664 2664
 				foreach ($allairlines as $data) {
2665
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2666
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2667
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2668
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2665
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2666
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2667
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2668
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2669 2669
 				}
2670 2670
 				
2671 2671
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2674,7 +2674,7 @@  discard block
 block discarded – undo
2674 2674
 						try {
2675 2675
 							$sth = $this->db->prepare($query);
2676 2676
 							$sth->execute();
2677
-						} catch(PDOException $e) {
2677
+						} catch (PDOException $e) {
2678 2678
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2679 2679
 						}
2680 2680
 					}
@@ -2683,15 +2683,15 @@  discard block
 block discarded – undo
2683 2683
 					try {
2684 2684
 						$sth = $this->db->prepare($query);
2685 2685
 						$sth->execute();
2686
-					} catch(PDOException $e) {
2686
+					} catch (PDOException $e) {
2687 2687
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2688 2688
 					}
2689 2689
 				}
2690 2690
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2691 2691
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2692
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2692
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2693 2693
 						$this->deleteOldStats();
2694
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2694
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2695 2695
 						$lastyearupdate = true;
2696 2696
 					}
2697 2697
 				}
@@ -2713,7 +2713,7 @@  discard block
 block discarded – undo
2713 2713
 					try {
2714 2714
 						$sth = $this->db->prepare($query);
2715 2715
 						$sth->execute();
2716
-					} catch(PDOException $e) {
2716
+					} catch (PDOException $e) {
2717 2717
 						return "error : ".$e->getMessage();
2718 2718
 					}
2719 2719
 				}
@@ -2727,14 +2727,14 @@  discard block
 block discarded – undo
2727 2727
 				try {
2728 2728
 					$sth = $this->db->prepare($query);
2729 2729
 					$sth->execute();
2730
-				} catch(PDOException $e) {
2730
+				} catch (PDOException $e) {
2731 2731
 					return "error : ".$e->getMessage();
2732 2732
 				}
2733 2733
 			}
2734 2734
 			if (!isset($lastyearupdate)) {
2735 2735
 				echo 'Insert last stats update date...'."\n";
2736 2736
 				date_default_timezone_set('UTC');
2737
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2737
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2738 2738
 			}
2739 2739
 			if ($globalStatsResetYear) {
2740 2740
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
Braces   +583 added lines, -205 removed lines patch added patch discarded remove patch
@@ -13,10 +13,14 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	public function __construct($dbc = null) {
15 15
 		global $globalFilterName;
16
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16
+		if (isset($globalFilterName)) {
17
+			$this->filter_name = $globalFilterName;
18
+		}
17 19
 		$Connection = new Connection($dbc);
18 20
 		$this->db = $Connection->db();
19
-		if ($this->db === null) die('Error: No DB connection.');
21
+		if ($this->db === null) {
22
+			die('Error: No DB connection.');
23
+		}
20 24
 	}
21 25
 
22 26
 	public function addLastStatsUpdate($type,$stats_date) {
@@ -84,7 +88,9 @@  discard block
 block discarded – undo
84 88
 
85 89
 	public function getAllAirlineNames($filter_name = '') {
86 90
 		global $globalStatsFilters;
87
-		if ($filter_name == '') $filter_name = $this->filter_name;
91
+		if ($filter_name == '') {
92
+			$filter_name = $this->filter_name;
93
+		}
88 94
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
89 95
 		 try {
90 96
 			$sth = $this->db->prepare($query);
@@ -104,7 +110,9 @@  discard block
 block discarded – undo
104 110
 		return $all;
105 111
 	}
106 112
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
107
-		if ($filter_name == '') $filter_name = $this->filter_name;
113
+		if ($filter_name == '') {
114
+			$filter_name = $this->filter_name;
115
+		}
108 116
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 117
 		try {
110 118
 			$sth = $this->db->prepare($query);
@@ -116,7 +124,9 @@  discard block
 block discarded – undo
116 124
 		return $all;
117 125
 	}
118 126
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
119
-		if ($filter_name == '') $filter_name = $this->filter_name;
127
+		if ($filter_name == '') {
128
+			$filter_name = $this->filter_name;
129
+		}
120 130
 		$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";
121 131
 		try {
122 132
 			$sth = $this->db->prepare($query);
@@ -128,7 +138,9 @@  discard block
 block discarded – undo
128 138
 		return $all;
129 139
 	}
130 140
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
131
-		if ($filter_name == '') $filter_name = $this->filter_name;
141
+		if ($filter_name == '') {
142
+			$filter_name = $this->filter_name;
143
+		}
132 144
 		$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";
133 145
 		try {
134 146
 			$sth = $this->db->prepare($query);
@@ -141,7 +153,9 @@  discard block
 block discarded – undo
141 153
 	}
142 154
 
143 155
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
144
-		if ($filter_name == '') $filter_name = $this->filter_name;
156
+		if ($filter_name == '') {
157
+			$filter_name = $this->filter_name;
158
+		}
145 159
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 160
 		try {
147 161
 			$sth = $this->db->prepare($query);
@@ -154,7 +168,9 @@  discard block
 block discarded – undo
154 168
 	}
155 169
 
156 170
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
157
-		if ($filter_name == '') $filter_name = $this->filter_name;
171
+		if ($filter_name == '') {
172
+			$filter_name = $this->filter_name;
173
+		}
158 174
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 175
 		try {
160 176
 			$sth = $this->db->prepare($query);
@@ -169,7 +185,9 @@  discard block
 block discarded – undo
169 185
 
170 186
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
171 187
 		global $globalStatsFilters;
172
-		if ($filter_name == '') $filter_name = $this->filter_name;
188
+		if ($filter_name == '') {
189
+			$filter_name = $this->filter_name;
190
+		}
173 191
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
174 192
 			$Spotter = new Spotter($this->db);
175 193
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -178,8 +196,11 @@  discard block
 block discarded – undo
178 196
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
179 197
 			}
180 198
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
199
+				if ($limit) {
200
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
201
+				} else {
202
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
203
+				}
183 204
 				try {
184 205
 					$sth = $this->db->prepare($query);
185 206
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -187,11 +208,16 @@  discard block
 block discarded – undo
187 208
 					echo "error : ".$e->getMessage();
188 209
 				}
189 210
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
190
-			} else $all = array();
211
+			} else {
212
+				$all = array();
213
+			}
191 214
 		} else {
192 215
 			if ($year == '' && $month == '') {
193
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
194
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
216
+				if ($limit) {
217
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
218
+				} else {
219
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
220
+				}
195 221
 				try {
196 222
 					$sth = $this->db->prepare($query);
197 223
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -199,7 +225,9 @@  discard block
 block discarded – undo
199 225
 					echo "error : ".$e->getMessage();
200 226
 				}
201 227
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202
-			} else $all = array();
228
+			} else {
229
+				$all = array();
230
+			}
203 231
 		}
204 232
 		if (empty($all)) {
205 233
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -218,10 +246,15 @@  discard block
 block discarded – undo
218 246
 	}
219 247
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
220 248
 		global $globalStatsFilters;
221
-		if ($filter_name == '') $filter_name = $this->filter_name;
249
+		if ($filter_name == '') {
250
+			$filter_name = $this->filter_name;
251
+		}
222 252
 		if ($year == '' && $month == '') {
223
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
224
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
253
+			if ($limit) {
254
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
255
+			} else {
256
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
257
+			}
225 258
 			try {
226 259
 				$sth = $this->db->prepare($query);
227 260
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -229,7 +262,9 @@  discard block
 block discarded – undo
229 262
 				echo "error : ".$e->getMessage();
230 263
 			}
231 264
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
232
-		} else $all = array();
265
+		} else {
266
+			$all = array();
267
+		}
233 268
 		if (empty($all)) {
234 269
 			$Spotter = new Spotter($this->db);
235 270
 			$filters = array();
@@ -244,7 +279,9 @@  discard block
 block discarded – undo
244 279
 	}
245 280
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
246 281
 		global $globalStatsFilters;
247
-		if ($filter_name == '') $filter_name = $this->filter_name;
282
+		if ($filter_name == '') {
283
+			$filter_name = $this->filter_name;
284
+		}
248 285
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
249 286
 			$Spotter = new Spotter($this->db);
250 287
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -253,8 +290,11 @@  discard block
 block discarded – undo
253 290
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
254 291
 			}
255 292
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
293
+				if ($limit) {
294
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
295
+				} else {
296
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
297
+				}
258 298
 				try {
259 299
 					$sth = $this->db->prepare($query);
260 300
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -262,11 +302,16 @@  discard block
 block discarded – undo
262 302
 					echo "error : ".$e->getMessage();
263 303
 				}
264 304
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
265
-			} else $all = array();
305
+			} else {
306
+				$all = array();
307
+			}
266 308
 		} else {
267 309
 			if ($year == '' && $month == '') {
268
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
269
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
310
+				if ($limit) {
311
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
312
+				} else {
313
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
314
+				}
270 315
 				try {
271 316
 					$sth = $this->db->prepare($query);
272 317
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -274,7 +319,9 @@  discard block
 block discarded – undo
274 319
 					echo "error : ".$e->getMessage();
275 320
 				}
276 321
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277
-			} else $all = array();
322
+			} else {
323
+				$all = array();
324
+			}
278 325
 		}
279 326
 		if (empty($all)) {
280 327
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -294,7 +341,9 @@  discard block
 block discarded – undo
294 341
 
295 342
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
296 343
 		global $globalStatsFilters;
297
-		if ($filter_name == '') $filter_name = $this->filter_name;
344
+		if ($filter_name == '') {
345
+			$filter_name = $this->filter_name;
346
+		}
298 347
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
299 348
 			$Spotter = new Spotter($this->db);
300 349
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -303,8 +352,11 @@  discard block
 block discarded – undo
303 352
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
304 353
 			}
305 354
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
355
+				if ($limit) {
356
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
357
+				} else {
358
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
359
+				}
308 360
 				try {
309 361
 					$sth = $this->db->prepare($query);
310 362
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -312,11 +364,16 @@  discard block
 block discarded – undo
312 364
 					echo "error : ".$e->getMessage();
313 365
 				}
314 366
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
315
-			} else $all = array();
367
+			} else {
368
+				$all = array();
369
+			}
316 370
 		} else {
317 371
 			if ($year == '' && $month == '') {
318
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
319
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
372
+				if ($limit) {
373
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
374
+				} else {
375
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
376
+				}
320 377
 				try {
321 378
 					$sth = $this->db->prepare($query);
322 379
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -324,7 +381,9 @@  discard block
 block discarded – undo
324 381
 					echo "error : ".$e->getMessage();
325 382
 				}
326 383
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327
-			} else $all = array();
384
+			} else {
385
+				$all = array();
386
+			}
328 387
 		}
329 388
 		if (empty($all)) {
330 389
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -343,7 +402,9 @@  discard block
 block discarded – undo
343 402
 	}
344 403
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 404
 		global $globalStatsFilters;
346
-		if ($filter_name == '') $filter_name = $this->filter_name;
405
+		if ($filter_name == '') {
406
+			$filter_name = $this->filter_name;
407
+		}
347 408
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
348 409
 			$Spotter = new Spotter($this->db);
349 410
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -351,12 +412,18 @@  discard block
 block discarded – undo
351 412
 			foreach ($airlines as $airline) {
352 413
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
353 414
 			}
354
-			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
415
+			if ($limit) {
416
+				$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
417
+			} else {
418
+				$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 IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
419
+			}
356 420
 			$query_values = array(':filter_name' => $filter_name);
357 421
 		} else {
358
-			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";
359
-			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";
422
+			if ($limit) {
423
+				$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";
424
+			} else {
425
+				$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";
426
+			}
360 427
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
361 428
 		}
362 429
 		try {
@@ -384,17 +451,29 @@  discard block
 block discarded – undo
384 451
 
385 452
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
386 453
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387
-		if ($filter_name == '') $filter_name = $this->filter_name;
454
+		if ($filter_name == '') {
455
+			$filter_name = $this->filter_name;
456
+		}
388 457
 		if ($year == '' && $month == '') {
389
-			if ($globalVATSIM) $forsource = 'vatsim';
390
-			if ($globalIVAO) $forsource = 'ivao';
458
+			if ($globalVATSIM) {
459
+				$forsource = 'vatsim';
460
+			}
461
+			if ($globalIVAO) {
462
+				$forsource = 'ivao';
463
+			}
391 464
 			if (isset($forsource)) {
392
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
465
+				if ($limit) {
466
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
467
+				} else {
468
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
469
+				}
394 470
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
395 471
 			} else {
396
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
472
+				if ($limit) {
473
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
474
+				} else {
475
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
476
+				}
398 477
 				$query_values = array(':filter_name' => $filter_name);
399 478
 			}
400 479
 			try {
@@ -404,7 +483,9 @@  discard block
 block discarded – undo
404 483
 				echo "error : ".$e->getMessage();
405 484
 			}
406 485
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407
-		} else $all = array();
486
+		} else {
487
+			$all = array();
488
+		}
408 489
                 if (empty($all)) {
409 490
 	                $Spotter = new Spotter($this->db);
410 491
             		$filters = array();
@@ -419,7 +500,9 @@  discard block
 block discarded – undo
419 500
 	}
420 501
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 502
 		global $globalStatsFilters;
422
-		if ($filter_name == '') $filter_name = $this->filter_name;
503
+		if ($filter_name == '') {
504
+			$filter_name = $this->filter_name;
505
+		}
423 506
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
424 507
 			$Spotter = new Spotter($this->db);
425 508
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -428,8 +511,11 @@  discard block
 block discarded – undo
428 511
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
429 512
 			}
430 513
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
514
+				if ($limit) {
515
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
516
+				} else {
517
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
518
+				}
433 519
 				try {
434 520
 					$sth = $this->db->prepare($query);
435 521
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -437,11 +523,16 @@  discard block
 block discarded – undo
437 523
 					echo "error : ".$e->getMessage();
438 524
 				}
439 525
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
440
-			} else $all = array();
526
+			} else {
527
+				$all = array();
528
+			}
441 529
 		} else {
442 530
 			if ($year == '' && $month == '') {
443
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
444
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
531
+				if ($limit) {
532
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
533
+				} else {
534
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
535
+				}
445 536
 				try {
446 537
 					$sth = $this->db->prepare($query);
447 538
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -449,7 +540,9 @@  discard block
 block discarded – undo
449 540
 					echo "error : ".$e->getMessage();
450 541
 				}
451 542
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452
-			} else $all = array();
543
+			} else {
544
+				$all = array();
545
+			}
453 546
 		}
454 547
 		if (empty($all)) {
455 548
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -468,7 +561,9 @@  discard block
 block discarded – undo
468 561
 	}
469 562
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
470 563
 		global $globalStatsFilters;
471
-		if ($filter_name == '') $filter_name = $this->filter_name;
564
+		if ($filter_name == '') {
565
+			$filter_name = $this->filter_name;
566
+		}
472 567
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
473 568
 			$Spotter = new Spotter($this->db);
474 569
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -477,8 +572,11 @@  discard block
 block discarded – undo
477 572
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
478 573
 			}
479 574
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
575
+				if ($limit) {
576
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
577
+				} else {
578
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
579
+				}
482 580
 				 try {
483 581
 					$sth = $this->db->prepare($query);
484 582
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -486,11 +584,16 @@  discard block
 block discarded – undo
486 584
 					echo "error : ".$e->getMessage();
487 585
 				}
488 586
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
489
-			} else $all = array();
587
+			} else {
588
+				$all = array();
589
+			}
490 590
 		} else {
491 591
 			if ($year == '' && $month == '') {
492
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
493
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
592
+				if ($limit) {
593
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
594
+				} else {
595
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
596
+				}
494 597
 				 try {
495 598
 					$sth = $this->db->prepare($query);
496 599
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -498,7 +601,9 @@  discard block
 block discarded – undo
498 601
 					echo "error : ".$e->getMessage();
499 602
 				}
500 603
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501
-			} else $all = array();
604
+			} else {
605
+				$all = array();
606
+			}
502 607
 		}
503 608
 		if (empty($all)) {
504 609
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -517,7 +622,9 @@  discard block
 block discarded – undo
517 622
 	}
518 623
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
519 624
 		$Connection = new Connection($this->db);
520
-		if ($filter_name == '') $filter_name = $this->filter_name;
625
+		if ($filter_name == '') {
626
+			$filter_name = $this->filter_name;
627
+		}
521 628
 		if ($Connection->tableExists('countries')) {
522 629
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
523 630
 				$Spotter = new Spotter($this->db);
@@ -527,8 +634,11 @@  discard block
 block discarded – undo
527 634
 					foreach ($airlines as $airline) {
528 635
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
529 636
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
637
+					if ($limit) {
638
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
639
+					} else {
640
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
641
+					}
532 642
 					 try {
533 643
 						$sth = $this->db->prepare($query);
534 644
 						$sth->execute(array(':filter_name' => $filter_name));
@@ -537,11 +647,16 @@  discard block
 block discarded – undo
537 647
 					}
538 648
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
539 649
 					return $all;
540
-				} else return array();
650
+				} else {
651
+					return array();
652
+				}
541 653
 			} else {
542 654
 				if ($year == '' && $month == '') {
543
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
544
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
655
+					if ($limit) {
656
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
657
+					} else {
658
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
659
+					}
545 660
 					 try {
546 661
 						$sth = $this->db->prepare($query);
547 662
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -550,7 +665,9 @@  discard block
 block discarded – undo
550 665
 					}
551 666
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
552 667
 					return $all;
553
-				} else return array();
668
+				} else {
669
+					return array();
670
+				}
554 671
 			}
555 672
 		} else {
556 673
 			/*
@@ -564,10 +681,15 @@  discard block
 block discarded – undo
564 681
 	}
565 682
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
566 683
 		global $globalStatsFilters;
567
-		if ($filter_name == '') $filter_name = $this->filter_name;
684
+		if ($filter_name == '') {
685
+			$filter_name = $this->filter_name;
686
+		}
568 687
 		if ($year == '' && $month == '') {
569
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
570
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
688
+			if ($limit) {
689
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
690
+			} else {
691
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
692
+			}
571 693
 			try {
572 694
 				$sth = $this->db->prepare($query);
573 695
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -575,7 +697,9 @@  discard block
 block discarded – undo
575 697
 				echo "error : ".$e->getMessage();
576 698
 			}
577 699
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
-		} else $all = array();
700
+		} else {
701
+			$all = array();
702
+		}
579 703
 		if (empty($all)) {
580 704
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
581 705
 			if ($filter_name != '') {
@@ -590,7 +714,9 @@  discard block
 block discarded – undo
590 714
 
591 715
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
592 716
 		global $globalStatsFilters;
593
-		if ($filter_name == '') $filter_name = $this->filter_name;
717
+		if ($filter_name == '') {
718
+			$filter_name = $this->filter_name;
719
+		}
594 720
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
595 721
 			$Spotter = new Spotter($this->db);
596 722
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -599,8 +725,11 @@  discard block
 block discarded – undo
599 725
 				foreach ($airlines as $airline) {
600 726
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
601 727
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
728
+				if ($limit) {
729
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
730
+				} else {
731
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
732
+				}
604 733
 				try {
605 734
 					$sth = $this->db->prepare($query);
606 735
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -608,11 +737,16 @@  discard block
 block discarded – undo
608 737
 					echo "error : ".$e->getMessage();
609 738
 				}
610 739
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
611
-			} else $all = array();
740
+			} else {
741
+				$all = array();
742
+			}
612 743
 		} else {
613 744
 			if ($year == '' && $month == '') {
614
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
615
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
745
+				if ($limit) {
746
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
747
+				} else {
748
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
749
+				}
616 750
 				try {
617 751
 					$sth = $this->db->prepare($query);
618 752
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -620,7 +754,9 @@  discard block
 block discarded – undo
620 754
 					echo "error : ".$e->getMessage();
621 755
 				}
622 756
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623
-			} else $all = array();
757
+			} else {
758
+				$all = array();
759
+			}
624 760
 		}
625 761
 		if (empty($all)) {
626 762
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -639,7 +775,9 @@  discard block
 block discarded – undo
639 775
 	}
640 776
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
641 777
 		global $globalStatsFilters;
642
-		if ($filter_name == '') $filter_name = $this->filter_name;
778
+		if ($filter_name == '') {
779
+			$filter_name = $this->filter_name;
780
+		}
643 781
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
644 782
 			$Spotter = new Spotter($this->db);
645 783
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -648,8 +786,11 @@  discard block
 block discarded – undo
648 786
 				foreach ($airlines as $airline) {
649 787
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
650 788
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
789
+				if ($limit) {
790
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
791
+				} else {
792
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
793
+				}
653 794
 				try {
654 795
 					$sth = $this->db->prepare($query);
655 796
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -657,11 +798,16 @@  discard block
 block discarded – undo
657 798
 					echo "error : ".$e->getMessage();
658 799
 				}
659 800
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
660
-			} else $all = array();
801
+			} else {
802
+				$all = array();
803
+			}
661 804
 		} else {
662 805
 			if ($year == '' && $month == '') {
663
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
664
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
806
+				if ($limit) {
807
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
808
+				} else {
809
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
810
+				}
665 811
 				try {
666 812
 					$sth = $this->db->prepare($query);
667 813
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -669,7 +815,9 @@  discard block
 block discarded – undo
669 815
 					echo "error : ".$e->getMessage();
670 816
 				}
671 817
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672
-			} else $all = array();
818
+			} else {
819
+				$all = array();
820
+			}
673 821
 		}
674 822
 		if (empty($all)) {
675 823
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -694,7 +842,9 @@  discard block
 block discarded – undo
694 842
 				$icao = $value['airport_departure_icao'];
695 843
 				if (isset($all[$icao])) {
696 844
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
697
-				} else $all[$icao] = $value;
845
+				} else {
846
+					$all[$icao] = $value;
847
+				}
698 848
 			}
699 849
 			$count = array();
700 850
 			foreach ($all as $key => $row) {
@@ -706,7 +856,9 @@  discard block
 block discarded – undo
706 856
 	}
707 857
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
708 858
 		global $globalStatsFilters;
709
-		if ($filter_name == '') $filter_name = $this->filter_name;
859
+		if ($filter_name == '') {
860
+			$filter_name = $this->filter_name;
861
+		}
710 862
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
711 863
 			$Spotter = new Spotter($this->db);
712 864
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -715,8 +867,11 @@  discard block
 block discarded – undo
715 867
 				foreach ($airlines as $airline) {
716 868
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
717 869
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
870
+				if ($limit) {
871
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
872
+				} else {
873
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
874
+				}
720 875
 				try {
721 876
 					$sth = $this->db->prepare($query);
722 877
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -724,11 +879,16 @@  discard block
 block discarded – undo
724 879
 					echo "error : ".$e->getMessage();
725 880
 				}
726 881
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
727
-			} else $all = array();
882
+			} else {
883
+				$all = array();
884
+			}
728 885
 		} else {
729 886
 			if ($year == '' && $month == '') {
730
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
731
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
887
+				if ($limit) {
888
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
889
+				} else {
890
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
891
+				}
732 892
 				try {
733 893
 					$sth = $this->db->prepare($query);
734 894
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -736,7 +896,9 @@  discard block
 block discarded – undo
736 896
 					echo "error : ".$e->getMessage();
737 897
 				}
738 898
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739
-			} else $all = array();
899
+			} else {
900
+				$all = array();
901
+			}
740 902
 		}
741 903
 		if (empty($all)) {
742 904
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -761,7 +923,9 @@  discard block
 block discarded – undo
761 923
 				$icao = $value['airport_arrival_icao'];
762 924
 				if (isset($all[$icao])) {
763 925
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
764
-				} else $all[$icao] = $value;
926
+				} else {
927
+					$all[$icao] = $value;
928
+				}
765 929
 			}
766 930
 			$count = array();
767 931
 			foreach ($all as $key => $row) {
@@ -773,7 +937,9 @@  discard block
 block discarded – undo
773 937
 	}
774 938
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
775 939
 		global $globalDBdriver, $globalStatsFilters;
776
-		if ($filter_name == '') $filter_name = $this->filter_name;
940
+		if ($filter_name == '') {
941
+			$filter_name = $this->filter_name;
942
+		}
777 943
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
778 944
 			$Spotter = new Spotter($this->db);
779 945
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -782,20 +948,32 @@  discard block
 block discarded – undo
782 948
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
783 949
 			}
784 950
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
951
+				if ($limit) {
952
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
953
+				} else {
954
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955
+				}
787 956
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
957
+				if ($limit) {
958
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
959
+				} else {
960
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
961
+				}
790 962
 			}
791 963
 			$query_data = array(':filter_name' => $filter_name);
792 964
 		} else {
793 965
 			if ($globalDBdriver == 'mysql') {
794
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
795
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
966
+				if ($limit) {
967
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
968
+				} else {
969
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
970
+				}
796 971
 			} else {
797
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798
-				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";
972
+				if ($limit) {
973
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
974
+				} else {
975
+					$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";
976
+				}
799 977
 			}
800 978
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
801 979
 		}
@@ -823,7 +1001,9 @@  discard block
 block discarded – undo
823 1001
 	
824 1002
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
825 1003
 		global $globalStatsFilters;
826
-		if ($filter_name == '') $filter_name = $this->filter_name;
1004
+		if ($filter_name == '') {
1005
+			$filter_name = $this->filter_name;
1006
+		}
827 1007
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
828 1008
 			$Spotter = new Spotter($this->db);
829 1009
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -860,7 +1040,9 @@  discard block
 block discarded – undo
860 1040
 	}
861 1041
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
862 1042
 		global $globalDBdriver, $globalStatsFilters;
863
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043
+		if ($filter_name == '') {
1044
+			$filter_name = $this->filter_name;
1045
+		}
864 1046
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
865 1047
 			$Spotter = new Spotter($this->db);
866 1048
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -905,7 +1087,9 @@  discard block
 block discarded – undo
905 1087
 	}
906 1088
 	public function countAllDates($stats_airline = '',$filter_name = '') {
907 1089
 		global $globalStatsFilters;
908
-		if ($filter_name == '') $filter_name = $this->filter_name;
1090
+		if ($filter_name == '') {
1091
+			$filter_name = $this->filter_name;
1092
+		}
909 1093
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
910 1094
 			$Spotter = new Spotter($this->db);
911 1095
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -942,7 +1126,9 @@  discard block
 block discarded – undo
942 1126
 	}
943 1127
 	public function countAllDatesByAirlines($filter_name = '') {
944 1128
 		global $globalStatsFilters;
945
-		if ($filter_name == '') $filter_name = $this->filter_name;
1129
+		if ($filter_name == '') {
1130
+			$filter_name = $this->filter_name;
1131
+		}
946 1132
 		$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";
947 1133
 		$query_data = array('filter_name' => $filter_name);
948 1134
 		try {
@@ -964,7 +1150,9 @@  discard block
 block discarded – undo
964 1150
 	}
965 1151
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
966 1152
 		global $globalStatsFilters, $globalDBdriver;
967
-		if ($filter_name == '') $filter_name = $this->filter_name;
1153
+		if ($filter_name == '') {
1154
+			$filter_name = $this->filter_name;
1155
+		}
968 1156
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 1157
 			$Spotter = new Spotter($this->db);
970 1158
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1049,7 +1237,9 @@  discard block
 block discarded – undo
1049 1237
 	}
1050 1238
 	public function countAllMilitaryMonths($filter_name = '') {
1051 1239
 		global $globalStatsFilters;
1052
-		if ($filter_name == '') $filter_name = $this->filter_name;
1240
+		if ($filter_name == '') {
1241
+			$filter_name = $this->filter_name;
1242
+		}
1053 1243
 		$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";
1054 1244
 		try {
1055 1245
 			$sth = $this->db->prepare($query);
@@ -1070,7 +1260,9 @@  discard block
 block discarded – undo
1070 1260
 	}
1071 1261
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1072 1262
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073
-		if ($filter_name == '') $filter_name = $this->filter_name;
1263
+		if ($filter_name == '') {
1264
+			$filter_name = $this->filter_name;
1265
+		}
1074 1266
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1075 1267
 			$Spotter = new Spotter($this->db);
1076 1268
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1078,12 +1270,18 @@  discard block
 block discarded – undo
1078 1270
 			foreach ($airlines as $airline) {
1079 1271
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1080 1272
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1273
+			if ($limit) {
1274
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1275
+			} else {
1276
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1277
+			}
1083 1278
 			$query_data = array(':filter_name' => $filter_name);
1084 1279
 		} else {
1085
-			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1086
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1280
+			if ($limit) {
1281
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1282
+			} else {
1283
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1284
+			}
1087 1285
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1088 1286
 		}
1089 1287
 		if ($orderby == 'hour') {
@@ -1093,7 +1291,9 @@  discard block
 block discarded – undo
1093 1291
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1094 1292
 			}
1095 1293
 		}
1096
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1294
+		if ($orderby == 'count') {
1295
+			$query .= " ORDER BY hour_count DESC";
1296
+		}
1097 1297
 		try {
1098 1298
 			$sth = $this->db->prepare($query);
1099 1299
 			$sth->execute($query_data);
@@ -1117,8 +1317,12 @@  discard block
 block discarded – undo
1117 1317
 	}
1118 1318
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1119 1319
 		global $globalStatsFilters;
1120
-		if ($filter_name == '') $filter_name = $this->filter_name;
1121
-		if ($year == '') $year = date('Y');
1320
+		if ($filter_name == '') {
1321
+			$filter_name = $this->filter_name;
1322
+		}
1323
+		if ($year == '') {
1324
+			$year = date('Y');
1325
+		}
1122 1326
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1123 1327
 		if (empty($all)) {
1124 1328
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1137,8 +1341,12 @@  discard block
 block discarded – undo
1137 1341
 	}
1138 1342
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1139 1343
 		global $globalStatsFilters;
1140
-		if ($filter_name == '') $filter_name = $this->filter_name;
1141
-		if ($year == '') $year = date('Y');
1344
+		if ($filter_name == '') {
1345
+			$filter_name = $this->filter_name;
1346
+		}
1347
+		if ($year == '') {
1348
+			$year = date('Y');
1349
+		}
1142 1350
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1143 1351
 		if (empty($all)) {
1144 1352
 			$filters = array();
@@ -1154,8 +1362,12 @@  discard block
 block discarded – undo
1154 1362
 	}
1155 1363
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1156 1364
 		global $globalStatsFilters;
1157
-		if ($filter_name == '') $filter_name = $this->filter_name;
1158
-		if ($year == '') $year = date('Y');
1365
+		if ($filter_name == '') {
1366
+			$filter_name = $this->filter_name;
1367
+		}
1368
+		if ($year == '') {
1369
+			$year = date('Y');
1370
+		}
1159 1371
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1160 1372
 		if (empty($all)) {
1161 1373
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1174,7 +1386,9 @@  discard block
 block discarded – undo
1174 1386
 	}
1175 1387
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1176 1388
 		global $globalStatsFilters;
1177
-		if ($filter_name == '') $filter_name = $this->filter_name;
1389
+		if ($filter_name == '') {
1390
+			$filter_name = $this->filter_name;
1391
+		}
1178 1392
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1179 1393
 			$Spotter = new Spotter($this->db);
1180 1394
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1192,7 +1406,9 @@  discard block
 block discarded – undo
1192 1406
 				}
1193 1407
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1408
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1409
+			} else {
1410
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1411
+			}
1196 1412
 		} else {
1197 1413
 			if ($year == '' && $month == '') {
1198 1414
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1204,7 +1420,9 @@  discard block
 block discarded – undo
1204 1420
 				}
1205 1421
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1422
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1423
+			} else {
1424
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1425
+			}
1208 1426
 		}
1209 1427
 		if (empty($all)) {
1210 1428
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1223,7 +1441,9 @@  discard block
 block discarded – undo
1223 1441
 	}
1224 1442
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1225 1443
 		global $globalStatsFilters;
1226
-		if ($filter_name == '') $filter_name = $this->filter_name;
1444
+		if ($filter_name == '') {
1445
+			$filter_name = $this->filter_name;
1446
+		}
1227 1447
 		if ($year == '' && $month == '') {
1228 1448
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1229 1449
 			try {
@@ -1234,7 +1454,9 @@  discard block
 block discarded – undo
1234 1454
 			}
1235 1455
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1456
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1457
+		} else {
1458
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1459
+		}
1238 1460
 		if (empty($all)) {
1239 1461
 			$filters = array();
1240 1462
 			$filters = array('year' => $year,'month' => $month);
@@ -1249,7 +1471,9 @@  discard block
 block discarded – undo
1249 1471
 	}
1250 1472
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1251 1473
 		global $globalStatsFilters;
1252
-		if ($filter_name == '') $filter_name = $this->filter_name;
1474
+		if ($filter_name == '') {
1475
+			$filter_name = $this->filter_name;
1476
+		}
1253 1477
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1254 1478
 			$Spotter = new Spotter($this->db);
1255 1479
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1304,7 +1528,9 @@  discard block
 block discarded – undo
1304 1528
 	}
1305 1529
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1306 1530
 		global $globalStatsFilters;
1307
-		if ($filter_name == '') $filter_name = $this->filter_name;
1531
+		if ($filter_name == '') {
1532
+			$filter_name = $this->filter_name;
1533
+		}
1308 1534
 		//if ($year == '') $year = date('Y');
1309 1535
 		if ($year == '' && $month == '') {
1310 1536
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1333,7 +1559,9 @@  discard block
 block discarded – undo
1333 1559
 	}
1334 1560
 
1335 1561
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1336
-		if ($filter_name == '') $filter_name = $this->filter_name;
1562
+		if ($filter_name == '') {
1563
+			$filter_name = $this->filter_name;
1564
+		}
1337 1565
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1338 1566
 			$Spotter = new Spotter($this->db);
1339 1567
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1357,7 +1585,9 @@  discard block
 block discarded – undo
1357 1585
 		return $all;
1358 1586
 	}
1359 1587
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1360
-		if ($filter_name == '') $filter_name = $this->filter_name;
1588
+		if ($filter_name == '') {
1589
+			$filter_name = $this->filter_name;
1590
+		}
1361 1591
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362 1592
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1363 1593
 		try {
@@ -1370,7 +1600,9 @@  discard block
 block discarded – undo
1370 1600
 		return $all;
1371 1601
 	}
1372 1602
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373
-		if ($filter_name == '') $filter_name = $this->filter_name;
1603
+		if ($filter_name == '') {
1604
+			$filter_name = $this->filter_name;
1605
+		}
1374 1606
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375 1607
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1376 1608
 		try {
@@ -1381,7 +1613,9 @@  discard block
 block discarded – undo
1381 1613
 		}
1382 1614
 	}
1383 1615
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384
-		if ($filter_name == '') $filter_name = $this->filter_name;
1616
+		if ($filter_name == '') {
1617
+			$filter_name = $this->filter_name;
1618
+		}
1385 1619
 		global $globalArchiveMonths, $globalDBdriver;
1386 1620
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1387 1621
 			$Spotter = new Spotter($this->db);
@@ -1437,7 +1671,9 @@  discard block
 block discarded – undo
1437 1671
 	}
1438 1672
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1673
 		global $globalArchiveMonths, $globalDBdriver;
1440
-		if ($filter_name == '') $filter_name = $this->filter_name;
1674
+		if ($filter_name == '') {
1675
+			$filter_name = $this->filter_name;
1676
+		}
1441 1677
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1442 1678
 			$Spotter = new Spotter($this->db);
1443 1679
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1470,7 +1706,9 @@  discard block
 block discarded – undo
1470 1706
 	}
1471 1707
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1708
 		global $globalArchiveMonths, $globalDBdriver;
1473
-		if ($filter_name == '') $filter_name = $this->filter_name;
1709
+		if ($filter_name == '') {
1710
+			$filter_name = $this->filter_name;
1711
+		}
1474 1712
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1475 1713
 			$Spotter = new Spotter($this->db);
1476 1714
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1501,7 +1739,9 @@  discard block
 block discarded – undo
1501 1739
 	}
1502 1740
 	public function getStatsAirlineTotal($filter_name = '') {
1503 1741
 		global $globalArchiveMonths, $globalDBdriver;
1504
-		if ($filter_name == '') $filter_name = $this->filter_name;
1742
+		if ($filter_name == '') {
1743
+			$filter_name = $this->filter_name;
1744
+		}
1505 1745
 		if ($globalDBdriver == 'mysql') {
1506 1746
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1507 1747
 		} else {
@@ -1518,7 +1758,9 @@  discard block
 block discarded – undo
1518 1758
 	}
1519 1759
 	public function getStatsOwnerTotal($filter_name = '') {
1520 1760
 		global $globalArchiveMonths, $globalDBdriver;
1521
-		if ($filter_name == '') $filter_name = $this->filter_name;
1761
+		if ($filter_name == '') {
1762
+			$filter_name = $this->filter_name;
1763
+		}
1522 1764
 		if ($globalDBdriver == 'mysql') {
1523 1765
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1524 1766
 		} else {
@@ -1535,7 +1777,9 @@  discard block
 block discarded – undo
1535 1777
 	}
1536 1778
 	public function getStatsOwner($owner_name,$filter_name = '') {
1537 1779
 		global $globalArchiveMonths, $globalDBdriver;
1538
-		if ($filter_name == '') $filter_name = $this->filter_name;
1780
+		if ($filter_name == '') {
1781
+			$filter_name = $this->filter_name;
1782
+		}
1539 1783
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1784
 		try {
1541 1785
 			$sth = $this->db->prepare($query);
@@ -1544,12 +1788,17 @@  discard block
 block discarded – undo
1544 1788
 			echo "error : ".$e->getMessage();
1545 1789
 		}
1546 1790
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1547
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1548
-		else return 0;
1791
+		if (isset($all[0]['cnt'])) {
1792
+			return $all[0]['cnt'];
1793
+		} else {
1794
+			return 0;
1795
+		}
1549 1796
 	}
1550 1797
 	public function getStatsPilotTotal($filter_name = '') {
1551 1798
 		global $globalArchiveMonths, $globalDBdriver;
1552
-		if ($filter_name == '') $filter_name = $this->filter_name;
1799
+		if ($filter_name == '') {
1800
+			$filter_name = $this->filter_name;
1801
+		}
1553 1802
 		if ($globalDBdriver == 'mysql') {
1554 1803
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1555 1804
 		} else {
@@ -1566,7 +1815,9 @@  discard block
 block discarded – undo
1566 1815
 	}
1567 1816
 	public function getStatsPilot($pilot,$filter_name = '') {
1568 1817
 		global $globalArchiveMonths, $globalDBdriver;
1569
-		if ($filter_name == '') $filter_name = $this->filter_name;
1818
+		if ($filter_name == '') {
1819
+			$filter_name = $this->filter_name;
1820
+		}
1570 1821
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1822
 		try {
1572 1823
 			$sth = $this->db->prepare($query);
@@ -1575,13 +1826,18 @@  discard block
 block discarded – undo
1575 1826
 			echo "error : ".$e->getMessage();
1576 1827
 		}
1577 1828
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1578
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1579
-		else return 0;
1829
+		if (isset($all[0]['cnt'])) {
1830
+			return $all[0]['cnt'];
1831
+		} else {
1832
+			return 0;
1833
+		}
1580 1834
 	}
1581 1835
 
1582 1836
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1837
 		global $globalDBdriver;
1584
-		if ($filter_name == '') $filter_name = $this->filter_name;
1838
+		if ($filter_name == '') {
1839
+			$filter_name = $this->filter_name;
1840
+		}
1585 1841
 		if ($globalDBdriver == 'mysql') {
1586 1842
 			$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";
1587 1843
 		} else {
@@ -1597,7 +1853,9 @@  discard block
 block discarded – undo
1597 1853
 	}
1598 1854
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1599 1855
 		global $globalDBdriver;
1600
-		if ($filter_name == '') $filter_name = $this->filter_name;
1856
+		if ($filter_name == '') {
1857
+			$filter_name = $this->filter_name;
1858
+		}
1601 1859
 		if ($globalDBdriver == 'mysql') {
1602 1860
 			$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";
1603 1861
 		} else {
@@ -1983,10 +2241,14 @@  discard block
 block discarded – undo
1983 2241
 		$Connection = new Connection($this->db);
1984 2242
 		date_default_timezone_set('UTC');
1985 2243
 		$last_update = $this->getLastStatsUpdate('last_update_stats');
1986
-			if ($globalDebug) echo 'Update stats !'."\n";
2244
+			if ($globalDebug) {
2245
+				echo 'Update stats !'."\n";
2246
+			}
1987 2247
 			if (isset($last_update[0]['value'])) {
1988 2248
 				$last_update_day = $last_update[0]['value'];
1989
-			} else $last_update_day = '2012-12-12 12:12:12';
2249
+			} else {
2250
+				$last_update_day = '2012-12-12 12:12:12';
2251
+			}
1990 2252
 			$reset = false;
1991 2253
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1992 2254
 			if ($globalStatsResetYear) {
@@ -1995,43 +2257,63 @@  discard block
 block discarded – undo
1995 2257
 			}
1996 2258
 			$Spotter = new Spotter($this->db);
1997 2259
 
1998
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2260
+			if ($globalDebug) {
2261
+				echo 'Count all aircraft types...'."\n";
2262
+			}
1999 2263
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2000 2264
 			foreach ($alldata as $number) {
2001 2265
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2002 2266
 			}
2003
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2267
+			if ($globalDebug) {
2268
+				echo 'Count all airlines...'."\n";
2269
+			}
2004 2270
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2005 2271
 			foreach ($alldata as $number) {
2006 2272
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2007 2273
 			}
2008
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2274
+			if ($globalDebug) {
2275
+				echo 'Count all registrations...'."\n";
2276
+			}
2009 2277
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2010 2278
 			foreach ($alldata as $number) {
2011 2279
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2012 2280
 			}
2013
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2281
+			if ($globalDebug) {
2282
+				echo 'Count all callsigns...'."\n";
2283
+			}
2014 2284
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2015 2285
 			foreach ($alldata as $number) {
2016 2286
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2017 2287
 			}
2018
-			if ($globalDebug) echo 'Count all owners...'."\n";
2288
+			if ($globalDebug) {
2289
+				echo 'Count all owners...'."\n";
2290
+			}
2019 2291
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2020 2292
 			foreach ($alldata as $number) {
2021 2293
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2022 2294
 			}
2023
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2295
+			if ($globalDebug) {
2296
+				echo 'Count all pilots...'."\n";
2297
+			}
2024 2298
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2025 2299
 			foreach ($alldata as $number) {
2026
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2300
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2301
+					$number['pilot_id'] = $number['pilot_name'];
2302
+				}
2027 2303
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2028 2304
 			}
2029 2305
 			
2030
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2306
+			if ($globalDebug) {
2307
+				echo 'Count all departure airports...'."\n";
2308
+			}
2031 2309
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2032
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2310
+			if ($globalDebug) {
2311
+				echo 'Count all detected departure airports...'."\n";
2312
+			}
2033 2313
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2034
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2314
+			if ($globalDebug) {
2315
+				echo 'Order departure airports...'."\n";
2316
+			}
2035 2317
 			$alldata = array();
2036 2318
 			foreach ($pall as $value) {
2037 2319
 				$icao = $value['airport_departure_icao'];
@@ -2041,7 +2323,9 @@  discard block
 block discarded – undo
2041 2323
 				$icao = $value['airport_departure_icao'];
2042 2324
 				if (isset($alldata[$icao])) {
2043 2325
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2044
-				} else $alldata[$icao] = $value;
2326
+				} else {
2327
+					$alldata[$icao] = $value;
2328
+				}
2045 2329
 			}
2046 2330
 			$count = array();
2047 2331
 			foreach ($alldata as $key => $row) {
@@ -2051,11 +2335,17 @@  discard block
 block discarded – undo
2051 2335
 			foreach ($alldata as $number) {
2052 2336
 				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);
2053 2337
 			}
2054
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2338
+			if ($globalDebug) {
2339
+				echo 'Count all arrival airports...'."\n";
2340
+			}
2055 2341
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2056
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2342
+			if ($globalDebug) {
2343
+				echo 'Count all detected arrival airports...'."\n";
2344
+			}
2057 2345
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2058
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2346
+			if ($globalDebug) {
2347
+				echo 'Order arrival airports...'."\n";
2348
+			}
2059 2349
 			$alldata = array();
2060 2350
 			foreach ($pall as $value) {
2061 2351
 				$icao = $value['airport_arrival_icao'];
@@ -2065,7 +2355,9 @@  discard block
 block discarded – undo
2065 2355
 				$icao = $value['airport_arrival_icao'];
2066 2356
 				if (isset($alldata[$icao])) {
2067 2357
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2068
-				} else $alldata[$icao] = $value;
2358
+				} else {
2359
+					$alldata[$icao] = $value;
2360
+				}
2069 2361
 			}
2070 2362
 			$count = array();
2071 2363
 			foreach ($alldata as $key => $row) {
@@ -2076,7 +2368,9 @@  discard block
 block discarded – undo
2076 2368
 				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);
2077 2369
 			}
2078 2370
 			if ($Connection->tableExists('countries')) {
2079
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2371
+				if ($globalDebug) {
2372
+					echo 'Count all flights by countries...'."\n";
2373
+				}
2080 2374
 				//$SpotterArchive = new SpotterArchive();
2081 2375
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2376
 				$Spotter = new Spotter($this->db);
@@ -2087,7 +2381,9 @@  discard block
 block discarded – undo
2087 2381
 			}
2088 2382
 			
2089 2383
 			if (isset($globalAccidents) && $globalAccidents) {
2090
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2384
+				if ($globalDebug) {
2385
+					echo 'Count fatalities stats...'."\n";
2386
+				}
2091 2387
 				$Accident = new Accident($this->db);
2092 2388
 				$this->deleteStatsByType('fatalities_byyear');
2093 2389
 				$alldata = $Accident->countFatalitiesByYear();
@@ -2103,48 +2399,68 @@  discard block
 block discarded – undo
2103 2399
 
2104 2400
 			// Add by month using getstat if month finish...
2105 2401
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2106
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2402
+			if ($globalDebug) {
2403
+				echo 'Count all flights by months...'."\n";
2404
+			}
2107 2405
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2108 2406
 			$filter_last_month = array('since_date' => $last_month);
2109 2407
 			$Spotter = new Spotter($this->db);
2110 2408
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2111 2409
 			$lastyear = false;
2112 2410
 			foreach ($alldata as $number) {
2113
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2411
+				if ($number['year_name'] != date('Y')) {
2412
+					$lastyear = true;
2413
+				}
2114 2414
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2115 2415
 			}
2116
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2416
+			if ($globalDebug) {
2417
+				echo 'Count all military flights by months...'."\n";
2418
+			}
2117 2419
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2420
 			foreach ($alldata as $number) {
2119 2421
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2120 2422
 			}
2121
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2423
+			if ($globalDebug) {
2424
+				echo 'Count all owners by months...'."\n";
2425
+			}
2122 2426
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2427
 			foreach ($alldata as $number) {
2124 2428
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2125 2429
 			}
2126
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2430
+			if ($globalDebug) {
2431
+				echo 'Count all pilots by months...'."\n";
2432
+			}
2127 2433
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2434
 			foreach ($alldata as $number) {
2129 2435
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2130 2436
 			}
2131
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2437
+			if ($globalDebug) {
2438
+				echo 'Count all airlines by months...'."\n";
2439
+			}
2132 2440
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2441
 			foreach ($alldata as $number) {
2134 2442
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2135 2443
 			}
2136
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2444
+			if ($globalDebug) {
2445
+				echo 'Count all aircrafts by months...'."\n";
2446
+			}
2137 2447
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2448
 			foreach ($alldata as $number) {
2139 2449
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2140 2450
 			}
2141
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2451
+			if ($globalDebug) {
2452
+				echo 'Count all real arrivals by months...'."\n";
2453
+			}
2142 2454
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2455
 			foreach ($alldata as $number) {
2144 2456
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2145 2457
 			}
2146
-			if ($globalDebug) echo 'Airports data...'."\n";
2147
-			if ($globalDebug) echo '...Departure'."\n";
2458
+			if ($globalDebug) {
2459
+				echo 'Airports data...'."\n";
2460
+			}
2461
+			if ($globalDebug) {
2462
+				echo '...Departure'."\n";
2463
+			}
2148 2464
 			$this->deleteStatAirport('daily');
2149 2465
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2150 2466
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -2262,7 +2578,9 @@  discard block
 block discarded – undo
2262 2578
 			// Count by airlines
2263 2579
 			echo '--- Stats by airlines ---'."\n";
2264 2580
 			if ($Connection->tableExists('countries')) {
2265
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2581
+				if ($globalDebug) {
2582
+					echo 'Count all flights by countries by airlines...'."\n";
2583
+				}
2266 2584
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2585
 				//$Spotter = new Spotter($this->db);
2268 2586
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -2271,37 +2589,53 @@  discard block
 block discarded – undo
2271 2589
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2272 2590
 				}
2273 2591
 			}
2274
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2592
+			if ($globalDebug) {
2593
+				echo 'Count all aircraft types by airlines...'."\n";
2594
+			}
2275 2595
 			$Spotter = new Spotter($this->db);
2276 2596
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2277 2597
 			foreach ($alldata as $number) {
2278 2598
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2279 2599
 			}
2280
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2600
+			if ($globalDebug) {
2601
+				echo 'Count all aircraft registrations by airlines...'."\n";
2602
+			}
2281 2603
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2282 2604
 			foreach ($alldata as $number) {
2283 2605
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2284 2606
 			}
2285
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2607
+			if ($globalDebug) {
2608
+				echo 'Count all callsigns by airlines...'."\n";
2609
+			}
2286 2610
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2287 2611
 			foreach ($alldata as $number) {
2288 2612
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2289 2613
 			}
2290
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2614
+			if ($globalDebug) {
2615
+				echo 'Count all owners by airlines...'."\n";
2616
+			}
2291 2617
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2292 2618
 			foreach ($alldata as $number) {
2293 2619
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2294 2620
 			}
2295
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2621
+			if ($globalDebug) {
2622
+				echo 'Count all pilots by airlines...'."\n";
2623
+			}
2296 2624
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2297 2625
 			foreach ($alldata as $number) {
2298 2626
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2299 2627
 			}
2300
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2628
+			if ($globalDebug) {
2629
+				echo 'Count all departure airports by airlines...'."\n";
2630
+			}
2301 2631
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2302
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2632
+			if ($globalDebug) {
2633
+				echo 'Count all detected departure airports by airlines...'."\n";
2634
+			}
2303 2635
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2304
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2636
+			if ($globalDebug) {
2637
+				echo 'Order detected departure airports by airlines...'."\n";
2638
+			}
2305 2639
 			//$alldata = array();
2306 2640
 			foreach ($dall as $value) {
2307 2641
 				$icao = $value['airport_departure_icao'];
@@ -2322,11 +2656,17 @@  discard block
 block discarded – undo
2322 2656
 			foreach ($alldata as $number) {
2323 2657
 				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);
2324 2658
 			}
2325
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2659
+			if ($globalDebug) {
2660
+				echo 'Count all arrival airports by airlines...'."\n";
2661
+			}
2326 2662
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2327
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2663
+			if ($globalDebug) {
2664
+				echo 'Count all detected arrival airports by airlines...'."\n";
2665
+			}
2328 2666
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2329
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2667
+			if ($globalDebug) {
2668
+				echo 'Order arrival airports by airlines...'."\n";
2669
+			}
2330 2670
 			//$alldata = array();
2331 2671
 			foreach ($dall as $value) {
2332 2672
 				$icao = $value['airport_arrival_icao'];
@@ -2345,37 +2685,53 @@  discard block
 block discarded – undo
2345 2685
 			}
2346 2686
 			$alldata = $pall;
2347 2687
 			foreach ($alldata as $number) {
2348
-				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);
2688
+				if ($number['airline_icao'] != '') {
2689
+					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);
2690
+				}
2691
+			}
2692
+			if ($globalDebug) {
2693
+				echo 'Count all flights by months by airlines...'."\n";
2349 2694
 			}
2350
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2695
 			$Spotter = new Spotter($this->db);
2352 2696
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2353 2697
 			$lastyear = false;
2354 2698
 			foreach ($alldata as $number) {
2355
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2699
+				if ($number['year_name'] != date('Y')) {
2700
+					$lastyear = true;
2701
+				}
2356 2702
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2357 2703
 			}
2358
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2704
+			if ($globalDebug) {
2705
+				echo 'Count all owners by months by airlines...'."\n";
2706
+			}
2359 2707
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2708
 			foreach ($alldata as $number) {
2361 2709
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2362 2710
 			}
2363
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2711
+			if ($globalDebug) {
2712
+				echo 'Count all pilots by months by airlines...'."\n";
2713
+			}
2364 2714
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2715
 			foreach ($alldata as $number) {
2366 2716
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2367 2717
 			}
2368
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2718
+			if ($globalDebug) {
2719
+				echo 'Count all aircrafts by months by airlines...'."\n";
2720
+			}
2369 2721
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2722
 			foreach ($alldata as $number) {
2371 2723
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2372 2724
 			}
2373
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2725
+			if ($globalDebug) {
2726
+				echo 'Count all real arrivals by months by airlines...'."\n";
2727
+			}
2374 2728
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2729
 			foreach ($alldata as $number) {
2376 2730
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2377 2731
 			}
2378
-			if ($globalDebug) echo '...Departure'."\n";
2732
+			if ($globalDebug) {
2733
+				echo '...Departure'."\n";
2734
+			}
2379 2735
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2380 2736
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2381 2737
 			foreach ($dall as $value) {
@@ -2398,7 +2754,9 @@  discard block
 block discarded – undo
2398 2754
 			foreach ($alldata as $number) {
2399 2755
 				$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']);
2400 2756
 			}
2401
-			if ($globalDebug) echo '...Arrival'."\n";
2757
+			if ($globalDebug) {
2758
+				echo '...Arrival'."\n";
2759
+			}
2402 2760
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2403 2761
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2404 2762
 			foreach ($dall as $value) {
@@ -2422,13 +2780,19 @@  discard block
 block discarded – undo
2422 2780
 				$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']);
2423 2781
 			}
2424 2782
 
2425
-			if ($globalDebug) echo 'Flights data...'."\n";
2426
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2783
+			if ($globalDebug) {
2784
+				echo 'Flights data...'."\n";
2785
+			}
2786
+			if ($globalDebug) {
2787
+				echo '-> countAllDatesLastMonth...'."\n";
2788
+			}
2427 2789
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2790
 			foreach ($alldata as $number) {
2429 2791
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2430 2792
 			}
2431
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2793
+			if ($globalDebug) {
2794
+				echo '-> countAllDates...'."\n";
2795
+			}
2432 2796
 			//$previousdata = $this->countAllDatesByAirlines();
2433 2797
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2434 2798
 			$values = array();
@@ -2441,14 +2805,18 @@  discard block
 block discarded – undo
2441 2805
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2442 2806
 			}
2443 2807
 			
2444
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2808
+			if ($globalDebug) {
2809
+				echo '-> countAllHours...'."\n";
2810
+			}
2445 2811
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2446 2812
 			foreach ($alldata as $number) {
2447 2813
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2448 2814
 			}
2449 2815
 
2450 2816
 			// Stats by filters
2451
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2817
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2818
+				$globalStatsFilters = array();
2819
+			}
2452 2820
 			foreach ($globalStatsFilters as $name => $filter) {
2453 2821
 				if (!empty($filter)) {
2454 2822
 					//$filter_name = $filter['name'];
@@ -2456,7 +2824,9 @@  discard block
 block discarded – undo
2456 2824
 					$reset = false;
2457 2825
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2458 2826
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2459
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2827
+						if ($globalDebug) {
2828
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2829
+						}
2460 2830
 						$this->deleteOldStats($filter_name);
2461 2831
 						unset($last_update);
2462 2832
 					}
@@ -2475,7 +2845,9 @@  discard block
 block discarded – undo
2475 2845
 				
2476 2846
 
2477 2847
 				// Count by filter
2478
-				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2848
+				if ($globalDebug) {
2849
+					echo '--- Stats for filter '.$filter_name.' ---'."\n";
2850
+				}
2479 2851
 				$Spotter = new Spotter($this->db);
2480 2852
 				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2481 2853
 				foreach ($alldata as $number) {
@@ -2512,7 +2884,9 @@  discard block
 block discarded – undo
2512 2884
 					$icao = $value['airport_departure_icao'];
2513 2885
 					if (isset($alldata[$icao])) {
2514 2886
 						$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2515
-					} else $alldata[$icao] = $value;
2887
+					} else {
2888
+						$alldata[$icao] = $value;
2889
+					}
2516 2890
 				}
2517 2891
 				$count = array();
2518 2892
 				foreach ($alldata as $key => $row) {
@@ -2533,7 +2907,9 @@  discard block
 block discarded – undo
2533 2907
 					$icao = $value['airport_arrival_icao'];
2534 2908
 					if (isset($alldata[$icao])) {
2535 2909
 						$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2536
-					} else $alldata[$icao] = $value;
2910
+					} else {
2911
+						$alldata[$icao] = $value;
2912
+					}
2537 2913
 				}
2538 2914
 				$count = array();
2539 2915
 				foreach ($alldata as $key => $row) {
@@ -2547,7 +2923,9 @@  discard block
 block discarded – undo
2547 2923
 					$alldata = $Spotter->countAllMonths($filter);
2548 2924
 					$lastyear = false;
2549 2925
 					foreach ($alldata as $number) {
2550
-						if ($number['year_name'] != date('Y')) $lastyear = true;
2926
+						if ($number['year_name'] != date('Y')) {
2927
+							$lastyear = true;
2928
+						}
2551 2929
 						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2552 2930
 					}
2553 2931
 					$alldata = $Spotter->countAllMonthsOwners($filter);
Please login to merge, or discard this patch.