View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 39c0a3...691470 )
by Yannick
28:40
created
Status
Category
Toggle Patches
require/class.Stats.php 2 patches
Spacing   +643 added lines, -643 removed lines patch added patch discarded remove patch 
@@ -21,14 +21,14 @@  discard block
 
 block discarded – undo
21 21 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
22 22 
 	}
23 23
24 
-	public function addLastStatsUpdate($type,$stats_date) {
24 
+	public function addLastStatsUpdate($type, $stats_date) {
25 25 
 		$query = "DELETE FROM config WHERE name = :type;
26 26 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
27 
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
27 
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
28 28 
 		try {
29 29 
 			$sth = $this->db->prepare($query);
30 30 
 			$sth->execute($query_values);
31 
-		} catch(PDOException $e) {
31 
+		} catch (PDOException $e) {
32 32 
 			return "error : ".$e->getMessage();
33 33 
 		}
34 34 
 	}
 
@@ -38,7 +38,7 @@  discard block
 
 block discarded – undo
38 38 
 		try {
39 39 
 			$sth = $this->db->prepare($query);
40 40 
 			$sth->execute(array(':type' => $type));
41 
-		} catch(PDOException $e) {
41 
+		} catch (PDOException $e) {
42 42 
 			echo "error : ".$e->getMessage();
43 43 
 		}
44 44 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 		try {
60 60 
 			$sth = $this->db->prepare($query);
61 61 
 			$sth->execute(array(':filter_name' => $filter_name));
62 
-		} catch(PDOException $e) {
62 
+		} catch (PDOException $e) {
63 63 
 			return "error : ".$e->getMessage();
64 64 
 		}
65 65 
 	}
 
@@ -72,14 +72,14 @@  discard block
 
 block discarded – undo
72 72 
 		try {
73 73 
 			$sth = $this->db->prepare($query);
74 74 
 			$sth->execute();
75 
-		} catch(PDOException $e) {
75 
+		} catch (PDOException $e) {
76 76 
 			return "error : ".$e->getMessage();
77 77 
 		}
78 78 
 		$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;";
79 79 
 		try {
80 80 
 			$sth = $this->db->prepare($query);
81 81 
 			$sth->execute(array(':filter_name' => $filter_name));
82 
-		} catch(PDOException $e) {
82 
+		} catch (PDOException $e) {
83 83 
 			return "error : ".$e->getMessage();
84 84 
 		}
85 85 
 	}
 
@@ -91,77 +91,77 @@  discard block
 
 block discarded – undo
91 91 
 		 try {
92 92 
 			$sth = $this->db->prepare($query);
93 93 
 			$sth->execute(array(':filter_name' => $filter_name));
94 
-		} catch(PDOException $e) {
94 
+		} catch (PDOException $e) {
95 95 
 			echo "error : ".$e->getMessage();
96 96 
 		}
97 97 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
98 98 
 		if (empty($all)) {
99 99 
 			$filters = array();
100 100 
 			if ($filter_name != '') {
101 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
101 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
102 102 
 			}
103 103 
 			$Spotter = new Spotter($this->db);
104 
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
104 
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
105 105 
 		}
106 106 
 		return $all;
107 107 
 	}
108 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
108 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
109 109 
 		if ($filter_name == '') $filter_name = $this->filter_name;
110 110 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 111 
 		try {
112 112 
 			$sth = $this->db->prepare($query);
113 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
114 
-		} catch(PDOException $e) {
113 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
114 
+		} catch (PDOException $e) {
115 115 
 			echo "error : ".$e->getMessage();
116 116 
 		}
117 117 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
118 118 
 		return $all;
119 119 
 	}
120 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
120 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
121 121 
 		if ($filter_name == '') $filter_name = $this->filter_name;
122 122 
 		$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";
123 123 
 		try {
124 124 
 			$sth = $this->db->prepare($query);
125 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
126 
-		} catch(PDOException $e) {
125 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
126 
+		} catch (PDOException $e) {
127 127 
 			echo "error : ".$e->getMessage();
128 128 
 		}
129 129 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
130 130 
 		return $all;
131 131 
 	}
132 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
132 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
133 133 
 		if ($filter_name == '') $filter_name = $this->filter_name;
134 134 
 		$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";
135 135 
 		try {
136 136 
 			$sth = $this->db->prepare($query);
137 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138 
-		} catch(PDOException $e) {
137 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
138 
+		} catch (PDOException $e) {
139 139 
 			echo "error : ".$e->getMessage();
140 140 
 		}
141 141 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
142 142 
 		return $all;
143 143 
 	}
144 144
145 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
145 
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
146 146 
 		if ($filter_name == '') $filter_name = $this->filter_name;
147 147 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 148 
 		try {
149 149 
 			$sth = $this->db->prepare($query);
150 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151 
-		} catch(PDOException $e) {
150 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
151 
+		} catch (PDOException $e) {
152 152 
 			echo "error : ".$e->getMessage();
153 153 
 		}
154 154 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
155 155 
 		return $all;
156 156 
 	}
157 157
158 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
158 
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
159 159 
 		if ($filter_name == '') $filter_name = $this->filter_name;
160 160 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
161 161 
 		try {
162 162 
 			$sth = $this->db->prepare($query);
163 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
164 
-		} catch(PDOException $e) {
163 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
164 
+		} catch (PDOException $e) {
165 165 
 			echo "error : ".$e->getMessage();
166 166 
 		}
167 167 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -169,23 +169,23 @@  discard block
 
 block discarded – undo
169 169 
 	}
170 170
171 171
172 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
172 
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
173 173 
 		global $globalStatsFilters;
174 174 
 		if ($filter_name == '') $filter_name = $this->filter_name;
175 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
175 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
176 176 
 			$Spotter = new Spotter($this->db);
177 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
177 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
178 178 
 			$alliance_airlines = array();
179 179 
 			foreach ($airlines as $airline) {
180 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
180 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
181 181 
 			}
182 182 
 			if ($year == '' && $month == '') {
183 
-				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 
+				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
185 185 
 				try {
186 186 
 					$sth = $this->db->prepare($query);
187 187 
 					$sth->execute(array(':filter_name' => $filter_name));
188 
-				} catch(PDOException $e) {
188 
+				} catch (PDOException $e) {
189 189 
 					echo "error : ".$e->getMessage();
190 190 
 				}
191 191 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -196,29 +196,29 @@  discard block
 
 block discarded – undo
196 196 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
197 197 
 				try {
198 198 
 					$sth = $this->db->prepare($query);
199 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
200 
-				} catch(PDOException $e) {
199 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
200 
+				} catch (PDOException $e) {
201 201 
 					echo "error : ".$e->getMessage();
202 202 
 				}
203 203 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 204 
 			} else $all = array();
205 205 
 		}
206 206 
 		if (empty($all)) {
207 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
208 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
207 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
208 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
209 209 
 			} else {
210 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
210 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
211 211 
 			}
212 212 
 			if ($filter_name != '') {
213 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
213 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
214 214 
 			}
215 215 
 			$Spotter = new Spotter($this->db);
216 216 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
217 
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
217 
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
218 218 
 		}
219 219 
 		return $all;
220 220 
 	}
221 
-	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
221 
+	public function countAllMarineTypes($limit = true, $filter_name = '', $year = '', $month = '') {
222 222 
 		global $globalStatsFilters;
223 223 
 		if ($filter_name == '') $filter_name = $this->filter_name;
224 224 
 		if ($year == '' && $month == '') {
 
@@ -227,23 +227,23 @@  discard block
 
 block discarded – undo
227 227 
 			try {
228 228 
 				$sth = $this->db->prepare($query);
229 229 
 				$sth->execute(array(':filter_name' => $filter_name));
230 
-			} catch(PDOException $e) {
230 
+			} catch (PDOException $e) {
231 231 
 				echo "error : ".$e->getMessage();
232 232 
 			}
233 233 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 234 
 		} else $all = array();
235 235 
 		if (empty($all)) {
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 
 			$Marine = new Marine($this->db);
241 241 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
242 
-			$all = $Marine->countAllMarineTypes($limit,0,'',$filters);
242 
+			$all = $Marine->countAllMarineTypes($limit, 0, '', $filters);
243 243 
 		}
244 244 
 		return $all;
245 245 
 	}
246 
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
246 
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
247 247 
 		global $globalStatsFilters;
248 248 
 		if ($filter_name == '') $filter_name = $this->filter_name;
249 249 
 		if ($year == '' && $month == '') {
 
@@ -252,7 +252,7 @@  discard block
 
 block discarded – undo
252 252 
 			try {
253 253 
 				$sth = $this->db->prepare($query);
254 254 
 				$sth->execute(array(':filter_name' => $filter_name));
255 
-			} catch(PDOException $e) {
255 
+			} catch (PDOException $e) {
256 256 
 				echo "error : ".$e->getMessage();
257 257 
 			}
258 258 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -260,32 +260,32 @@  discard block
 
 block discarded – undo
260 260 
 		if (empty($all)) {
261 261 
 			$Spotter = new Spotter($this->db);
262 262 
 			$filters = array();
263 
-			$filters = array('year' => $year,'month' => $month);
263 
+			$filters = array('year' => $year, 'month' => $month);
264 264 
 			if ($filter_name != '') {
265 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
265 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
266 266 
 			}
267 267 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
268 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
268 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
269 269 
 		}
270 270 
 		return $all;
271 271 
 	}
272 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
272 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
273 273 
 		global $globalStatsFilters;
274 274 
 		if ($filter_name == '') $filter_name = $this->filter_name;
275 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
275 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
276 276 
 			$Spotter = new Spotter($this->db);
277 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
277 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
278 278 
 			$alliance_airlines = array();
279 279 
 			foreach ($airlines as $airline) {
280 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
280 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
281 281 
 			}
282 282 
 			if ($year == '' && $month == '') {
283 
-				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";
284 
-				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";
283 
+				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";
284 
+				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";
285 285 
 				try {
286 286 
 					$sth = $this->db->prepare($query);
287 287 
 					$sth->execute(array(':filter_name' => $filter_name));
288 
-				} catch(PDOException $e) {
288 
+				} catch (PDOException $e) {
289 289 
 					echo "error : ".$e->getMessage();
290 290 
 				}
291 291 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -296,21 +296,21 @@  discard block
 
 block discarded – undo
296 296 
 				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";
297 297 
 				try {
298 298 
 					$sth = $this->db->prepare($query);
299 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
300 
-				} catch(PDOException $e) {
299 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
300 
+				} catch (PDOException $e) {
301 301 
 					echo "error : ".$e->getMessage();
302 302 
 				}
303 303 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
304 304 
 			} else $all = array();
305 305 
 		}
306 306 
 		if (empty($all)) {
307 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
308 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
307 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
308 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
309 309 
 			} else {
310 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
310 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
311 311 
 			}
312 312 
 			if ($filter_name != '') {
313 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
313 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
314 314 
 			}
315 315 
 			$Spotter = new Spotter($this->db);
316 316 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -319,23 +319,23 @@  discard block
 
 block discarded – undo
319 319 
 		return $all;
320 320 
 	}
321 321
322 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
322 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
323 323 
 		global $globalStatsFilters;
324 324 
 		if ($filter_name == '') $filter_name = $this->filter_name;
325 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
325 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
326 326 
 			$Spotter = new Spotter($this->db);
327 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
327 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
328 328 
 			$alliance_airlines = array();
329 329 
 			foreach ($airlines as $airline) {
330 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
330 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
331 331 
 			}
332 332 
 			if ($year == '' && $month == '') {
333 
-				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";
334 
-				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";
333 
+				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";
334 
+				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";
335 335 
 				try {
336 336 
 					$sth = $this->db->prepare($query);
337 337 
 					$sth->execute(array(':filter_name' => $filter_name));
338 
-				} catch(PDOException $e) {
338 
+				} catch (PDOException $e) {
339 339 
 					echo "error : ".$e->getMessage();
340 340 
 				}
341 341 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -346,61 +346,61 @@  discard block
 
 block discarded – undo
346 346 
 				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";
347 347 
 				try {
348 348 
 					$sth = $this->db->prepare($query);
349 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
350 
-				} catch(PDOException $e) {
349 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
350 
+				} catch (PDOException $e) {
351 351 
 					echo "error : ".$e->getMessage();
352 352 
 				}
353 353 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
354 354 
 			} else $all = array();
355 355 
 		}
356 356 
 		if (empty($all)) {
357 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
358 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
357 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
358 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
359 359 
 			} else {
360 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
360 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
361 361 
 			}
362 362 
 			if ($filter_name != '') {
363 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
363 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
364 364 
 			}
365 365 
 			$Spotter = new Spotter($this->db);
366 366 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
367 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
367 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
368 368 
 		}
369 369 
 		return $all;
370 370 
 	}
371 371 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
372 372 
 		global $globalStatsFilters;
373 373 
 		if ($filter_name == '') $filter_name = $this->filter_name;
374 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
374 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
375 375 
 			$Spotter = new Spotter($this->db);
376 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
376 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
377 377 
 			$alliance_airlines = array();
378 378 
 			foreach ($airlines as $airline) {
379 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
379 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
380 380 
 			}
381 
-			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";
382 
-			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";
381 
+			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";
382 
+			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";
383 383 
 			$query_values = array(':filter_name' => $filter_name);
384 384 
 		} else {
385 385 
 			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";
386 386 
 			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";
387 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
387 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
388 388 
 		}
389 389 
 		try {
390 390 
 			$sth = $this->db->prepare($query);
391 391 
 			$sth->execute($query_values);
392 
-		} catch(PDOException $e) {
392 
+		} catch (PDOException $e) {
393 393 
 			echo "error : ".$e->getMessage();
394 394 
 		}
395 395 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
396 396 
 		if (empty($all)) {
397 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
398 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
397 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
398 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
399 399 
 			} else {
400 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
400 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
401 401 
 			}
402 402 
 			if ($filter_name != '') {
403 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
403 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
404 404 
 			}
405 405 
 			$Spotter = new Spotter($this->db);
406 406 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -409,7 +409,7 @@  discard block
 
 block discarded – undo
409 409 
 		return $all;
410 410 
 	}
411 411
412 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
412 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
413 413 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
414 414 
 		if ($filter_name == '') $filter_name = $this->filter_name;
415 415 
 		if ($year == '' && $month == '') {
 
@@ -418,7 +418,7 @@  discard block
 
 block discarded – undo
418 418 
 			if (isset($forsource)) {
419 419 
 				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";
420 420 
 				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";
421 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
421 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
422 422 
 			} else {
423 423 
 				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";
424 424 
 				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";
 
@@ -427,7 +427,7 @@  discard block
 
 block discarded – undo
427 427 
 			try {
428 428 
 				$sth = $this->db->prepare($query);
429 429 
 				$sth->execute($query_values);
430 
-			} catch(PDOException $e) {
430 
+			} catch (PDOException $e) {
431 431 
 				echo "error : ".$e->getMessage();
432 432 
 			}
433 433 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -435,32 +435,32 @@  discard block
 
 block discarded – undo
435 435 
                 if (empty($all)) {
436 436 
 	                $Spotter = new Spotter($this->db);
437 437 
             		$filters = array();
438 
-			$filters = array('year' => $year,'month' => $month);
438 
+			$filters = array('year' => $year, 'month' => $month);
439 439 
             		if ($filter_name != '') {
440 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
440 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
441 441 
 			}
442 442 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
443 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
443 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
444 444 
                 }
445 445 
                 return $all;
446 446 
 	}
447 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
447 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
448 448 
 		global $globalStatsFilters;
449 449 
 		if ($filter_name == '') $filter_name = $this->filter_name;
450 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
450 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
451 451 
 			$Spotter = new Spotter($this->db);
452 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
452 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
453 453 
 			$alliance_airlines = array();
454 454 
 			foreach ($airlines as $airline) {
455 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
455 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
456 456 
 			}
457 457 
 			if ($year == '' && $month == '') {
458 
-				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 registration_count DESC LIMIT 10 OFFSET 0";
459 
-				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 registration_count DESC";
458 
+				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 registration_count DESC LIMIT 10 OFFSET 0";
459 
+				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 registration_count DESC";
460 460 
 				try {
461 461 
 					$sth = $this->db->prepare($query);
462 462 
 					$sth->execute(array(':filter_name' => $filter_name));
463 
-				} catch(PDOException $e) {
463 
+				} catch (PDOException $e) {
464 464 
 					echo "error : ".$e->getMessage();
465 465 
 				}
466 466 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -471,45 +471,45 @@  discard block
 
 block discarded – undo
471 471 
 				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 registration_count DESC";
472 472 
 				try {
473 473 
 					$sth = $this->db->prepare($query);
474 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
475 
-				} catch(PDOException $e) {
474 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
475 
+				} catch (PDOException $e) {
476 476 
 					echo "error : ".$e->getMessage();
477 477 
 				}
478 478 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
479 479 
 			} else $all = array();
480 480 
 		}
481 481 
 		if (empty($all)) {
482 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
483 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
482 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
483 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
484 484 
 			} else {
485 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
485 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
486 486 
 			}
487 487 
 			if ($filter_name != '') {
488 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
488 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
489 489 
 			}
490 490 
 			$Spotter = new Spotter($this->db);
491 491 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
492 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
492 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
493 493 
 		}
494 494 
 		return $all;
495 495 
 	}
496 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
496 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
497 497 
 		global $globalStatsFilters;
498 498 
 		if ($filter_name == '') $filter_name = $this->filter_name;
499 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
499 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
500 500 
 			$Spotter = new Spotter($this->db);
501 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
501 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
502 502 
 			$alliance_airlines = array();
503 503 
 			foreach ($airlines as $airline) {
504 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
504 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
505 505 
 			}
506 506 
 			if ($year == '' && $month == '') {
507 
-				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";
508 
-				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";
507 
+				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";
508 
+				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";
509 509 
 				 try {
510 510 
 					$sth = $this->db->prepare($query);
511 511 
 					$sth->execute(array(':filter_name' => $filter_name));
512 
-				} catch(PDOException $e) {
512 
+				} catch (PDOException $e) {
513 513 
 					echo "error : ".$e->getMessage();
514 514 
 				}
515 515 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -520,46 +520,46 @@  discard block
 
 block discarded – undo
520 520 
 				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";
521 521 
 				 try {
522 522 
 					$sth = $this->db->prepare($query);
523 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
524 
-				} catch(PDOException $e) {
523 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
524 
+				} catch (PDOException $e) {
525 525 
 					echo "error : ".$e->getMessage();
526 526 
 				}
527 527 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
528 528 
 			} else $all = array();
529 529 
 		}
530 530 
 		if (empty($all)) {
531 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
532 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
531 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
532 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
533 533 
 			} else {
534 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
534 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
535 535 
 			}
536 536 
 			if ($filter_name != '') {
537 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
537 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
538 538 
 			}
539 539 
 			$Spotter = new Spotter($this->db);
540 540 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
541 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
541 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
542 542 
 		}
543 543 
 		return $all;
544 544 
 	}
545 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
545 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
546 546 
 		$Connection = new Connection($this->db);
547 547 
 		if ($filter_name == '') $filter_name = $this->filter_name;
548 548 
 		if ($Connection->tableExists('countries')) {
549 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
549 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
550 550 
 				$Spotter = new Spotter($this->db);
551 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
551 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
552 552 
 				if ($year == '' && $month == '') {
553 553 
 					$alliance_airlines = array();
554 554 
 					foreach ($airlines as $airline) {
555 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
555 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
556 556 
 					}
557 
-					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";
558 
-					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";
557 
+					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";
558 
+					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";
559 559 
 					 try {
560 560 
 						$sth = $this->db->prepare($query);
561 561 
 						$sth->execute(array(':filter_name' => $filter_name));
562 
-					} catch(PDOException $e) {
562 
+					} catch (PDOException $e) {
563 563 
 						echo "error : ".$e->getMessage();
564 564 
 					}
565 565 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -571,8 +571,8 @@  discard block
 
 block discarded – undo
571 571 
 					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";
572 572 
 					 try {
573 573 
 						$sth = $this->db->prepare($query);
574 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
575 
-					} catch(PDOException $e) {
574 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
575 
+					} catch (PDOException $e) {
576 576 
 						echo "error : ".$e->getMessage();
577 577 
 					}
578 578 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -583,7 +583,7 @@  discard block
 
 block discarded – undo
583 583 
 			return $Spotter->countAllFlightOverCountries($limit);
584 584 
 		} else return array();
585 585 
 	}
586 
-	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
586 
+	public function countAllMarineOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
587 587 
 		$Connection = new Connection($this->db);
588 588 
 		if ($filter_name == '') $filter_name = $this->filter_name;
589 589 
 		if ($Connection->tableExists('countries')) {
 
@@ -594,7 +594,7 @@  discard block
 
 block discarded – undo
594 594 
 				 try {
595 595 
 					$sth = $this->db->prepare($query);
596 596 
 					$sth->execute(array(':filter_name' => $filter_name));
597 
-				} catch(PDOException $e) {
597 
+				} catch (PDOException $e) {
598 598 
 					echo "error : ".$e->getMessage();
599 599 
 				}
600 600 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -602,15 +602,15 @@  discard block
 
 block discarded – undo
602 602 
 			if (empty($all)) {
603 603 
 				$filters = array();
604 604 
 				if ($filter_name != '') {
605 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
605 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
606 606 
 				}
607 607 
 				$Marine = new Marine($this->db);
608 
-				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
608 
+				$all = $Marine->countAllMarineOverCountries($limit, 0, '', $filters);
609 609 
 			}
610 610 
 			return $all;
611 611 
 		} else return array();
612 612 
 	}
613 
-	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
613 
+	public function countAllTrackerOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
614 614 
 		global $globalStatsFilters;
615 615 
 		$Connection = new Connection($this->db);
616 616 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -622,7 +622,7 @@  discard block
 
 block discarded – undo
622 622 
 				 try {
623 623 
 					$sth = $this->db->prepare($query);
624 624 
 					$sth->execute(array(':filter_name' => $filter_name));
625 
-				} catch(PDOException $e) {
625 
+				} catch (PDOException $e) {
626 626 
 					echo "error : ".$e->getMessage();
627 627 
 				}
628 628 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -631,15 +631,15 @@  discard block
 
 block discarded – undo
631 631 
 			if (empty($all)) {
632 632 
 				$filters = array();
633 633 
 				if ($filter_name != '') {
634 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
634 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
635 635 
 				}
636 636 
 				$Tracker = new Tracker($this->db);
637 
-				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
637 
+				$all = $Tracker->countAllTrackerOverCountries($limit, 0, '', $filters);
638 638 
 			}
639 639 
 			return $all;
640 640 
 		} else return array();
641 641 
 	}
642 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
642 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
643 643 
 		global $globalStatsFilters;
644 644 
 		if ($filter_name == '') $filter_name = $this->filter_name;
645 645 
 		if ($year == '' && $month == '') {
 
@@ -647,41 +647,41 @@  discard block
 
 block discarded – undo
647 647 
 			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";
648 648 
 			try {
649 649 
 				$sth = $this->db->prepare($query);
650 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
651 
-			} catch(PDOException $e) {
650 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
651 
+			} catch (PDOException $e) {
652 652 
 				echo "error : ".$e->getMessage();
653 653 
 			}
654 654 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
655 655 
 		} else $all = array();
656 656 
 		if (empty($all)) {
657 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
657 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
658 658 
 			if ($filter_name != '') {
659 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
659 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
660 660 
 			}
661 661 
 			$Spotter = new Spotter($this->db);
662 662 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
663 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
663 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
664 664 
 		}
665 665 
 		return $all;
666 666 
 	}
667 667
668 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
668 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
669 669 
 		global $globalStatsFilters;
670 670 
 		if ($filter_name == '') $filter_name = $this->filter_name;
671 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
671 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
672 672 
 			$Spotter = new Spotter($this->db);
673 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
673 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
674 674 
 			if ($year == '' && $month == '') {
675 675 
 				$alliance_airlines = array();
676 676 
 				foreach ($airlines as $airline) {
677 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
677 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
678 678 
 				}
679 
-				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";
680 
-				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";
679 
+				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";
680 
+				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";
681 681 
 				try {
682 682 
 					$sth = $this->db->prepare($query);
683 683 
 					$sth->execute(array(':filter_name' => $filter_name));
684 
-				} catch(PDOException $e) {
684 
+				} catch (PDOException $e) {
685 685 
 					echo "error : ".$e->getMessage();
686 686 
 				}
687 687 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -692,45 +692,45 @@  discard block
 
 block discarded – undo
692 692 
 				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";
693 693 
 				try {
694 694 
 					$sth = $this->db->prepare($query);
695 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
696 
-				} catch(PDOException $e) {
695 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
696 
+				} catch (PDOException $e) {
697 697 
 					echo "error : ".$e->getMessage();
698 698 
 				}
699 699 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
700 700 
 			} else $all = array();
701 701 
 		}
702 702 
 		if (empty($all)) {
703 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
704 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
703 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
704 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
705 705 
 			} else {
706 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
706 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
707 707 
 			}
708 708 
 			if ($filter_name != '') {
709 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
709 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
710 710 
 			}
711 711 
 			$Spotter = new Spotter($this->db);
712 712 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
713 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
713 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
714 714 
 		}
715 715 
 		return $all;
716 716 
 	}
717 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
717 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
718 718 
 		global $globalStatsFilters;
719 719 
 		if ($filter_name == '') $filter_name = $this->filter_name;
720 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
720 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
721 721 
 			$Spotter = new Spotter($this->db);
722 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
722 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
723 723 
 			if ($year == '' && $month == '') {
724 724 
 				$alliance_airlines = array();
725 725 
 				foreach ($airlines as $airline) {
726 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
726 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
727 727 
 				}
728 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
729 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
728 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
729 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
730 730 
 				try {
731 731 
 					$sth = $this->db->prepare($query);
732 732 
 					$sth->execute(array(':filter_name' => $filter_name));
733 
-				} catch(PDOException $e) {
733 
+				} catch (PDOException $e) {
734 734 
 					echo "error : ".$e->getMessage();
735 735 
 				}
736 736 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -741,27 +741,27 @@  discard block
 
 block discarded – undo
741 741 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
742 742 
 				try {
743 743 
 					$sth = $this->db->prepare($query);
744 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
745 
-				} catch(PDOException $e) {
744 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
745 
+				} catch (PDOException $e) {
746 746 
 					echo "error : ".$e->getMessage();
747 747 
 				}
748 748 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
749 749 
 			} else $all = array();
750 750 
 		}
751 751 
 		if (empty($all)) {
752 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
753 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
752 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
753 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
754 754 
 			} else {
755 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
755 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
756 756 
 			}
757 757 
 			if ($filter_name != '') {
758 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
758 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
759 759 
 			}
760 760 
 			$Spotter = new Spotter($this->db);
761 761 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
762 762 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
763 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
764 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
763 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
764 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
765 765 
 			$all = array();
766 766 
 			foreach ($pall as $value) {
767 767 
 				$icao = $value['airport_departure_icao'];
 
@@ -777,27 +777,27 @@  discard block
 
 block discarded – undo
777 777 
 			foreach ($all as $key => $row) {
778 778 
 				$count[$key] = $row['airport_departure_icao_count'];
779 779 
 			}
780 
-			array_multisort($count,SORT_DESC,$all);
780 
+			array_multisort($count, SORT_DESC, $all);
781 781 
 		}
782 782 
 		return $all;
783 783 
 	}
784 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
784 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
785 785 
 		global $globalStatsFilters;
786 786 
 		if ($filter_name == '') $filter_name = $this->filter_name;
787 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
787 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
788 788 
 			$Spotter = new Spotter($this->db);
789 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
789 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
790 790 
 			if ($year == '' && $month == '') {
791 791 
 				$alliance_airlines = array();
792 792 
 				foreach ($airlines as $airline) {
793 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
793 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
794 794 
 				}
795 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
796 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
795 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
796 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
797 797 
 				try {
798 798 
 					$sth = $this->db->prepare($query);
799 799 
 					$sth->execute(array(':filter_name' => $filter_name));
800 
-				} catch(PDOException $e) {
800 
+				} catch (PDOException $e) {
801 801 
 					echo "error : ".$e->getMessage();
802 802 
 				}
803 803 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -808,27 +808,27 @@  discard block
 
 block discarded – undo
808 808 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
809 809 
 				try {
810 810 
 					$sth = $this->db->prepare($query);
811 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
812 
-				} catch(PDOException $e) {
811 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
812 
+				} catch (PDOException $e) {
813 813 
 					echo "error : ".$e->getMessage();
814 814 
 				}
815 815 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
816 816 
 			} else $all = array();
817 817 
 		}
818 818 
 		if (empty($all)) {
819 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
820 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
819 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
820 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
821 821 
 			} else {
822 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
822 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
823 823 
 			}
824 824 
 			if ($filter_name != '') {
825 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
825 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
826 826 
 			}
827 827 
 			$Spotter = new Spotter($this->db);
828 828 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
829 829 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
830 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
831 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
830 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
831 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
832 832 
 			$all = array();
833 833 
 			foreach ($pall as $value) {
834 834 
 				$icao = $value['airport_arrival_icao'];
 
@@ -844,26 +844,26 @@  discard block
 
 block discarded – undo
844 844 
 			foreach ($all as $key => $row) {
845 845 
 				$count[$key] = $row['airport_arrival_icao_count'];
846 846 
 			}
847 
-			array_multisort($count,SORT_DESC,$all);
847 
+			array_multisort($count, SORT_DESC, $all);
848 848 
 		}
849 849 
 		return $all;
850 850 
 	}
851 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
851 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
852 852 
 		global $globalDBdriver, $globalStatsFilters;
853 853 
 		if ($filter_name == '') $filter_name = $this->filter_name;
854 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
854 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
855 855 
 			$Spotter = new Spotter($this->db);
856 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
856 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
857 857 
 			$alliance_airlines = array();
858 858 
 			foreach ($airlines as $airline) {
859 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
859 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
860 860 
 			}
861 861 
 			if ($globalDBdriver == 'mysql') {
862 
-				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";
863 
-				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";
862 
+				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";
863 
+				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";
864 864 
 			} else {
865 
-				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";
866 
-				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";
865 
+				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";
866 
+				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";
867 867 
 			}
868 868 
 			$query_data = array(':filter_name' => $filter_name);
869 869 
 		} else {
 
@@ -874,23 +874,23 @@  discard block
 
 block discarded – undo
874 874 
 				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";
875 875 
 				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";
876 876 
 			}
877 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
877 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
878 878 
 		}
879 879 
 		try {
880 880 
 			$sth = $this->db->prepare($query);
881 881 
 			$sth->execute($query_data);
882 
-		} catch(PDOException $e) {
882 
+		} catch (PDOException $e) {
883 883 
 			echo "error : ".$e->getMessage();
884 884 
 		}
885 885 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
886 886 
 		if (empty($all)) {
887 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
888 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
887 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
888 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
889 889 
 			} else {
890 890 
 				$filters = array('airlines' => array($stats_airline));
891 891 
 			}
892 892 
 			if ($filter_name != '') {
893 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
893 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
894 894 
 			}
895 895 
 			$Spotter = new Spotter($this->db);
896 896 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -898,7 +898,7 @@  discard block
 
 block discarded – undo
898 898 
 		return $all;
899 899 
 	}
900 900
901 
-	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
901 
+	public function countAllMarineMonthsLastYear($limit = true, $filter_name = '') {
902 902 
 		global $globalDBdriver, $globalStatsFilters;
903 903 
 		if ($filter_name == '') $filter_name = $this->filter_name;
904 904 
 		if ($globalDBdriver == 'mysql') {
 
@@ -912,14 +912,14 @@  discard block
 
 block discarded – undo
912 912 
 		try {
913 913 
 			$sth = $this->db->prepare($query);
914 914 
 			$sth->execute($query_data);
915 
-		} catch(PDOException $e) {
915 
+		} catch (PDOException $e) {
916 916 
 			echo "error : ".$e->getMessage();
917 917 
 		}
918 918 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
919 919 
 		if (empty($all)) {
920 920 
 			$filters = array();
921 921 
 			if ($filter_name != '') {
922 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
922 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
923 923 
 			}
924 924 
 			$Marine = new Marine($this->db);
925 925 
 			$all = $Marine->countAllMonthsLastYear($filters);
 
@@ -927,7 +927,7 @@  discard block
 
 block discarded – undo
927 927 
 		return $all;
928 928 
 	}
929 929
930 
-	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
930 
+	public function countAllTrackerMonthsLastYear($limit = true, $filter_name = '') {
931 931 
 		global $globalDBdriver, $globalStatsFilters;
932 932 
 		if ($filter_name == '') $filter_name = $this->filter_name;
933 933 
 		if ($globalDBdriver == 'mysql') {
 
@@ -941,14 +941,14 @@  discard block
 
 block discarded – undo
941 941 
 		try {
942 942 
 			$sth = $this->db->prepare($query);
943 943 
 			$sth->execute($query_data);
944 
-		} catch(PDOException $e) {
944 
+		} catch (PDOException $e) {
945 945 
 			echo "error : ".$e->getMessage();
946 946 
 		}
947 947 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
948 948 
 		if (empty($all)) {
949 949 
 			$filters = array();
950 950 
 			if ($filter_name != '') {
951 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
951 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
952 952 
 			}
953 953 
 			$Tracker = new Tracker($this->db);
954 954 
 			$all = $Tracker->countAllMonthsLastYear($filters);
 
@@ -956,37 +956,37 @@  discard block
 
 block discarded – undo
956 956 
 		return $all;
957 957 
 	}
958 958
959 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
959 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
960 960 
 		global $globalStatsFilters;
961 961 
 		if ($filter_name == '') $filter_name = $this->filter_name;
962 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
962 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
963 963 
 			$Spotter = new Spotter($this->db);
964 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
964 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
965 965 
 			$alliance_airlines = array();
966 966 
 			foreach ($airlines as $airline) {
967 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
967 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
968 968 
 			}
969 
-			$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";
969 
+			$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";
970 970 
 			$query_data = array(':filter_name' => $filter_name);
971 971 
 		} else {
972 972 
 			$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";
973 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
973 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
974 974 
 		}
975 975 
 		try {
976 976 
 			$sth = $this->db->prepare($query);
977 977 
 			$sth->execute($query_data);
978 
-		} catch(PDOException $e) {
978 
+		} catch (PDOException $e) {
979 979 
 			echo "error : ".$e->getMessage();
980 980 
 		}
981 981 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
982 982 
 		if (empty($all)) {
983 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
984 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
983 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
984 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
985 985 
 			} else {
986 986 
 				$filters = array('airlines' => array($stats_airline));
987 987 
 			}
988 988 
 			if ($filter_name != '') {
989 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
989 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
990 990 
 			}
991 991 
 			$Spotter = new Spotter($this->db);
992 992 
 			$all = $Spotter->countAllDatesLastMonth($filters);
 
@@ -1001,14 +1001,14 @@  discard block
 
 block discarded – undo
1001 1001 
 		try {
1002 1002 
 			$sth = $this->db->prepare($query);
1003 1003 
 			$sth->execute($query_data);
1004 
-		} catch(PDOException $e) {
1004 
+		} catch (PDOException $e) {
1005 1005 
 			echo "error : ".$e->getMessage();
1006 1006 
 		}
1007 1007 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1008 1008 
 		if (empty($all)) {
1009 1009 
 			$filters = array();
1010 1010 
 			if ($filter_name != '') {
1011 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1011 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1012 1012 
 			}
1013 1013 
 			$Marine = new Marine($this->db);
1014 1014 
 			$all = $Marine->countAllDatesLastMonth($filters);
 
@@ -1023,34 +1023,34 @@  discard block
 
 block discarded – undo
1023 1023 
 		try {
1024 1024 
 			$sth = $this->db->prepare($query);
1025 1025 
 			$sth->execute($query_data);
1026 
-		} catch(PDOException $e) {
1026 
+		} catch (PDOException $e) {
1027 1027 
 			echo "error : ".$e->getMessage();
1028 1028 
 		}
1029 1029 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1030 1030 
 		if (empty($all)) {
1031 1031 
 			$filters = array();
1032 1032 
 			if ($filter_name != '') {
1033 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1033 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1034 1034 
 			}
1035 1035 
 			$Tracker = new Tracker($this->db);
1036 1036 
 			$all = $Tracker->countAllDatesLastMonth($filters);
1037 1037 
 		}
1038 1038 
 		return $all;
1039 1039 
 	}
1040 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1040 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
1041 1041 
 		global $globalDBdriver, $globalStatsFilters;
1042 1042 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1043 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1043 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1044 1044 
 			$Spotter = new Spotter($this->db);
1045 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1045 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1046 1046 
 			$alliance_airlines = array();
1047 1047 
 			foreach ($airlines as $airline) {
1048 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1048 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1049 1049 
 			}
1050 1050 
 			if ($globalDBdriver == 'mysql') {
1051 
-				$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";
1051 
+				$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";
1052 1052 
 			} else {
1053 
-				$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";
1053 
+				$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";
1054 1054 
 			}
1055 1055 
 			$query_data = array(':filter_name' => $filter_name);
1056 1056 
 		} else {
 
@@ -1059,23 +1059,23 @@  discard block
 
 block discarded – undo
1059 1059 
 			} else {
1060 1060 
 				$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";
1061 1061 
 			}
1062 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1062 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1063 1063 
 		}
1064 1064 
 		try {
1065 1065 
 			$sth = $this->db->prepare($query);
1066 1066 
 			$sth->execute($query_data);
1067 
-		} catch(PDOException $e) {
1067 
+		} catch (PDOException $e) {
1068 1068 
 			echo "error : ".$e->getMessage();
1069 1069 
 		}
1070 1070 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071 1071 
 		if (empty($all)) {
1072 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1073 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1072 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1073 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1074 1074 
 			} else {
1075 1075 
 				$filters = array('airlines' => array($stats_airline));
1076 1076 
 			}
1077 1077 
 			if ($filter_name != '') {
1078 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1078 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1079 1079 
 			}
1080 1080 
 			$Spotter = new Spotter($this->db);
1081 1081 
 			$all = $Spotter->countAllDatesLast7Days($filters);
 
@@ -1094,14 +1094,14 @@  discard block
 
 block discarded – undo
1094 1094 
 		try {
1095 1095 
 			$sth = $this->db->prepare($query);
1096 1096 
 			$sth->execute($query_data);
1097 
-		} catch(PDOException $e) {
1097 
+		} catch (PDOException $e) {
1098 1098 
 			echo "error : ".$e->getMessage();
1099 1099 
 		}
1100 1100 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1101 1101 
 		if (empty($all)) {
1102 1102 
 			$filters = array();
1103 1103 
 			if ($filter_name != '') {
1104 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1104 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1105 1105 
 			}
1106 1106 
 			$Marine = new Marine($this->db);
1107 1107 
 			$all = $Marine->countAllDatesLast7Days($filters);
 
@@ -1120,51 +1120,51 @@  discard block
 
 block discarded – undo
1120 1120 
 		try {
1121 1121 
 			$sth = $this->db->prepare($query);
1122 1122 
 			$sth->execute($query_data);
1123 
-		} catch(PDOException $e) {
1123 
+		} catch (PDOException $e) {
1124 1124 
 			echo "error : ".$e->getMessage();
1125 1125 
 		}
1126 1126 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1127 1127 
 		if (empty($all)) {
1128 1128 
 			$filters = array();
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 
 			$Tracker = new Tracker($this->db);
1133 1133 
 			$all = $Tracker->countAllDatesLast7Days($filters);
1134 1134 
 		}
1135 1135 
 		return $all;
1136 1136 
 	}
1137 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
1137 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
1138 1138 
 		global $globalStatsFilters;
1139 1139 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1140 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1140 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1141 1141 
 			$Spotter = new Spotter($this->db);
1142 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1142 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1143 1143 
 			$alliance_airlines = array();
1144 1144 
 			foreach ($airlines as $airline) {
1145 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1145 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1146 1146 
 			}
1147 
-			$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";
1147 
+			$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";
1148 1148 
 			$query_data = array(':filter_name' => $filter_name);
1149 1149 
 		} else {
1150 1150 
 			$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";
1151 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1151 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1152 1152 
 		}
1153 1153 
 		try {
1154 1154 
 			$sth = $this->db->prepare($query);
1155 1155 
 			$sth->execute($query_data);
1156 
-		} catch(PDOException $e) {
1156 
+		} catch (PDOException $e) {
1157 1157 
 			echo "error : ".$e->getMessage();
1158 1158 
 		}
1159 1159 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1160 1160 
 		if (empty($all)) {
1161 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1161 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1163 1163 
 			} else {
1164 1164 
 				$filters = array('airlines' => array($stats_airline));
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->countAllDates($filters);
 
@@ -1179,7 +1179,7 @@  discard block
 
 block discarded – undo
1179 1179 
 		try {
1180 1180 
 			$sth = $this->db->prepare($query);
1181 1181 
 			$sth->execute($query_data);
1182 
-		} catch(PDOException $e) {
1182 
+		} catch (PDOException $e) {
1183 1183 
 			echo "error : ".$e->getMessage();
1184 1184 
 		}
1185 1185 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1201,7 +1201,7 @@  discard block
 
 block discarded – undo
1201 1201 
 		try {
1202 1202 
 			$sth = $this->db->prepare($query);
1203 1203 
 			$sth->execute($query_data);
1204 
-		} catch(PDOException $e) {
1204 
+		} catch (PDOException $e) {
1205 1205 
 			echo "error : ".$e->getMessage();
1206 1206 
 		}
1207 1207 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1223,34 +1223,34 @@  discard block
 
 block discarded – undo
1223 1223 
 		try {
1224 1224 
 			$sth = $this->db->prepare($query);
1225 1225 
 			$sth->execute($query_data);
1226 
-		} catch(PDOException $e) {
1226 
+		} catch (PDOException $e) {
1227 1227 
 			echo "error : ".$e->getMessage();
1228 1228 
 		}
1229 1229 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1230 1230 
 		if (empty($all)) {
1231 1231 
 			$filters = array();
1232 1232 
 			if ($filter_name != '') {
1233 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1233 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1234 1234 
 			}
1235 1235 
 			$Spotter = new Spotter($this->db);
1236 1236 
 			$all = $Spotter->countAllDatesByAirlines($filters);
1237 1237 
 		}
1238 1238 
 		return $all;
1239 1239 
 	}
1240 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
1240 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
1241 1241 
 		global $globalStatsFilters, $globalDBdriver;
1242 1242 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1243 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1243 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1244 1244 
 			$Spotter = new Spotter($this->db);
1245 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1245 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1246 1246 
 			$alliance_airlines = array();
1247 1247 
 			foreach ($airlines as $airline) {
1248 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1248 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1249 1249 
 			}
1250 1250 
 			if ($globalDBdriver == 'mysql') {
1251 
-				$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";
1251 
+				$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";
1252 1252 
 			} else {
1253 
-				$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";
1253 
+				$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";
1254 1254 
 			}
1255 1255 
 			$query_data = array(':filter_name' => $filter_name);
1256 1256 
 		} else {
 
@@ -1264,18 +1264,18 @@  discard block
 
 block discarded – undo
1264 1264 
 		try {
1265 1265 
 			$sth = $this->db->prepare($query);
1266 1266 
 			$sth->execute($query_data);
1267 
-		} catch(PDOException $e) {
1267 
+		} catch (PDOException $e) {
1268 1268 
 			echo "error : ".$e->getMessage();
1269 1269 
 		}
1270 1270 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1271 1271 
 		if (empty($all)) {
1272 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1273 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1272 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1273 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1274 1274 
 			} else {
1275 1275 
 				$filters = array('airlines' => array($stats_airline));
1276 1276 
 			}
1277 1277 
 			if ($filter_name != '') {
1278 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1278 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1279 1279 
 			}
1280 1280 
 			$Spotter = new Spotter($this->db);
1281 1281 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1292,7 +1292,7 @@  discard block
 
 block discarded – undo
1292 1292 
 		try {
1293 1293 
 			$sth = $this->db->prepare($query);
1294 1294 
 			$sth->execute();
1295 
-		} catch(PDOException $e) {
1295 
+		} catch (PDOException $e) {
1296 1296 
 			echo "error : ".$e->getMessage();
1297 1297 
 		}
1298 1298 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1312,7 +1312,7 @@  discard block
 
 block discarded – undo
1312 1312 
 		try {
1313 1313 
 			$sth = $this->db->prepare($query);
1314 1314 
 			$sth->execute();
1315 
-		} catch(PDOException $e) {
1315 
+		} catch (PDOException $e) {
1316 1316 
 			echo "error : ".$e->getMessage();
1317 1317 
 		}
1318 1318 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1329,32 +1329,32 @@  discard block
 
 block discarded – undo
1329 1329 
 		try {
1330 1330 
 			$sth = $this->db->prepare($query);
1331 1331 
 			$sth->execute(array(':filter_name' => $filter_name));
1332 
-		} catch(PDOException $e) {
1332 
+		} catch (PDOException $e) {
1333 1333 
 			echo "error : ".$e->getMessage();
1334 1334 
 		}
1335 1335 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1336 1336 
 		if (empty($all)) {
1337 1337 
 			$filters = array();
1338 1338 
 			if ($filter_name != '') {
1339 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1339 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1340 1340 
 			}
1341 1341 
 			$Spotter = new Spotter($this->db);
1342 1342 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1343 1343 
 		}
1344 1344 
 		return $all;
1345 1345 
 	}
1346 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1346 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1347 1347 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1348 1348 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1349 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1349 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1350 1350 
 			$Spotter = new Spotter($this->db);
1351 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1351 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1352 1352 
 			$alliance_airlines = array();
1353 1353 
 			foreach ($airlines as $airline) {
1354 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1354 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1355 1355 
 			}
1356 
-			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";
1357 
-			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";
1356 
+			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";
1357 
+			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";
1358 1358 
 			$query_data = array(':filter_name' => $filter_name);
1359 1359 
 		} else {
1360 1360 
 			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";
 
@@ -1372,25 +1372,25 @@  discard block
 
 block discarded – undo
1372 1372 
 		try {
1373 1373 
 			$sth = $this->db->prepare($query);
1374 1374 
 			$sth->execute($query_data);
1375 
-		} catch(PDOException $e) {
1375 
+		} catch (PDOException $e) {
1376 1376 
 			echo "error : ".$e->getMessage();
1377 1377 
 		}
1378 1378 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1379 1379 
 		if (empty($all)) {
1380 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1381 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1380 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1381 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1382 1382 
 			} else {
1383 1383 
 				$filters = array('airlines' => array($stats_airline));
1384 1384 
 			}
1385 1385 
 			if ($filter_name != '') {
1386 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1386 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1387 1387 
 			}
1388 1388 
 			$Spotter = new Spotter($this->db);
1389 
-			$all = $Spotter->countAllHours($orderby,$filters);
1389 
+			$all = $Spotter->countAllHours($orderby, $filters);
1390 1390 
 		}
1391 1391 
 		return $all;
1392 1392 
 	}
1393 
-	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1393 
+	public function countAllMarineHours($orderby = 'hour', $limit = true, $filter_name = '') {
1394 1394 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1395 1395 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1396 1396 
 		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1407,21 +1407,21 @@  discard block
 
 block discarded – undo
1407 1407 
 		try {
1408 1408 
 			$sth = $this->db->prepare($query);
1409 1409 
 			$sth->execute($query_data);
1410 
-		} catch(PDOException $e) {
1410 
+		} catch (PDOException $e) {
1411 1411 
 			echo "error : ".$e->getMessage();
1412 1412 
 		}
1413 1413 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1414 1414 
 		if (empty($all)) {
1415 1415 
 			$filters = array();
1416 1416 
 			if ($filter_name != '') {
1417 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1417 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1418 1418 
 			}
1419 1419 
 			$Marine = new Marine($this->db);
1420 
-			$all = $Marine->countAllHours($orderby,$filters);
1420 
+			$all = $Marine->countAllHours($orderby, $filters);
1421 1421 
 		}
1422 1422 
 		return $all;
1423 1423 
 	}
1424 
-	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1424 
+	public function countAllTrackerHours($orderby = 'hour', $limit = true, $filter_name = '') {
1425 1425 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1426 1426 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1427 1427 
 		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1438,33 +1438,33 @@  discard block
 
 block discarded – undo
1438 1438 
 		try {
1439 1439 
 			$sth = $this->db->prepare($query);
1440 1440 
 			$sth->execute($query_data);
1441 
-		} catch(PDOException $e) {
1441 
+		} catch (PDOException $e) {
1442 1442 
 			echo "error : ".$e->getMessage();
1443 1443 
 		}
1444 1444 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1445 1445 
 		if (empty($all)) {
1446 1446 
 			$filters = array();
1447 1447 
 			if ($filter_name != '') {
1448 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1448 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1449 1449 
 			}
1450 1450 
 			$Tracker = new Tracker($this->db);
1451 
-			$all = $Tracker->countAllHours($orderby,$filters);
1451 
+			$all = $Tracker->countAllHours($orderby, $filters);
1452 1452 
 		}
1453 1453 
 		return $all;
1454 1454 
 	}
1455 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1455 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1456 1456 
 		global $globalStatsFilters;
1457 1457 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1458 1458 
 		if ($year == '') $year = date('Y');
1459 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1459 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1460 1460 
 		if (empty($all)) {
1461 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1462 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1461 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1462 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1463 1463 
 			} else {
1464 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1464 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1465 1465 
 			}
1466 1466 
 			if ($filter_name != '') {
1467 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1467 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1468 1468 
 			}
1469 1469 
 			$Spotter = new Spotter($this->db);
1470 1470 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1472,15 +1472,15 @@  discard block
 
 block discarded – undo
1472 1472 
 		}
1473 1473 
 		return $all;
1474 1474 
 	}
1475 
-	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1475 
+	public function countOverallMarine($filter_name = '', $year = '', $month = '') {
1476 1476 
 		global $globalStatsFilters;
1477 1477 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1478 1478 
 		if ($year == '') $year = date('Y');
1479 
-		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1479 
+		$all = $this->getSumStats('marine_bymonth', $year, '', $filter_name, $month);
1480 1480 
 		if (empty($all)) {
1481 
-			$filters = array('year' => $year,'month' => $month);
1481 
+			$filters = array('year' => $year, 'month' => $month);
1482 1482 
 			if ($filter_name != '') {
1483 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1483 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1484 1484 
 			}
1485 1485 
 			$Marine = new Marine($this->db);
1486 1486 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1488,15 +1488,15 @@  discard block
 
 block discarded – undo
1488 1488 
 		}
1489 1489 
 		return $all;
1490 1490 
 	}
1491 
-	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1491 
+	public function countOverallTracker($filter_name = '', $year = '', $month = '') {
1492 1492 
 		global $globalStatsFilters;
1493 1493 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1494 1494 
 		if ($year == '') $year = date('Y');
1495 
-		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1495 
+		$all = $this->getSumStats('tracker_bymonth', $year, '', $filter_name, $month);
1496 1496 
 		if (empty($all)) {
1497 
-			$filters = array('year' => $year,'month' => $month);
1497 
+			$filters = array('year' => $year, 'month' => $month);
1498 1498 
 			if ($filter_name != '') {
1499 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1499 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1500 1500 
 			}
1501 1501 
 			$Tracker = new Tracker($this->db);
1502 1502 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1504,16 +1504,16 @@  discard block
 
 block discarded – undo
1504 1504 
 		}
1505 1505 
 		return $all;
1506 1506 
 	}
1507 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1507 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1508 1508 
 		global $globalStatsFilters;
1509 1509 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1510 1510 
 		if ($year == '') $year = date('Y');
1511 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1511 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1512 1512 
 		if (empty($all)) {
1513 1513 
 			$filters = array();
1514 
-			$filters = array('year' => $year,'month' => $month);
1514 
+			$filters = array('year' => $year, 'month' => $month);
1515 1515 
 			if ($filter_name != '') {
1516 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1516 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1517 1517 
 			}
1518 1518 
 			$Spotter = new Spotter($this->db);
1519 1519 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1521,19 +1521,19 @@  discard block
 
 block discarded – undo
1521 1521 
 		}
1522 1522 
 		return $all;
1523 1523 
 	}
1524 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1524 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1525 1525 
 		global $globalStatsFilters;
1526 1526 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1527 1527 
 		if ($year == '') $year = date('Y');
1528 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1528 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1529 1529 
 		if (empty($all)) {
1530 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1531 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1530 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1531 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1532 1532 
 			} else {
1533 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1533 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1534 1534 
 			}
1535 1535 
 			if ($filter_name != '') {
1536 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1536 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1537 1537 
 			}
1538 1538 
 			$Spotter = new Spotter($this->db);
1539 1539 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1541,48 +1541,48 @@  discard block
 
 block discarded – undo
1541 1541 
 		}
1542 1542 
 		return $all;
1543 1543 
 	}
1544 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1544 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1545 1545 
 		global $globalStatsFilters;
1546 1546 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1547 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1547 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1548 1548 
 			$Spotter = new Spotter($this->db);
1549 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1549 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1550 1550 
 			if ($year == '' && $month == '') {
1551 1551 
 				$alliance_airlines = array();
1552 1552 
 				foreach ($airlines as $airline) {
1553 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1553 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1554 1554 
 				}
1555 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1555 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1556 1556 
 				try {
1557 1557 
 					$sth = $this->db->prepare($query);
1558 1558 
 					$sth->execute(array(':filter_name' => $filter_name));
1559 
-				} catch(PDOException $e) {
1559 
+				} catch (PDOException $e) {
1560 1560 
 					echo "error : ".$e->getMessage();
1561 1561 
 				}
1562 1562 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1563 1563 
 				$all = $result[0]['nb'];
1564 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1564 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1565 1565 
 		} else {
1566 1566 
 			if ($year == '' && $month == '') {
1567 1567 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1568 1568 
 				try {
1569 1569 
 					$sth = $this->db->prepare($query);
1570 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1571 
-				} catch(PDOException $e) {
1570 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1571 
+				} catch (PDOException $e) {
1572 1572 
 					echo "error : ".$e->getMessage();
1573 1573 
 				}
1574 1574 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1575 1575 
 				$all = $result[0]['nb'];
1576 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1576 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1577 1577 
 		}
1578 1578 
 		if (empty($all)) {
1579 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1580 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1579 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1580 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1581 1581 
 			} else {
1582 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1582 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1583 1583 
 			}
1584 1584 
 			if ($filter_name != '') {
1585 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1585 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1586 1586 
 			}
1587 1587 
 			$Spotter = new Spotter($this->db);
1588 1588 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1590,7 +1590,7 @@  discard block
 
 block discarded – undo
1590 1590 
 		}
1591 1591 
 		return $all;
1592 1592 
 	}
1593 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1593 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1594 1594 
 		global $globalStatsFilters;
1595 1595 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1596 1596 
 		if ($year == '' && $month == '') {
 
@@ -1598,17 +1598,17 @@  discard block
 
 block discarded – undo
1598 1598 
 			try {
1599 1599 
 				$sth = $this->db->prepare($query);
1600 1600 
 				$sth->execute(array(':filter_name' => $filter_name));
1601 
-			} catch(PDOException $e) {
1601 
+			} catch (PDOException $e) {
1602 1602 
 				echo "error : ".$e->getMessage();
1603 1603 
 			}
1604 1604 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1605 1605 
 			$all = $result[0]['nb_airline'];
1606 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1606 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1607 1607 
 		if (empty($all)) {
1608 1608 
 			$filters = array();
1609 
-			$filters = array('year' => $year,'month' => $month);
1609 
+			$filters = array('year' => $year, 'month' => $month);
1610 1610 
 			if ($filter_name != '') {
1611 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1611 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1612 1612 
 			}
1613 1613 
 			$Spotter = new Spotter($this->db);
1614 1614 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1616,7 +1616,7 @@  discard block
 
 block discarded – undo
1616 1616 
 		}
1617 1617 
 		return $all;
1618 1618 
 	}
1619 
-	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1619 
+	public function countOverallMarineTypes($filter_name = '', $year = '', $month = '') {
1620 1620 
 		global $globalStatsFilters;
1621 1621 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1622 1622 
 		$all = array();
 
@@ -1625,7 +1625,7 @@  discard block
 
 block discarded – undo
1625 1625 
 			try {
1626 1626 
 				$sth = $this->db->prepare($query);
1627 1627 
 				$sth->execute(array(':filter_name' => $filter_name));
1628 
-			} catch(PDOException $e) {
1628 
+			} catch (PDOException $e) {
1629 1629 
 				echo "error : ".$e->getMessage();
1630 1630 
 			}
1631 1631 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1633,9 +1633,9 @@  discard block
 
 block discarded – undo
1633 1633 
 		}
1634 1634 
 		if (empty($all)) {
1635 1635 
 			$filters = array();
1636 
-			$filters = array('year' => $year,'month' => $month);
1636 
+			$filters = array('year' => $year, 'month' => $month);
1637 1637 
 			if ($filter_name != '') {
1638 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1638 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1639 1639 
 			}
1640 1640 
 			$Marine = new Marine($this->db);
1641 1641 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1643,29 +1643,29 @@  discard block
 
 block discarded – undo
1643 1643 
 		}
1644 1644 
 		return $all;
1645 1645 
 	}
1646 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1646 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1647 1647 
 		global $globalStatsFilters;
1648 1648 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1649 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1649 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1650 1650 
 			$Spotter = new Spotter($this->db);
1651 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1651 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1652 1652 
 			if ($year == '' && $month == '') {
1653 1653 
 				$alliance_airlines = array();
1654 1654 
 				foreach ($airlines as $airline) {
1655 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1655 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1656 1656 
 				}
1657 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1657 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1658 1658 
 				$query_values = array(':filter_name' => $filter_name);
1659 1659 
 				try {
1660 1660 
 					$sth = $this->db->prepare($query);
1661 1661 
 					$sth->execute($query_values);
1662 
-				} catch(PDOException $e) {
1662 
+				} catch (PDOException $e) {
1663 1663 
 					echo "error : ".$e->getMessage();
1664 1664 
 				}
1665 1665 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1666 1666 
 				$all = $result[0]['nb'];
1667 1667 
 			} else {
1668 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1668 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1669 1669 
 			}
1670 1670 
 		} else {
1671 1671 
 			if ($year == '' && $month == '') {
 
@@ -1674,23 +1674,23 @@  discard block
 
 block discarded – undo
1674 1674 
 				try {
1675 1675 
 					$sth = $this->db->prepare($query);
1676 1676 
 					$sth->execute($query_values);
1677 
-				} catch(PDOException $e) {
1677 
+				} catch (PDOException $e) {
1678 1678 
 					echo "error : ".$e->getMessage();
1679 1679 
 				}
1680 1680 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1681 1681 
 				$all = $result[0]['nb'];
1682 1682 
 			} else {
1683 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1683 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1684 1684 
 			}
1685 1685 
 		}
1686 1686 
 		if (empty($all)) {
1687 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1688 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1687 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1688 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1689 1689 
 			} else {
1690 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1690 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1691 1691 
 			}
1692 1692 
 			if ($filter_name != '') {
1693 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1693 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1694 1694 
 			}
1695 1695 
 			$Spotter = new Spotter($this->db);
1696 1696 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1698,7 +1698,7 @@  discard block
 
 block discarded – undo
1698 1698 
 		}
1699 1699 
 		return $all;
1700 1700 
 	}
1701 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1701 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1702 1702 
 		global $globalStatsFilters;
1703 1703 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1704 1704 
 		//if ($year == '') $year = date('Y');
 
@@ -1708,18 +1708,18 @@  discard block
 
 block discarded – undo
1708 1708 
 			try {
1709 1709 
 				$sth = $this->db->prepare($query);
1710 1710 
 				$sth->execute($query_values);
1711 
-			} catch(PDOException $e) {
1711 
+			} catch (PDOException $e) {
1712 1712 
 				echo "error : ".$e->getMessage();
1713 1713 
 			}
1714 1714 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1715 1715 
 			$all = $result[0]['nb'];
1716 1716 
 		} else {
1717 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1717 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1718 1718 
 		}
1719 1719 
 		if (empty($all)) {
1720 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1720 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1721 1721 
 			if ($filter_name != '') {
1722 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1722 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1723 1723 
 			}
1724 1724 
 			$Spotter = new Spotter($this->db);
1725 1725 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1728,104 +1728,104 @@  discard block
 
 block discarded – undo
1728 1728 
 		return $all;
1729 1729 
 	}
1730 1730
1731 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1731 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1732 1732 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1733 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1733 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1734 1734 
 			$Spotter = new Spotter($this->db);
1735 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1735 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1736 1736 
 			$alliance_airlines = array();
1737 1737 
 			foreach ($airlines as $airline) {
1738 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1738 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1739 1739 
 			}
1740 
-			$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";
1741 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1740 
+			$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";
1741 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1742 1742 
 		} else {
1743 1743 
 			$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";
1744 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1744 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1745 1745 
 		}
1746 1746 
 		try {
1747 1747 
 			$sth = $this->db->prepare($query);
1748 1748 
 			$sth->execute($query_values);
1749 
-		} catch(PDOException $e) {
1749 
+		} catch (PDOException $e) {
1750 1750 
 			echo "error : ".$e->getMessage();
1751 1751 
 		}
1752 1752 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1753 1753 
 		return $all;
1754 1754 
 	}
1755 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1755 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1756 1756 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1757 1757 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1758 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1758 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1759 1759 
 		try {
1760 1760 
 			$sth = $this->db->prepare($query);
1761 1761 
 			$sth->execute($query_values);
1762 
-		} catch(PDOException $e) {
1762 
+		} catch (PDOException $e) {
1763 1763 
 			echo "error : ".$e->getMessage();
1764 1764 
 		}
1765 1765 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1766 1766 
 		return $all;
1767 1767 
 	}
1768 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1768 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1769 1769 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1770 1770 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1771 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1771 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1772 1772 
 		try {
1773 1773 
 			$sth = $this->db->prepare($query);
1774 1774 
 			$sth->execute($query_values);
1775 
-		} catch(PDOException $e) {
1775 
+		} catch (PDOException $e) {
1776 1776 
 			echo "error : ".$e->getMessage();
1777 1777 
 		}
1778 1778 
 	}
1779 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1779 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1780 1780 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1781 1781 
 		global $globalArchiveMonths, $globalDBdriver;
1782 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1782 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1783 1783 
 			$Spotter = new Spotter($this->db);
1784 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1784 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1785 1785 
 			$alliance_airlines = array();
1786 1786 
 			foreach ($airlines as $airline) {
1787 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1787 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1788 1788 
 			}
1789 1789 
 			if ($globalDBdriver == 'mysql') {
1790 1790 
 				if ($month == '') {
1791 
-					$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";
1791 
+					$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";
1792 1792 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1793 1793 
 				} else {
1794 
-					$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";
1795 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1794 
+					$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";
1795 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1796 1796 
 				}
1797 1797 
 			} else {
1798 1798 
 				if ($month == '') {
1799 
-					$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";
1799 
+					$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";
1800 1800 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1801 1801 
 				} else {
1802 
-					$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";
1803 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1802 
+					$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";
1803 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1804 1804 
 				}
1805 1805 
 			}
1806 1806 
 		} else {
1807 1807 
 			if ($globalDBdriver == 'mysql') {
1808 1808 
 				if ($month == '') {
1809 1809 
 					$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";
1810 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1810 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1811 1811 
 				} else {
1812 1812 
 					$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";
1813 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1813 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1814 1814 
 				}
1815 1815 
 			} else {
1816 1816 
 				if ($month == '') {
1817 1817 
 					$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";
1818 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1818 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1819 1819 
 				} else {
1820 1820 
 					$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";
1821 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1821 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1822 1822 
 				}
1823 1823 
 			}
1824 1824 
 		}
1825 1825 
 		try {
1826 1826 
 			$sth = $this->db->prepare($query);
1827 1827 
 			$sth->execute($query_values);
1828 
-		} catch(PDOException $e) {
1828 
+		} catch (PDOException $e) {
1829 1829 
 			echo "error : ".$e->getMessage();
1830 1830 
 		}
1831 1831 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1834,17 +1834,17 @@  discard block
 
 block discarded – undo
1834 1834 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1835 1835 
 		global $globalArchiveMonths, $globalDBdriver;
1836 1836 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1837 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1837 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1838 1838 
 			$Spotter = new Spotter($this->db);
1839 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1839 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1840 1840 
 			$alliance_airlines = array();
1841 1841 
 			foreach ($airlines as $airline) {
1842 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1842 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1843 1843 
 			}
1844 1844 
 			if ($globalDBdriver == 'mysql') {
1845 
-				$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";
1845 
+				$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";
1846 1846 
 			} else {
1847 
-				$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";
1847 
+				$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";
1848 1848 
 			}
1849 1849 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1850 1850 
 		} else {
 
@@ -1858,7 +1858,7 @@  discard block
 
 block discarded – undo
1858 1858 
 		try {
1859 1859 
 			$sth = $this->db->prepare($query);
1860 1860 
 			$sth->execute($query_values);
1861 
-		} catch(PDOException $e) {
1861 
+		} catch (PDOException $e) {
1862 1862 
 			echo "error : ".$e->getMessage();
1863 1863 
 		}
1864 1864 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1867,17 +1867,17 @@  discard block
 
 block discarded – undo
1867 1867 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1868 1868 
 		global $globalArchiveMonths, $globalDBdriver;
1869 1869 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1870 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1870 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1871 1871 
 			$Spotter = new Spotter($this->db);
1872 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1872 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1873 1873 
 			$alliance_airlines = array();
1874 1874 
 			foreach ($airlines as $airline) {
1875 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1875 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1876 1876 
 			}
1877 1877 
 			if ($globalDBdriver == 'mysql') {
1878 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1878 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1879 1879 
 			} else {
1880 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1880 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1881 1881 
 			}
1882 1882 
 		} else {
1883 1883 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1889,7 +1889,7 @@  discard block
 
 block discarded – undo
1889 1889 
 		try {
1890 1890 
 			$sth = $this->db->prepare($query);
1891 1891 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1892 
-		} catch(PDOException $e) {
1892 
+		} catch (PDOException $e) {
1893 1893 
 			echo "error : ".$e->getMessage();
1894 1894 
 		}
1895 1895 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1906,7 +1906,7 @@  discard block
 
 block discarded – undo
1906 1906 
 		try {
1907 1907 
 			$sth = $this->db->prepare($query);
1908 1908 
 			$sth->execute(array(':filter_name' => $filter_name));
1909 
-		} catch(PDOException $e) {
1909 
+		} catch (PDOException $e) {
1910 1910 
 			echo "error : ".$e->getMessage();
1911 1911 
 		}
1912 1912 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1923,20 +1923,20 @@  discard block
 
 block discarded – undo
1923 1923 
 		try {
1924 1924 
 			$sth = $this->db->prepare($query);
1925 1925 
 			$sth->execute(array(':filter_name' => $filter_name));
1926 
-		} catch(PDOException $e) {
1926 
+		} catch (PDOException $e) {
1927 1927 
 			echo "error : ".$e->getMessage();
1928 1928 
 		}
1929 1929 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1930 1930 
 		return $all[0]['total'];
1931 1931 
 	}
1932 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1932 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1933 1933 
 		global $globalArchiveMonths, $globalDBdriver;
1934 1934 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1935 1935 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1936 1936 
 		try {
1937 1937 
 			$sth = $this->db->prepare($query);
1938 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1939 
-		} catch(PDOException $e) {
1938 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1939 
+		} catch (PDOException $e) {
1940 1940 
 			echo "error : ".$e->getMessage();
1941 1941 
 		}
1942 1942 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1954,20 +1954,20 @@  discard block
 
 block discarded – undo
1954 1954 
 		try {
1955 1955 
 			$sth = $this->db->prepare($query);
1956 1956 
 			$sth->execute(array(':filter_name' => $filter_name));
1957 
-		} catch(PDOException $e) {
1957 
+		} catch (PDOException $e) {
1958 1958 
 			echo "error : ".$e->getMessage();
1959 1959 
 		}
1960 1960 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1961 1961 
 		return $all[0]['total'];
1962 1962 
 	}
1963 
-	public function getStatsPilot($pilot,$filter_name = '') {
1963 
+	public function getStatsPilot($pilot, $filter_name = '') {
1964 1964 
 		global $globalArchiveMonths, $globalDBdriver;
1965 1965 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1966 1966 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1967 1967 
 		try {
1968 1968 
 			$sth = $this->db->prepare($query);
1969 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1970 
-		} catch(PDOException $e) {
1969 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1970 
+		} catch (PDOException $e) {
1971 1971 
 			echo "error : ".$e->getMessage();
1972 1972 
 		}
1973 1973 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1975,7 +1975,7 @@  discard block
 
 block discarded – undo
1975 1975 
 		else return 0;
1976 1976 
 	}
1977 1977
1978 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1978 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1979 1979 
 		global $globalDBdriver;
1980 1980 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1981 1981 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1983,15 +1983,15 @@  discard block
 
 block discarded – undo
1983 1983 
 		} else {
1984 1984 
 			$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);";
1985 1985 
 		}
1986 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1986 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1987 1987 
 		try {
1988 1988 
 			$sth = $this->db->prepare($query);
1989 1989 
 			$sth->execute($query_values);
1990 
-		} catch(PDOException $e) {
1990 
+		} catch (PDOException $e) {
1991 1991 
 			return "error : ".$e->getMessage();
1992 1992 
 		}
1993 1993 
 	}
1994 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1994 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1995 1995 
 		global $globalDBdriver;
1996 1996 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1997 1997 
 		if ($globalDBdriver == 'mysql') {
 
@@ -2000,11 +2000,11 @@  discard block
 
 block discarded – undo
2000 2000 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
2001 2001 
 			$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);";
2002 2002 
 		}
2003 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2003 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2004 2004 
 		try {
2005 2005 
 			$sth = $this->db->prepare($query);
2006 2006 
 			$sth->execute($query_values);
2007 
-		} catch(PDOException $e) {
2007 
+		} catch (PDOException $e) {
2008 2008 
 			return "error : ".$e->getMessage();
2009 2009 
 		}
2010 2010 
 	}
 
@@ -2028,95 +2028,95 @@  discard block
 
 block discarded – undo
2028 2028 
         }
2029 2029 
         */
2030 2030
2031 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
2031 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
2032 2032 
 		global $globalDBdriver;
2033 2033 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
2034 2034 
 		$query_values = array();
2035 2035 
 		if ($globalDBdriver == 'mysql') {
2036 2036 
 			if ($year != '') {
2037 2037 
 				$query .= ' AND YEAR(stats_date) = :year';
2038 
-				$query_values = array_merge($query_values,array(':year' => $year));
2038 
+				$query_values = array_merge($query_values, array(':year' => $year));
2039 2039 
 			}
2040 2040 
 			if ($month != '') {
2041 2041 
 				$query .= ' AND MONTH(stats_date) = :month';
2042 
-				$query_values = array_merge($query_values,array(':month' => $month));
2042 
+				$query_values = array_merge($query_values, array(':month' => $month));
2043 2043 
 			}
2044 2044 
 			if ($day != '') {
2045 2045 
 				$query .= ' AND DAY(stats_date) = :day';
2046 
-				$query_values = array_merge($query_values,array(':day' => $day));
2046 
+				$query_values = array_merge($query_values, array(':day' => $day));
2047 2047 
 			}
2048 2048 
 		} else {
2049 2049 
 			if ($year != '') {
2050 2050 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
2051 
-				$query_values = array_merge($query_values,array(':year' => $year));
2051 
+				$query_values = array_merge($query_values, array(':year' => $year));
2052 2052 
 			}
2053 2053 
 			if ($month != '') {
2054 2054 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
2055 
-				$query_values = array_merge($query_values,array(':month' => $month));
2055 
+				$query_values = array_merge($query_values, array(':month' => $month));
2056 2056 
 			}
2057 2057 
 			if ($day != '') {
2058 2058 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
2059 
-				$query_values = array_merge($query_values,array(':day' => $day));
2059 
+				$query_values = array_merge($query_values, array(':day' => $day));
2060 2060 
 			}
2061 2061 
 		}
2062 2062 
 		$query .= " ORDER BY source_name";
2063 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
2063 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
2064 2064 
 		try {
2065 2065 
 			$sth = $this->db->prepare($query);
2066 2066 
 			$sth->execute($query_values);
2067 
-		} catch(PDOException $e) {
2067 
+		} catch (PDOException $e) {
2068 2068 
 			echo "error : ".$e->getMessage();
2069 2069 
 		}
2070 2070 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
2071 2071 
 		return $all;
2072 2072 
 	}
2073 2073
2074 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
2074 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
2075 2075 
 		global $globalDBdriver;
2076 2076 
 		if ($globalDBdriver == 'mysql') {
2077 2077 
 			$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";
2078 2078 
 		} else {
2079 2079 
 			$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);";
2080 2080 
 		}
2081 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
2081 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
2082 2082 
 		try {
2083 2083 
 			$sth = $this->db->prepare($query);
2084 2084 
 			$sth->execute($query_values);
2085 
-		} catch(PDOException $e) {
2085 
+		} catch (PDOException $e) {
2086 2086 
 			return "error : ".$e->getMessage();
2087 2087 
 		}
2088 2088 
 	}
2089 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
2089 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
2090 2090 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
2091 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2091 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2092 2092 
 		try {
2093 2093 
 			$sth = $this->db->prepare($query);
2094 2094 
 			$sth->execute($query_values);
2095 
-		} catch(PDOException $e) {
2095 
+		} catch (PDOException $e) {
2096 2096 
 			return "error : ".$e->getMessage();
2097 2097 
 		}
2098 2098 
 	}
2099 
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
2099 
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
2100 2100 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2101 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2101 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2102 2102 
 		try {
2103 2103 
 			$sth = $this->db->prepare($query);
2104 2104 
 			$sth->execute($query_values);
2105 
-		} catch(PDOException $e) {
2105 
+		} catch (PDOException $e) {
2106 2106 
 			return "error : ".$e->getMessage();
2107 2107 
 		}
2108 2108 
 	}
2109 
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
2109 
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
2110 2110 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2111 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2111 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2112 2112 
 		try {
2113 2113 
 			$sth = $this->db->prepare($query);
2114 2114 
 			$sth->execute($query_values);
2115 
-		} catch(PDOException $e) {
2115 
+		} catch (PDOException $e) {
2116 2116 
 			return "error : ".$e->getMessage();
2117 2117 
 		}
2118 2118 
 	}
2119 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
2119 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
2120 2120 
 		global $globalDBdriver;
2121 2121 
 		if ($globalDBdriver == 'mysql') {
2122 2122 
 			if ($reset) {
 
@@ -2131,15 +2131,15 @@  discard block
 
 block discarded – undo
2131 2131 
 				$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);";
2132 2132 
 			}
2133 2133 
 		}
2134 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2134 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2135 2135 
 		try {
2136 2136 
 			$sth = $this->db->prepare($query);
2137 2137 
 			$sth->execute($query_values);
2138 
-		} catch(PDOException $e) {
2138 
+		} catch (PDOException $e) {
2139 2139 
 			return "error : ".$e->getMessage();
2140 2140 
 		}
2141 2141 
 	}
2142 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
2142 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2143 2143 
 		global $globalDBdriver;
2144 2144 
 		if ($globalDBdriver == 'mysql') {
2145 2145 
 			if ($reset) {
 
@@ -2154,15 +2154,15 @@  discard block
 
 block discarded – undo
2154 2154 
 				$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);";
2155 2155 
 			}
2156 2156 
 		}
2157 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
2157 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
2158 2158 
 		try {
2159 2159 
 			$sth = $this->db->prepare($query);
2160 2160 
 			$sth->execute($query_values);
2161 
-		} catch(PDOException $e) {
2161 
+		} catch (PDOException $e) {
2162 2162 
 			return "error : ".$e->getMessage();
2163 2163 
 		}
2164 2164 
 	}
2165 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
2165 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2166 2166 
 		global $globalDBdriver;
2167 2167 
 		if ($globalDBdriver == 'mysql') {
2168 2168 
 			if ($reset) {
 
@@ -2177,15 +2177,15 @@  discard block
 
 block discarded – undo
2177 2177 
 				$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);";
2178 2178 
 			}
2179 2179 
 		}
2180 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
2180 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
2181 2181 
 		try {
2182 2182 
 			$sth = $this->db->prepare($query);
2183 2183 
 			$sth->execute($query_values);
2184 
-		} catch(PDOException $e) {
2184 
+		} catch (PDOException $e) {
2185 2185 
 			return "error : ".$e->getMessage();
2186 2186 
 		}
2187 2187 
 	}
2188 
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2188 
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2189 2189 
 		global $globalDBdriver;
2190 2190 
 		if ($globalDBdriver == 'mysql') {
2191 2191 
 			if ($reset) {
 
@@ -2200,15 +2200,15 @@  discard block
 
 block discarded – undo
2200 2200 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_marine_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2201 2201 
 			}
2202 2202 
 		}
2203 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2203 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2204 2204 
 		try {
2205 2205 
 			$sth = $this->db->prepare($query);
2206 2206 
 			$sth->execute($query_values);
2207 
-		} catch(PDOException $e) {
2207 
+		} catch (PDOException $e) {
2208 2208 
 			return "error : ".$e->getMessage();
2209 2209 
 		}
2210 2210 
 	}
2211 
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2211 
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2212 2212 
 		global $globalDBdriver;
2213 2213 
 		if ($globalDBdriver == 'mysql') {
2214 2214 
 			if ($reset) {
 
@@ -2223,15 +2223,15 @@  discard block
 
 block discarded – undo
2223 2223 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_tracker_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2224 2224 
 			}
2225 2225 
 		}
2226 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2226 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2227 2227 
 		try {
2228 2228 
 			$sth = $this->db->prepare($query);
2229 2229 
 			$sth->execute($query_values);
2230 
-		} catch(PDOException $e) {
2230 
+		} catch (PDOException $e) {
2231 2231 
 			return "error : ".$e->getMessage();
2232 2232 
 		}
2233 2233 
 	}
2234 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2234 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2235 2235 
 		global $globalDBdriver;
2236 2236 
 		if ($globalDBdriver == 'mysql') {
2237 2237 
 			if ($reset) {
 
@@ -2246,15 +2246,15 @@  discard block
 
 block discarded – undo
2246 2246 
 				$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);";
2247 2247 
 			}
2248 2248 
 		}
2249 
-		$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);
2249 
+		$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);
2250 2250 
 		try {
2251 2251 
 			$sth = $this->db->prepare($query);
2252 2252 
 			$sth->execute($query_values);
2253 
-		} catch(PDOException $e) {
2253 
+		} catch (PDOException $e) {
2254 2254 
 			return "error : ".$e->getMessage();
2255 2255 
 		}
2256 2256 
 	}
2257 
-	public function addStatMarineType($type,$type_id,$cnt, $filter_name = '', $reset = false) {
2257 
+	public function addStatMarineType($type, $type_id, $cnt, $filter_name = '', $reset = false) {
2258 2258 
 		global $globalDBdriver;
2259 2259 
 		if ($globalDBdriver == 'mysql') {
2260 2260 
 			if ($reset) {
 
@@ -2269,15 +2269,15 @@  discard block
 
 block discarded – undo
2269 2269 
 				$query = "UPDATE stats_marine_type SET cnt = cnt+:cnt, type = :type, filter_name = :filter_name WHERE type_id = :type_id AND filter_name = :filter_name; INSERT INTO stats_marine_type (type,type_id,cnt,filter_name) SELECT :type,:type_id,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_type WHERE type_id = :type_id AND filter_name = :filter_name);";
2270 2270 
 			}
2271 2271 
 		}
2272 
-		$query_values = array(':type' => $type,':type_id' => $type_id,':cnt' => $cnt, ':filter_name' => $filter_name);
2272 
+		$query_values = array(':type' => $type, ':type_id' => $type_id, ':cnt' => $cnt, ':filter_name' => $filter_name);
2273 2273 
 		try {
2274 2274 
 			$sth = $this->db->prepare($query);
2275 2275 
 			$sth->execute($query_values);
2276 
-		} catch(PDOException $e) {
2276 
+		} catch (PDOException $e) {
2277 2277 
 			return "error : ".$e->getMessage();
2278 2278 
 		}
2279 2279 
 	}
2280 
-	public function addStatTrackerType($type,$cnt, $filter_name = '', $reset = false) {
2280 
+	public function addStatTrackerType($type, $cnt, $filter_name = '', $reset = false) {
2281 2281 
 		global $globalDBdriver;
2282 2282 
 		if ($globalDBdriver == 'mysql') {
2283 2283 
 			if ($reset) {
 
@@ -2292,15 +2292,15 @@  discard block
 
 block discarded – undo
2292 2292 
 				$query = "UPDATE stats_tracker_type SET cnt = cnt+:cnt WHERE type = :type AND filter_name = :filter_name; INSERT INTO stats_tracker_type (type,cnt,filter_name) SELECT :type,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_type WHERE type = :type AND filter_name = :filter_name);";
2293 2293 
 			}
2294 2294 
 		}
2295 
-		$query_values = array(':type' => $type,':cnt' => $cnt, ':filter_name' => $filter_name);
2295 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':filter_name' => $filter_name);
2296 2296 
 		try {
2297 2297 
 			$sth = $this->db->prepare($query);
2298 2298 
 			$sth->execute($query_values);
2299 
-		} catch(PDOException $e) {
2299 
+		} catch (PDOException $e) {
2300 2300 
 			return "error : ".$e->getMessage();
2301 2301 
 		}
2302 2302 
 	}
2303 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
2303 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
2304 2304 
 		global $globalDBdriver;
2305 2305 
 		if ($globalDBdriver == 'mysql') {
2306 2306 
 			if ($reset) {
 
@@ -2315,15 +2315,15 @@  discard block
 
 block discarded – undo
2315 2315 
 				$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);";
2316 2316 
 			}
2317 2317 
 		}
2318 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
2318 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2319 2319 
 		try {
2320 2320 
 			$sth = $this->db->prepare($query);
2321 2321 
 			$sth->execute($query_values);
2322 
-		} catch(PDOException $e) {
2322 
+		} catch (PDOException $e) {
2323 2323 
 			return "error : ".$e->getMessage();
2324 2324 
 		}
2325 2325 
 	}
2326 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
2326 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
2327 2327 
 		global $globalDBdriver;
2328 2328 
 		if ($globalDBdriver == 'mysql') {
2329 2329 
 			if ($reset) {
 
@@ -2338,15 +2338,15 @@  discard block
 
 block discarded – undo
2338 2338 
 				$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);";
2339 2339 
 			}
2340 2340 
 		}
2341 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2341 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2342 2342 
 		try {
2343 2343 
 			$sth = $this->db->prepare($query);
2344 2344 
 			$sth->execute($query_values);
2345 
-		} catch(PDOException $e) {
2345 
+		} catch (PDOException $e) {
2346 2346 
 			return "error : ".$e->getMessage();
2347 2347 
 		}
2348 2348 
 	}
2349 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
2349 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
2350 2350 
 		global $globalDBdriver;
2351 2351 
 		if ($globalDBdriver == 'mysql') {
2352 2352 
 			if ($reset) {
 
@@ -2361,15 +2361,15 @@  discard block
 
 block discarded – undo
2361 2361 
 				$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);";
2362 2362 
 			}
2363 2363 
 		}
2364 
-		$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);
2364 
+		$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);
2365 2365 
 		try {
2366 2366 
 			$sth = $this->db->prepare($query);
2367 2367 
 			$sth->execute($query_values);
2368 
-		} catch(PDOException $e) {
2368 
+		} catch (PDOException $e) {
2369 2369 
 			return "error : ".$e->getMessage();
2370 2370 
 		}
2371 2371 
 	}
2372 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
2372 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
2373 2373 
 		global $globalDBdriver;
2374 2374 
 		if ($airport_icao != '') {
2375 2375 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2385,16 +2385,16 @@  discard block
 
 block discarded – undo
2385 2385 
 					$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);";
2386 2386 
 				}
2387 2387 
 			}
2388 
-			$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);
2388 
+			$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);
2389 2389 
 			try {
2390 2390 
 				$sth = $this->db->prepare($query);
2391 2391 
 				$sth->execute($query_values);
2392 
-			} catch(PDOException $e) {
2392 
+			} catch (PDOException $e) {
2393 2393 
 				return "error : ".$e->getMessage();
2394 2394 
 			}
2395 2395 
 		}
2396 2396 
 	}
2397 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
2397 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
2398 2398 
 		global $globalDBdriver;
2399 2399 
 		if ($airport_icao != '') {
2400 2400 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2402,16 +2402,16 @@  discard block
 
 block discarded – undo
2402 2402 
 			} else {
2403 2403 
 				$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);";
2404 2404 
 			}
2405 
-			$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);
2405 
+			$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);
2406 2406 
 			 try {
2407 2407 
 				$sth = $this->db->prepare($query);
2408 2408 
 				$sth->execute($query_values);
2409 
-			} catch(PDOException $e) {
2409 
+			} catch (PDOException $e) {
2410 2410 
 				return "error : ".$e->getMessage();
2411 2411 
 			}
2412 2412 
 		}
2413 2413 
 	}
2414 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
2414 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
2415 2415 
 		global $globalDBdriver;
2416 2416 
 		if ($airport_icao != '') {
2417 2417 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2427,16 +2427,16 @@  discard block
 
 block discarded – undo
2427 2427 
 					$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);";
2428 2428 
 				}
2429 2429 
 			}
2430 
-			$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);
2430 
+			$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);
2431 2431 
 			try {
2432 2432 
 				$sth = $this->db->prepare($query);
2433 2433 
 				$sth->execute($query_values);
2434 
-			} catch(PDOException $e) {
2434 
+			} catch (PDOException $e) {
2435 2435 
 				return "error : ".$e->getMessage();
2436 2436 
 			}
2437 2437 
 		}
2438 2438 
 	}
2439 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
2439 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
2440 2440 
 		global $globalDBdriver;
2441 2441 
 		if ($airport_icao != '') {
2442 2442 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2444,11 +2444,11 @@  discard block
 
 block discarded – undo
2444 2444 
 			} else {
2445 2445 
 				$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);";
2446 2446 
 			}
2447 
-			$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);
2447 
+			$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);
2448 2448 
 			try {
2449 2449 
 				$sth = $this->db->prepare($query);
2450 2450 
 				$sth->execute($query_values);
2451 
-			} catch(PDOException $e) {
2451 
+			} catch (PDOException $e) {
2452 2452 
 				return "error : ".$e->getMessage();
2453 2453 
 			}
2454 2454 
 		}
 
@@ -2460,7 +2460,7 @@  discard block
 
 block discarded – undo
2460 2460 
 		try {
2461 2461 
 			$sth = $this->db->prepare($query);
2462 2462 
 			$sth->execute($query_values);
2463 
-		} catch(PDOException $e) {
2463 
+		} catch (PDOException $e) {
2464 2464 
 			return "error : ".$e->getMessage();
2465 2465 
 		}
2466 2466 
 	}
 
@@ -2470,7 +2470,7 @@  discard block
 
 block discarded – undo
2470 2470 
 		try {
2471 2471 
 			$sth = $this->db->prepare($query);
2472 2472 
 			$sth->execute($query_values);
2473 
-		} catch(PDOException $e) {
2473 
+		} catch (PDOException $e) {
2474 2474 
 			return "error : ".$e->getMessage();
2475 2475 
 		}
2476 2476 
 	}
 
@@ -2480,7 +2480,7 @@  discard block
 
 block discarded – undo
2480 2480 
 		try {
2481 2481 
 			$sth = $this->db->prepare($query);
2482 2482 
 			$sth->execute($query_values);
2483 
-		} catch(PDOException $e) {
2483 
+		} catch (PDOException $e) {
2484 2484 
 			return "error : ".$e->getMessage();
2485 2485 
 		}
2486 2486 
 	}
 
@@ -2490,7 +2490,7 @@  discard block
 
 block discarded – undo
2490 2490 
 		try {
2491 2491 
 			$sth = $this->db->prepare($query);
2492 2492 
 			$sth->execute($query_values);
2493 
-		} catch(PDOException $e) {
2493 
+		} catch (PDOException $e) {
2494 2494 
 			return "error : ".$e->getMessage();
2495 2495 
 		}
2496 2496 
 	}
 
@@ -2500,13 +2500,13 @@  discard block
 
 block discarded – undo
2500 2500 
 		try {
2501 2501 
 			$sth = $this->db->prepare($query);
2502 2502 
 			$sth->execute($query_values);
2503 
-		} catch(PDOException $e) {
2503 
+		} catch (PDOException $e) {
2504 2504 
 			return "error : ".$e->getMessage();
2505 2505 
 		}
2506 2506 
 	}
2507 2507
2508 2508 
 	public function addOldStats() {
2509 
-		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
2509 
+		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
2510 2510 
 		$Common = new Common();
2511 2511 
 		$Connection = new Connection($this->db);
2512 2512 
 		date_default_timezone_set('UTC');
 
@@ -2521,9 +2521,9 @@  discard block
 
 block discarded – undo
2521 2521 
 			$filtername = 'marine';
2522 2522 
 			if ($Connection->tableExists('countries')) {
2523 2523 
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2524 
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2524 
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
2525 2525 
 				foreach ($alldata as $number) {
2526 
-					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2526 
+					echo $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
2527 2527 
 				}
2528 2528 
 			}
2529 2529 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2533,44 +2533,44 @@  discard block
 
 block discarded – undo
2533 2533 
 			$lastyear = false;
2534 2534 
 			foreach ($alldata as $number) {
2535 2535 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2536 
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2536 
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2537 2537 
 			}
2538 2538 
 			echo 'Marine data...'."\n";
2539 2539 
 			$this->deleteStatMarine('month');
2540 2540 
 			echo '-> countAllDatesLastMonth...'."\n";
2541 2541 
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
2542 2542 
 			foreach ($alldata as $number) {
2543 
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
2543 
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
2544 2544 
 			}
2545 2545 
 			echo '-> countAllDates...'."\n";
2546 2546 
 			$previousdata = $this->countAllDatesMarine();
2547 2547 
 			$this->deleteStatMarine('date');
2548 
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
2548 
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
2549 2549 
 			$values = array();
2550 2550 
 			foreach ($alldata as $cnt) {
2551 2551 
 				$values[] = $cnt['date_count'];
2552 2552 
 			}
2553 
-			array_multisort($values,SORT_DESC,$alldata);
2554 
-			array_splice($alldata,11);
2553 
+			array_multisort($values, SORT_DESC, $alldata);
2554 
+			array_splice($alldata, 11);
2555 2555 
 			foreach ($alldata as $number) {
2556 
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
2556 
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
2557 2557 
 			}
2558 2558
2559 2559 
 			$this->deleteStatMarine('hour');
2560 2560 
 			echo '-> countAllHours...'."\n";
2561 
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
2561 
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
2562 2562 
 			foreach ($alldata as $number) {
2563 
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2563 
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
2564 2564 
 			}
2565 2565 
 			if ($globalDebug) echo 'Count all types...'."\n";
2566 
-			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2566 
+			$alldata = $Marine->countAllMarineTypes(false, 0, $last_update_day);
2567 2567 
 			foreach ($alldata as $number) {
2568 
-				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
2568 
+				$this->addStatMarineType($number['marine_type'], $number['marine_type_id'], $number['marine_type_count'], '', $reset);
2569 2569 
 			}
2570 2570
2571 2571 
 			echo 'Insert last stats update date...'."\n";
2572 2572 
 			date_default_timezone_set('UTC');
2573 
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
2573 
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
2574 2574 
 		}
2575 2575 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2576 2576 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
 
@@ -2582,9 +2582,9 @@  discard block
 
 block discarded – undo
2582 2582 
 			$Tracker = new Tracker($this->db);
2583 2583 
 			if ($Connection->tableExists('countries')) {
2584 2584 
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2585 
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2585 
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
2586 2586 
 				foreach ($alldata as $number) {
2587 
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2587 
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
2588 2588 
 				}
2589 2589 
 			}
2590 2590 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2594,43 +2594,43 @@  discard block
 
 block discarded – undo
2594 2594 
 			$lastyear = false;
2595 2595 
 			foreach ($alldata as $number) {
2596 2596 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2597 
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2597 
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2598 2598 
 			}
2599 2599 
 			echo 'Tracker data...'."\n";
2600 2600 
 			$this->deleteStatTracker('month');
2601 2601 
 			echo '-> countAllDatesLastMonth...'."\n";
2602 2602 
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
2603 2603 
 			foreach ($alldata as $number) {
2604 
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
2604 
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
2605 2605 
 			}
2606 2606 
 			echo '-> countAllDates...'."\n";
2607 2607 
 			$previousdata = $this->countAllDatesTracker();
2608 2608 
 			$this->deleteStatTracker('date');
2609 
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
2609 
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
2610 2610 
 			$values = array();
2611 2611 
 			foreach ($alldata as $cnt) {
2612 2612 
 				$values[] = $cnt['date_count'];
2613 2613 
 			}
2614 
-			array_multisort($values,SORT_DESC,$alldata);
2615 
-			array_splice($alldata,11);
2614 
+			array_multisort($values, SORT_DESC, $alldata);
2615 
+			array_splice($alldata, 11);
2616 2616 
 			foreach ($alldata as $number) {
2617 
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
2617 
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
2618 2618 
 			}
2619 2619
2620 2620 
 			$this->deleteStatTracker('hour');
2621 2621 
 			echo '-> countAllHours...'."\n";
2622 
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
2622 
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
2623 2623 
 			foreach ($alldata as $number) {
2624 
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2624 
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
2625 2625 
 			}
2626 2626 
 			if ($globalDebug) echo 'Count all types...'."\n";
2627 
-			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2627 
+			$alldata = $Tracker->countAllTrackerTypes(false, 0, $last_update_day);
2628 2628 
 			foreach ($alldata as $number) {
2629 
-				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
2629 
+				$this->addStatTrackerType($number['tracker_type'], $number['tracker_type_count'], '', $reset);
2630 2630 
 			}
2631 2631 
 			echo 'Insert last stats update date...'."\n";
2632 2632 
 			date_default_timezone_set('UTC');
2633 
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
2633 
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
2634 2634 
 		}
2635 2635
2636 2636 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 
@@ -2648,41 +2648,41 @@  discard block
 
 block discarded – undo
2648 2648 
 			$Spotter = new Spotter($this->db);
2649 2649
2650 2650 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2651 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2651 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2652 2652 
 			foreach ($alldata as $number) {
2653 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2653 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2654 2654 
 			}
2655 2655 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2656 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2656 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2657 2657 
 			foreach ($alldata as $number) {
2658 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2658 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2659 2659 
 			}
2660 2660 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2661 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2661 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2662 2662 
 			foreach ($alldata as $number) {
2663 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2663 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2664 2664 
 			}
2665 2665 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2666 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2666 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2667 2667 
 			foreach ($alldata as $number) {
2668 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2668 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2669 2669 
 			}
2670 2670 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2671 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2671 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2672 2672 
 			foreach ($alldata as $number) {
2673 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2673 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2674 2674 
 			}
2675 2675 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2676 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2676 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2677 2677 
 			foreach ($alldata as $number) {
2678 2678 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2679 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2679 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2680 2680 
 			}
2681 2681
2682 2682 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2683 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2683 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2684 2684 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2685 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2685 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2686 2686 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2687 2687 
 			$alldata = array();
2688 2688 
 			foreach ($pall as $value) {
 
@@ -2699,14 +2699,14 @@  discard block
 
 block discarded – undo
2699 2699 
 			foreach ($alldata as $key => $row) {
2700 2700 
 				$count[$key] = $row['airport_departure_icao_count'];
2701 2701 
 			}
2702 
-			array_multisort($count,SORT_DESC,$alldata);
2702 
+			array_multisort($count, SORT_DESC, $alldata);
2703 2703 
 			foreach ($alldata as $number) {
2704 
-				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);
2704 
+				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);
2705 2705 
 			}
2706 2706 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2707 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2707 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2708 2708 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2709 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2709 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2710 2710 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2711 2711 
 			$alldata = array();
2712 2712 
 			foreach ($pall as $value) {
 
@@ -2723,18 +2723,18 @@  discard block
 
 block discarded – undo
2723 2723 
 			foreach ($alldata as $key => $row) {
2724 2724 
 				$count[$key] = $row['airport_arrival_icao_count'];
2725 2725 
 			}
2726 
-			array_multisort($count,SORT_DESC,$alldata);
2726 
+			array_multisort($count, SORT_DESC, $alldata);
2727 2727 
 			foreach ($alldata as $number) {
2728 
-				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);
2728 
+				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);
2729 2729 
 			}
2730 2730 
 			if ($Connection->tableExists('countries')) {
2731 2731 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2732 2732 
 				//$SpotterArchive = new SpotterArchive();
2733 2733 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2734 2734 
 				$Spotter = new Spotter($this->db);
2735 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2735 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2736 2736 
 				foreach ($alldata as $number) {
2737 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2737 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2738 2738 
 				}
2739 2739 
 			}
2740 2740 
 			
@@ -2744,12 +2744,12 @@  discard block
 
 block discarded – undo
2744 2744 
 				$this->deleteStatsByType('fatalities_byyear');
2745 2745 
 				$alldata = $Accident->countFatalitiesByYear();
2746 2746 
 				foreach ($alldata as $number) {
2747 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2747 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2748 2748 
 				}
2749 2749 
 				$this->deleteStatsByType('fatalities_bymonth');
2750 2750 
 				$alldata = $Accident->countFatalitiesLast12Months();
2751 2751 
 				foreach ($alldata as $number) {
2752 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2752 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2753 2753 
 				}
2754 2754 
 			}
2755 2755 
 
@@ -2763,37 +2763,37 @@  discard block
 
 block discarded – undo
2763 2763 
 			$lastyear = false;
2764 2764 
 			foreach ($alldata as $number) {
2765 2765 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2766 
-				$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'])));
2766 
+				$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'])));
2767 2767 
 			}
2768 2768 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2769 2769 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2770 2770 
 			foreach ($alldata as $number) {
2771 
-				$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'])));
2771 
+				$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'])));
2772 2772 
 			}
2773 2773 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2774 2774 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2775 2775 
 			foreach ($alldata as $number) {
2776 
-				$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'])));
2776 
+				$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'])));
2777 2777 
 			}
2778 2778 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2779 2779 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2780 2780 
 			foreach ($alldata as $number) {
2781 
-				$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'])));
2781 
+				$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'])));
2782 2782 
 			}
2783 2783 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2784 2784 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2785 2785 
 			foreach ($alldata as $number) {
2786 
-				$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'])));
2786 
+				$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'])));
2787 2787 
 			}
2788 2788 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2789 2789 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2790 2790 
 			foreach ($alldata as $number) {
2791 
-				$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'])));
2791 
+				$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'])));
2792 2792 
 			}
2793 2793 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2794 2794 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2795 2795 
 			foreach ($alldata as $number) {
2796 
-				$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'])));
2796 
+				$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'])));
2797 2797 
 			}
2798 2798 
 			if ($globalDebug) echo 'Airports data...'."\n";
2799 2799 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2838,7 +2838,7 @@  discard block
 
 block discarded – undo
2838 2838 
 			}
2839 2839 
 			$alldata = $pall;
2840 2840 
 			foreach ($alldata as $number) {
2841 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2841 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2842 2842 
 			}
2843 2843 
 			echo '...Arrival'."\n";
2844 2844 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2879,7 +2879,7 @@  discard block
 
 block discarded – undo
2879 2879 
 			}
2880 2880 
 			$alldata = $pall;
2881 2881 
 			foreach ($alldata as $number) {
2882 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2882 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2883 2883 
 			}
2884 2884
2885 2885 
 			echo 'Flights data...'."\n";
 
@@ -2887,28 +2887,28 @@  discard block
 
 block discarded – undo
2887 2887 
 			echo '-> countAllDatesLastMonth...'."\n";
2888 2888 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2889 2889 
 			foreach ($alldata as $number) {
2890 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2890 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2891 2891 
 			}
2892 2892 
 			echo '-> countAllDates...'."\n";
2893 2893 
 			$previousdata = $this->countAllDates();
2894 2894 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2895 2895 
 			$this->deleteStatFlight('date');
2896 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2896 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2897 2897 
 			$values = array();
2898 2898 
 			foreach ($alldata as $cnt) {
2899 2899 
 				$values[] = $cnt['date_count'];
2900 2900 
 			}
2901 
-			array_multisort($values,SORT_DESC,$alldata);
2902 
-			array_splice($alldata,11);
2901 
+			array_multisort($values, SORT_DESC, $alldata);
2902 
+			array_splice($alldata, 11);
2903 2903 
 			foreach ($alldata as $number) {
2904 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2904 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2905 2905 
 			}
2906 2906
2907 2907 
 			$this->deleteStatFlight('hour');
2908 2908 
 			echo '-> countAllHours...'."\n";
2909 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2909 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2910 2910 
 			foreach ($alldata as $number) {
2911 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2911 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2912 2912 
 			}
2913 2913
2914 2914 
 			// Count by airlines
 
@@ -2917,42 +2917,42 @@  discard block
 
 block discarded – undo
2917 2917 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2918 2918 
 				$SpotterArchive = new SpotterArchive($this->db);
2919 2919 
 				//$Spotter = new Spotter($this->db);
2920 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2920 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2921 2921 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2922 2922 
 				foreach ($alldata as $number) {
2923 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2923 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2924 2924 
 				}
2925 2925 
 			}
2926 2926 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2927 2927 
 			$Spotter = new Spotter($this->db);
2928 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2928 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2929 2929 
 			foreach ($alldata as $number) {
2930 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2930 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2931 2931 
 			}
2932 2932 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2933 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2933 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2934 2934 
 			foreach ($alldata as $number) {
2935 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2935 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2936 2936 
 			}
2937 2937 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2938 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2938 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2939 2939 
 			foreach ($alldata as $number) {
2940 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2940 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2941 2941 
 			}
2942 2942 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2943 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2943 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2944 2944 
 			foreach ($alldata as $number) {
2945 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2945 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2946 2946 
 			}
2947 2947 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2948 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2948 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2949 2949 
 			foreach ($alldata as $number) {
2950 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2950 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2951 2951 
 			}
2952 2952 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2953 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2953 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2954 2954 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2955 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2955 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2956 2956 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2957 2957 
 			//$alldata = array();
2958 2958 
 			foreach ($dall as $value) {
 
@@ -2972,12 +2972,12 @@  discard block
 
 block discarded – undo
2972 2972 
 			}
2973 2973 
 			$alldata = $pall;
2974 2974 
 			foreach ($alldata as $number) {
2975 
-				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);
2975 
+				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);
2976 2976 
 			}
2977 2977 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2978 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2978 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2979 2979 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2980 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2980 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2981 2981 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2982 2982 
 			//$alldata = array();
2983 2983 
 			foreach ($dall as $value) {
 
@@ -2997,7 +2997,7 @@  discard block
 
 block discarded – undo
2997 2997 
 			}
2998 2998 
 			$alldata = $pall;
2999 2999 
 			foreach ($alldata as $number) {
3000 
-				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);
3000 
+				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);
3001 3001 
 			}
3002 3002 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3003 3003 
 			$Spotter = new Spotter($this->db);
 
@@ -3005,27 +3005,27 @@  discard block
 
 block discarded – undo
3005 3005 
 			$lastyear = false;
3006 3006 
 			foreach ($alldata as $number) {
3007 3007 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
3008 
-				$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']);
3008 
+				$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']);
3009 3009 
 			}
3010 3010 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3011 3011 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3012 3012 
 			foreach ($alldata as $number) {
3013 
-				$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']);
3013 
+				$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']);
3014 3014 
 			}
3015 3015 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3016 3016 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3017 3017 
 			foreach ($alldata as $number) {
3018 
-				$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']);
3018 
+				$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']);
3019 3019 
 			}
3020 3020 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3021 3021 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3022 3022 
 			foreach ($alldata as $number) {
3023 
-				$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']);
3023 
+				$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']);
3024 3024 
 			}
3025 3025 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3026 3026 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3027 3027 
 			foreach ($alldata as $number) {
3028 
-				$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']);
3028 
+				$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']);
3029 3029 
 			}
3030 3030 
 			if ($globalDebug) echo '...Departure'."\n";
3031 3031 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -3048,7 +3048,7 @@  discard block
 
 block discarded – undo
3048 3048 
 			}
3049 3049 
 			$alldata = $pall;
3050 3050 
 			foreach ($alldata as $number) {
3051 
-				$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']);
3051 
+				$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']);
3052 3052 
 			}
3053 3053 
 			if ($globalDebug) echo '...Arrival'."\n";
3054 3054 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -3071,32 +3071,32 @@  discard block
 
 block discarded – undo
3071 3071 
 			}
3072 3072 
 			$alldata = $pall;
3073 3073 
 			foreach ($alldata as $number) {
3074 
-				$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']);
3074 
+				$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']);
3075 3075 
 			}
3076 3076
3077 3077 
 			if ($globalDebug) echo 'Flights data...'."\n";
3078 3078 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3079 3079 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3080 3080 
 			foreach ($alldata as $number) {
3081 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3081 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
3082 3082 
 			}
3083 3083 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
3084 3084 
 			//$previousdata = $this->countAllDatesByAirlines();
3085 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3085 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
3086 3086 
 			$values = array();
3087 3087 
 			foreach ($alldata as $cnt) {
3088 3088 
 				$values[] = $cnt['date_count'];
3089 3089 
 			}
3090 
-			array_multisort($values,SORT_DESC,$alldata);
3091 
-			array_splice($alldata,11);
3090 
+			array_multisort($values, SORT_DESC, $alldata);
3091 
+			array_splice($alldata, 11);
3092 3092 
 			foreach ($alldata as $number) {
3093 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3093 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
3094 3094 
 			}
3095 3095
3096 3096 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
3097 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3097 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
3098 3098 
 			foreach ($alldata as $number) {
3099 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3099 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
3100 3100 
 			}
3101 3101
3102 3102 
 			// Stats by filters
 
@@ -3120,7 +3120,7 @@  discard block
 
 block discarded – undo
3120 3120 
 							$last_update_day = date('Y').'-01-01 00:00:00';
3121 3121 
 						}
3122 3122 
 					}
3123 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
3123 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
3124 3124 
 						$last_update_day = date('Y').'-01-01 00:00:00';
3125 3125 
 						$reset = true;
3126 3126 
 					}
 
@@ -3128,38 +3128,38 @@  discard block
 
 block discarded – undo
3128 3128 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3129 3129 
 					$Spotter = new Spotter($this->db);
3130 3130 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3131 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3131 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
3132 3132 
 					foreach ($alldata as $number) {
3133 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3133 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
3134 3134 
 					}
3135 3135 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
3136 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3136 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
3137 3137 
 					foreach ($alldata as $number) {
3138 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3138 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
3139 3139 
 					}
3140 3140 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3141 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3141 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
3142 3142 
 					foreach ($alldata as $number) {
3143 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3143 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
3144 3144 
 					}
3145 3145 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
3146 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3146 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
3147 3147 
 					foreach ($alldata as $number) {
3148 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3148 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
3149 3149 
 					}
3150 3150 
 					if ($globalDebug) echo 'Count all owners...'."\n";
3151 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3151 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
3152 3152 
 					foreach ($alldata as $number) {
3153 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3153 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
3154 3154 
 					}
3155 3155 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
3156 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3156 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
3157 3157 
 					foreach ($alldata as $number) {
3158 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3158 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
3159 3159 
 					}
3160 3160 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
3161 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3162 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3161 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
3162 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
3163 3163 
 					$alldata = array();
3164 3164 
 					foreach ($pall as $value) {
3165 3165 
 						$icao = $value['airport_departure_icao'];
 
@@ -3175,13 +3175,13 @@  discard block
 
 block discarded – undo
3175 3175 
 					foreach ($alldata as $key => $row) {
3176 3176 
 						$count[$key] = $row['airport_departure_icao_count'];
3177 3177 
 					}
3178 
-					array_multisort($count,SORT_DESC,$alldata);
3178 
+					array_multisort($count, SORT_DESC, $alldata);
3179 3179 
 					foreach ($alldata as $number) {
3180 
-						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);
3180 
+						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);
3181 3181 
 					}
3182 3182 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3183 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3184 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3183 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
3184 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
3185 3185 
 					$alldata = array();
3186 3186 
 					foreach ($pall as $value) {
3187 3187 
 						$icao = $value['airport_arrival_icao'];
 
@@ -3197,9 +3197,9 @@  discard block
 
 block discarded – undo
3197 3197 
 					foreach ($alldata as $key => $row) {
3198 3198 
 						$count[$key] = $row['airport_arrival_icao_count'];
3199 3199 
 					}
3200 
-					array_multisort($count,SORT_DESC,$alldata);
3200 
+					array_multisort($count, SORT_DESC, $alldata);
3201 3201 
 					foreach ($alldata as $number) {
3202 
-						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);
3202 
+						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);
3203 3203 
 					}
3204 3204 
 					if ($globalDebug) echo 'Count all months...'."\n";
3205 3205 
 					$Spotter = new Spotter($this->db);
 
@@ -3207,36 +3207,36 @@  discard block
 
 block discarded – undo
3207 3207 
 					$lastyear = false;
3208 3208 
 					foreach ($alldata as $number) {
3209 3209 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
3210 
-						$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);
3210 
+						$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);
3211 3211 
 					}
3212 3212 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
3213 3213 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3214 3214 
 					foreach ($alldata as $number) {
3215 
-						$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);
3215 
+						$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);
3216 3216 
 					}
3217 3217 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3218 3218 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3219 3219 
 					foreach ($alldata as $number) {
3220 
-						$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);
3220 
+						$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);
3221 3221 
 					}
3222 3222 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
3223 3223 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3224 3224 
 					foreach ($alldata as $number) {
3225 
-						$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);
3225 
+						$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);
3226 3226 
 					}
3227 3227 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3228 3228 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3229 3229 
 				    	foreach ($alldata as $number) {
3230 
-			    			$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);
3230 
+			    			$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);
3231 3231 
 					}
3232 3232 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3233 3233 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3234 3234 
 					foreach ($alldata as $number) {
3235 
-						$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);
3235 
+						$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);
3236 3236 
 					}
3237 3237 
 					echo '...Departure'."\n";
3238 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
3239 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
3238 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
3239 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
3240 3240 
 					foreach ($dall as $value) {
3241 3241 
 						$icao = $value['departure_airport_icao'];
3242 3242 
 						$ddate = $value['date'];
 
@@ -3254,11 +3254,11 @@  discard block
 
 block discarded – undo
3254 3254 
 					}
3255 3255 
 					$alldata = $pall;
3256 3256 
 					foreach ($alldata as $number) {
3257 
-						$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);
3257 
+						$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);
3258 3258 
 					}
3259 3259 
 					echo '...Arrival'."\n";
3260 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
3261 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
3260 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
3261 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
3262 3262 
 					foreach ($dall as $value) {
3263 3263 
 						$icao = $value['arrival_airport_icao'];
3264 3264 
 						$ddate = $value['date'];
 
@@ -3276,39 +3276,39 @@  discard block
 
 block discarded – undo
3276 3276 
 					}
3277 3277 
 					$alldata = $pall;
3278 3278 
 					foreach ($alldata as $number) {
3279 
-						$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);
3279 
+						$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);
3280 3280 
 					}
3281 3281 
 					echo 'Flights data...'."\n";
3282 3282 
 					echo '-> countAllDatesLastMonth...'."\n";
3283 3283 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
3284 3284 
 					foreach ($alldata as $number) {
3285 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
3285 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
3286 3286 
 					}
3287 3287 
 					echo '-> countAllDates...'."\n";
3288 
-					$previousdata = $this->countAllDates('',$filter_name);
3289 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
3288 
+					$previousdata = $this->countAllDates('', $filter_name);
3289 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
3290 3290 
 					$values = array();
3291 3291 
 					foreach ($alldata as $cnt) {
3292 3292 
 						$values[] = $cnt['date_count'];
3293 3293 
 					}
3294 
-					array_multisort($values,SORT_DESC,$alldata);
3295 
-					array_splice($alldata,11);
3294 
+					array_multisort($values, SORT_DESC, $alldata);
3295 
+					array_splice($alldata, 11);
3296 3296 
 					foreach ($alldata as $number) {
3297 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
3297 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
3298 3298 
 					}
3299 3299
3300 3300 
 					echo '-> countAllHours...'."\n";
3301 
-					$alldata = $Spotter->countAllHours('hour',$filter);
3301 
+					$alldata = $Spotter->countAllHours('hour', $filter);
3302 3302 
 					foreach ($alldata as $number) {
3303 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
3303 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
3304 3304 
 					}
3305 3305 
 					echo 'Insert last stats update date...'."\n";
3306 3306 
 					date_default_timezone_set('UTC');
3307 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
3307 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
3308 3308 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
3309 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
3309 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
3310 3310 
 							$this->deleteOldStats($filter_name);
3311 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
3311 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
3312 3312 
 						}
3313 3313 
 					}
3314 3314 
 				}
 
@@ -3321,16 +3321,16 @@  discard block
 
 block discarded – undo
3321 3321 
 				// SUM all previous month to put as year
3322 3322 
 				$previous_year = date('Y');
3323 3323 
 				$previous_year--;
3324 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3325 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3326 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3327 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3324 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3325 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3326 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3327 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3328 3328 
 				$allairlines = $this->getAllAirlineNames();
3329 3329 
 				foreach ($allairlines as $data) {
3330 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3331 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3332 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3333 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3330 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3331 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3332 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3333 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3334 3334 
 				}
3335 3335
3336 3336 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -3339,21 +3339,21 @@  discard block
 
 block discarded – undo
3339 3339 
 						try {
3340 3340 
 							$sth = $this->db->prepare($query);
3341 3341 
 							$sth->execute();
3342 
-						} catch(PDOException $e) {
3342 
+						} catch (PDOException $e) {
3343 3343 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3344 3344 
 						}
3345 3345 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
3346 3346 
 						try {
3347 3347 
 							$sth = $this->db->prepare($query);
3348 3348 
 							$sth->execute();
3349 
-						} catch(PDOException $e) {
3349 
+						} catch (PDOException $e) {
3350 3350 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3351 3351 
 						}
3352 3352 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
3353 3353 
 						try {
3354 3354 
 							$sth = $this->db->prepare($query);
3355 3355 
 							$sth->execute();
3356 
-						} catch(PDOException $e) {
3356 
+						} catch (PDOException $e) {
3357 3357 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3358 3358 
 						}
3359 3359 
 					}
 
@@ -3366,7 +3366,7 @@  discard block
 
 block discarded – undo
3366 3366 
 					try {
3367 3367 
 						$sth = $this->db->prepare($query);
3368 3368 
 						$sth->execute();
3369 
-					} catch(PDOException $e) {
3369 
+					} catch (PDOException $e) {
3370 3370 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3371 3371 
 					}
3372 3372 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3377,7 +3377,7 @@  discard block
 
 block discarded – undo
3377 3377 
 					try {
3378 3378 
 						$sth = $this->db->prepare($query);
3379 3379 
 						$sth->execute();
3380 
-					} catch(PDOException $e) {
3380 
+					} catch (PDOException $e) {
3381 3381 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3382 3382 
 					}
3383 3383 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3388,15 +3388,15 @@  discard block
 
 block discarded – undo
3388 3388 
 					try {
3389 3389 
 						$sth = $this->db->prepare($query);
3390 3390 
 						$sth->execute();
3391 
-					} catch(PDOException $e) {
3391 
+					} catch (PDOException $e) {
3392 3392 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3393 3393 
 					}
3394 3394 
 				}
3395 3395 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
3396 3396 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
3397 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
3397 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
3398 3398 
 						$this->deleteOldStats();
3399 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
3399 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
3400 3400 
 						$lastyearupdate = true;
3401 3401 
 					}
3402 3402 
 				}
 
@@ -3418,7 +3418,7 @@  discard block
 
 block discarded – undo
3418 3418 
 					try {
3419 3419 
 						$sth = $this->db->prepare($query);
3420 3420 
 						$sth->execute();
3421 
-					} catch(PDOException $e) {
3421 
+					} catch (PDOException $e) {
3422 3422 
 						return "error : ".$e->getMessage();
3423 3423 
 					}
3424 3424 
 					echo 'Archive old tracker data...'."\n";
 
@@ -3434,7 +3434,7 @@  discard block
 
 block discarded – undo
3434 3434 
 					try {
3435 3435 
 						$sth = $this->db->prepare($query);
3436 3436 
 						$sth->execute();
3437 
-					} catch(PDOException $e) {
3437 
+					} catch (PDOException $e) {
3438 3438 
 						return "error : ".$e->getMessage();
3439 3439 
 					}
3440 3440 
 					echo 'Archive old marine data...'."\n";
 
@@ -3450,7 +3450,7 @@  discard block
 
 block discarded – undo
3450 3450 
 					try {
3451 3451 
 						$sth = $this->db->prepare($query);
3452 3452 
 						$sth->execute();
3453 
-					} catch(PDOException $e) {
3453 
+					} catch (PDOException $e) {
3454 3454 
 						return "error : ".$e->getMessage();
3455 3455 
 					}
3456 3456 
 				}
 
@@ -3463,7 +3463,7 @@  discard block
 
 block discarded – undo
3463 3463 
 				try {
3464 3464 
 					$sth = $this->db->prepare($query);
3465 3465 
 					$sth->execute();
3466 
-				} catch(PDOException $e) {
3466 
+				} catch (PDOException $e) {
3467 3467 
 					return "error : ".$e->getMessage();
3468 3468 
 				}
3469 3469 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -3475,7 +3475,7 @@  discard block
 
 block discarded – undo
3475 3475 
 				try {
3476 3476 
 					$sth = $this->db->prepare($query);
3477 3477 
 					$sth->execute();
3478 
-				} catch(PDOException $e) {
3478 
+				} catch (PDOException $e) {
3479 3479 
 					return "error : ".$e->getMessage();
3480 3480 
 				}
3481 3481 
 				echo 'Deleting old marine data...'."\n";
 
@@ -3487,14 +3487,14 @@  discard block
 
 block discarded – undo
3487 3487 
 				try {
3488 3488 
 					$sth = $this->db->prepare($query);
3489 3489 
 					$sth->execute();
3490 
-				} catch(PDOException $e) {
3490 
+				} catch (PDOException $e) {
3491 3491 
 					return "error : ".$e->getMessage();
3492 3492 
 				}
3493 3493 
 			}
3494 3494 
 			if (!isset($lastyearupdate)) {
3495 3495 
 				echo 'Insert last stats update date...'."\n";
3496 3496 
 				date_default_timezone_set('UTC');
3497 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
3497 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
3498 3498 
 			}
3499 3499 
 			if ($globalStatsResetYear) {
3500 3500 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
Braces   +778 added lines, -273 removed lines patch added patch discarded remove patch 
@@ -15,10 +15,14 @@  discard block
 
 block discarded – undo
15 15
16 16 
 	public function __construct($dbc = null) {
17 17 
 		global $globalFilterName;
18 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
18 
+		if (isset($globalFilterName)) {
19 
+			$this->filter_name = $globalFilterName;
20 
+		}
19 21 
 		$Connection = new Connection($dbc);
20 22 
 		$this->db = $Connection->db();
21 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
23 
+		if ($this->db === null) {
24 
+			die('Error: No DB connection. (Stats)');
25 
+		}
22 26 
 	}
23 27
24 28 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -86,7 +90,9 @@  discard block
 
 block discarded – undo
86 90
87 91 
 	public function getAllAirlineNames($filter_name = '') {
88 92 
 		global $globalStatsFilters;
89 
-		if ($filter_name == '') $filter_name = $this->filter_name;
93 
+		if ($filter_name == '') {
94 
+			$filter_name = $this->filter_name;
95 
+		}
90 96 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
91 97 
 		 try {
92 98 
 			$sth = $this->db->prepare($query);
 
@@ -106,7 +112,9 @@  discard block
 
 block discarded – undo
106 112 
 		return $all;
107 113 
 	}
108 114 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
109 
-		if ($filter_name == '') $filter_name = $this->filter_name;
115 
+		if ($filter_name == '') {
116 
+			$filter_name = $this->filter_name;
117 
+		}
110 118 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 119 
 		try {
112 120 
 			$sth = $this->db->prepare($query);
 
@@ -118,7 +126,9 @@  discard block
 
 block discarded – undo
118 126 
 		return $all;
119 127 
 	}
120 128 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
121 
-		if ($filter_name == '') $filter_name = $this->filter_name;
129 
+		if ($filter_name == '') {
130 
+			$filter_name = $this->filter_name;
131 
+		}
122 132 
 		$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";
123 133 
 		try {
124 134 
 			$sth = $this->db->prepare($query);
 
@@ -130,7 +140,9 @@  discard block
 
 block discarded – undo
130 140 
 		return $all;
131 141 
 	}
132 142 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
133 
-		if ($filter_name == '') $filter_name = $this->filter_name;
143 
+		if ($filter_name == '') {
144 
+			$filter_name = $this->filter_name;
145 
+		}
134 146 
 		$query = "SELECT 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";
135 147 
 		try {
136 148 
 			$sth = $this->db->prepare($query);
 
@@ -143,7 +155,9 @@  discard block
 
 block discarded – undo
143 155 
 	}
144 156
145 157 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
158 
+		if ($filter_name == '') {
159 
+			$filter_name = $this->filter_name;
160 
+		}
147 161 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 162 
 		try {
149 163 
 			$sth = $this->db->prepare($query);
 
@@ -156,7 +170,9 @@  discard block
 
 block discarded – undo
156 170 
 	}
157 171
158 172 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
159 
-		if ($filter_name == '') $filter_name = $this->filter_name;
173 
+		if ($filter_name == '') {
174 
+			$filter_name = $this->filter_name;
175 
+		}
160 176 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
161 177 
 		try {
162 178 
 			$sth = $this->db->prepare($query);
 
@@ -171,7 +187,9 @@  discard block
 
 block discarded – undo
171 187
172 188 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
173 189 
 		global $globalStatsFilters;
174 
-		if ($filter_name == '') $filter_name = $this->filter_name;
190 
+		if ($filter_name == '') {
191 
+			$filter_name = $this->filter_name;
192 
+		}
175 193 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
176 194 
 			$Spotter = new Spotter($this->db);
177 195 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -180,8 +198,11 @@  discard block
 
 block discarded – undo
180 198 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
181 199 
 			}
182 200 
 			if ($year == '' && $month == '') {
183 
-				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 aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
201 
+				if ($limit) {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
203 
+				} else {
204 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
205 
+				}
185 206 
 				try {
186 207 
 					$sth = $this->db->prepare($query);
187 208 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -189,11 +210,16 @@  discard block
 
 block discarded – undo
189 210 
 					echo "error : ".$e->getMessage();
190 211 
 				}
191 212 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
192 
-			} else $all = array();
213 
+			} else {
214 
+				$all = array();
215 
+			}
193 216 
 		} else {
194 217 
 			if ($year == '' && $month == '') {
195 
-				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 aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
196 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
218 
+				if ($limit) {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
220 
+				} else {
221 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
222 
+				}
197 223 
 				try {
198 224 
 					$sth = $this->db->prepare($query);
199 225 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -201,7 +227,9 @@  discard block
 
 block discarded – undo
201 227 
 					echo "error : ".$e->getMessage();
202 228 
 				}
203 229 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 
-			} else $all = array();
230 
+			} else {
231 
+				$all = array();
232 
+			}
205 233 
 		}
206 234 
 		if (empty($all)) {
207 235 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -220,10 +248,15 @@  discard block
 
 block discarded – undo
220 248 
 	}
221 249 
 	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
222 250 
 		global $globalStatsFilters;
223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
251 
+		if ($filter_name == '') {
252 
+			$filter_name = $this->filter_name;
253 
+		}
224 254 
 		if ($year == '' && $month == '') {
225 
-			if ($limit) $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
226 
-			else $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
255 
+			if ($limit) {
256 
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
257 
+			} else {
258 
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
259 
+			}
227 260 
 			try {
228 261 
 				$sth = $this->db->prepare($query);
229 262 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -231,7 +264,9 @@  discard block
 
 block discarded – undo
231 264 
 				echo "error : ".$e->getMessage();
232 265 
 			}
233 266 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 
-		} else $all = array();
267 
+		} else {
268 
+			$all = array();
269 
+		}
235 270 
 		if (empty($all)) {
236 271 
 			$filters = array('year' => $year,'month' => $month);
237 272 
 			if ($filter_name != '') {
 
@@ -245,10 +280,15 @@  discard block
 
 block discarded – undo
245 280 
 	}
246 281 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
247 282 
 		global $globalStatsFilters;
248 
-		if ($filter_name == '') $filter_name = $this->filter_name;
283 
+		if ($filter_name == '') {
284 
+			$filter_name = $this->filter_name;
285 
+		}
249 286 
 		if ($year == '' && $month == '') {
250 
-			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";
251 
-			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";
287 
+			if ($limit) {
288 
+				$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";
289 
+			} else {
290 
+				$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";
291 
+			}
252 292 
 			try {
253 293 
 				$sth = $this->db->prepare($query);
254 294 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -256,7 +296,9 @@  discard block
 
 block discarded – undo
256 296 
 				echo "error : ".$e->getMessage();
257 297 
 			}
258 298 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
259 
-		} else $all = array();
299 
+		} else {
300 
+			$all = array();
301 
+		}
260 302 
 		if (empty($all)) {
261 303 
 			$Spotter = new Spotter($this->db);
262 304 
 			$filters = array();
 
@@ -271,7 +313,9 @@  discard block
 
 block discarded – undo
271 313 
 	}
272 314 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
273 315 
 		global $globalStatsFilters;
274 
-		if ($filter_name == '') $filter_name = $this->filter_name;
316 
+		if ($filter_name == '') {
317 
+			$filter_name = $this->filter_name;
318 
+		}
275 319 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
276 320 
 			$Spotter = new Spotter($this->db);
277 321 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -280,8 +324,11 @@  discard block
 
 block discarded – undo
280 324 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
281 325 
 			}
282 326 
 			if ($year == '' && $month == '') {
283 
-				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";
284 
-				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";
327 
+				if ($limit) {
328 
+					$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";
329 
+				} else {
330 
+					$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";
331 
+				}
285 332 
 				try {
286 333 
 					$sth = $this->db->prepare($query);
287 334 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -289,11 +336,16 @@  discard block
 
 block discarded – undo
289 336 
 					echo "error : ".$e->getMessage();
290 337 
 				}
291 338 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
292 
-			} else $all = array();
339 
+			} else {
340 
+				$all = array();
341 
+			}
293 342 
 		} else {
294 343 
 			if ($year == '' && $month == '') {
295 
-				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";
296 
-				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";
344 
+				if ($limit) {
345 
+					$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";
346 
+				} else {
347 
+					$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";
348 
+				}
297 349 
 				try {
298 350 
 					$sth = $this->db->prepare($query);
299 351 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -301,7 +353,9 @@  discard block
 
 block discarded – undo
301 353 
 					echo "error : ".$e->getMessage();
302 354 
 				}
303 355 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
304 
-			} else $all = array();
356 
+			} else {
357 
+				$all = array();
358 
+			}
305 359 
 		}
306 360 
 		if (empty($all)) {
307 361 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -321,7 +375,9 @@  discard block
 
 block discarded – undo
321 375
322 376 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
323 377 
 		global $globalStatsFilters;
324 
-		if ($filter_name == '') $filter_name = $this->filter_name;
378 
+		if ($filter_name == '') {
379 
+			$filter_name = $this->filter_name;
380 
+		}
325 381 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
326 382 
 			$Spotter = new Spotter($this->db);
327 383 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -330,8 +386,11 @@  discard block
 
 block discarded – undo
330 386 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
331 387 
 			}
332 388 
 			if ($year == '' && $month == '') {
333 
-				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";
334 
-				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";
389 
+				if ($limit) {
390 
+					$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";
391 
+				} else {
392 
+					$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";
393 
+				}
335 394 
 				try {
336 395 
 					$sth = $this->db->prepare($query);
337 396 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -339,11 +398,16 @@  discard block
 
 block discarded – undo
339 398 
 					echo "error : ".$e->getMessage();
340 399 
 				}
341 400 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
342 
-			} else $all = array();
401 
+			} else {
402 
+				$all = array();
403 
+			}
343 404 
 		} else {
344 405 
 			if ($year == '' && $month == '') {
345 
-				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";
346 
-				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";
406 
+				if ($limit) {
407 
+					$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";
408 
+				} else {
409 
+					$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";
410 
+				}
347 411 
 				try {
348 412 
 					$sth = $this->db->prepare($query);
349 413 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -351,7 +415,9 @@  discard block
 
 block discarded – undo
351 415 
 					echo "error : ".$e->getMessage();
352 416 
 				}
353 417 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
354 
-			} else $all = array();
418 
+			} else {
419 
+				$all = array();
420 
+			}
355 421 
 		}
356 422 
 		if (empty($all)) {
357 423 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -370,7 +436,9 @@  discard block
 
 block discarded – undo
370 436 
 	}
371 437 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
372 438 
 		global $globalStatsFilters;
373 
-		if ($filter_name == '') $filter_name = $this->filter_name;
439 
+		if ($filter_name == '') {
440 
+			$filter_name = $this->filter_name;
441 
+		}
374 442 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
375 443 
 			$Spotter = new Spotter($this->db);
376 444 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -378,12 +446,18 @@  discard block
 
 block discarded – undo
378 446 
 			foreach ($airlines as $airline) {
379 447 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
380 448 
 			}
381 
-			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";
382 
-			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";
449 
+			if ($limit) {
450 
+				$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";
451 
+			} else {
452 
+				$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";
453 
+			}
383 454 
 			$query_values = array(':filter_name' => $filter_name);
384 455 
 		} else {
385 
-			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";
386 
-			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";
456 
+			if ($limit) {
457 
+				$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";
458 
+			} else {
459 
+				$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";
460 
+			}
387 461 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
388 462 
 		}
389 463 
 		try {
 
@@ -411,17 +485,29 @@  discard block
 
 block discarded – undo
411 485
412 486 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
413 487 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
414 
-		if ($filter_name == '') $filter_name = $this->filter_name;
488 
+		if ($filter_name == '') {
489 
+			$filter_name = $this->filter_name;
490 
+		}
415 491 
 		if ($year == '' && $month == '') {
416 
-			if ($globalVATSIM) $forsource = 'vatsim';
417 
-			if ($globalIVAO) $forsource = 'ivao';
492 
+			if ($globalVATSIM) {
493 
+				$forsource = 'vatsim';
494 
+			}
495 
+			if ($globalIVAO) {
496 
+				$forsource = 'ivao';
497 
+			}
418 498 
 			if (isset($forsource)) {
419 
-				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";
420 
-				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";
499 
+				if ($limit) {
500 
+					$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";
501 
+				} else {
502 
+					$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";
503 
+				}
421 504 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
422 505 
 			} else {
423 
-				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";
424 
-				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";
506 
+				if ($limit) {
507 
+					$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";
508 
+				} else {
509 
+					$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";
510 
+				}
425 511 
 				$query_values = array(':filter_name' => $filter_name);
426 512 
 			}
427 513 
 			try {
 
@@ -431,7 +517,9 @@  discard block
 
 block discarded – undo
431 517 
 				echo "error : ".$e->getMessage();
432 518 
 			}
433 519 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
434 
-		} else $all = array();
520 
+		} else {
521 
+			$all = array();
522 
+		}
435 523 
                 if (empty($all)) {
436 524 
 	                $Spotter = new Spotter($this->db);
437 525 
             		$filters = array();
 
@@ -446,7 +534,9 @@  discard block
 
 block discarded – undo
446 534 
 	}
447 535 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
448 536 
 		global $globalStatsFilters;
449 
-		if ($filter_name == '') $filter_name = $this->filter_name;
537 
+		if ($filter_name == '') {
538 
+			$filter_name = $this->filter_name;
539 
+		}
450 540 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
451 541 
 			$Spotter = new Spotter($this->db);
452 542 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -455,8 +545,11 @@  discard block
 
 block discarded – undo
455 545 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
456 546 
 			}
457 547 
 			if ($year == '' && $month == '') {
458 
-				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 registration_count DESC LIMIT 10 OFFSET 0";
459 
-				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 registration_count DESC";
548 
+				if ($limit) {
549 
+					$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 registration_count DESC LIMIT 10 OFFSET 0";
550 
+				} else {
551 
+					$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 registration_count DESC";
552 
+				}
460 553 
 				try {
461 554 
 					$sth = $this->db->prepare($query);
462 555 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -464,11 +557,16 @@  discard block
 
 block discarded – undo
464 557 
 					echo "error : ".$e->getMessage();
465 558 
 				}
466 559 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
467 
-			} else $all = array();
560 
+			} else {
561 
+				$all = array();
562 
+			}
468 563 
 		} else {
469 564 
 			if ($year == '' && $month == '') {
470 
-				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 registration_count DESC LIMIT 10 OFFSET 0";
471 
-				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 registration_count DESC";
565 
+				if ($limit) {
566 
+					$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 registration_count DESC LIMIT 10 OFFSET 0";
567 
+				} else {
568 
+					$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 registration_count DESC";
569 
+				}
472 570 
 				try {
473 571 
 					$sth = $this->db->prepare($query);
474 572 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -476,7 +574,9 @@  discard block
 
 block discarded – undo
476 574 
 					echo "error : ".$e->getMessage();
477 575 
 				}
478 576 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
479 
-			} else $all = array();
577 
+			} else {
578 
+				$all = array();
579 
+			}
480 580 
 		}
481 581 
 		if (empty($all)) {
482 582 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -495,7 +595,9 @@  discard block
 
 block discarded – undo
495 595 
 	}
496 596 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
497 597 
 		global $globalStatsFilters;
498 
-		if ($filter_name == '') $filter_name = $this->filter_name;
598 
+		if ($filter_name == '') {
599 
+			$filter_name = $this->filter_name;
600 
+		}
499 601 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
500 602 
 			$Spotter = new Spotter($this->db);
501 603 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -504,8 +606,11 @@  discard block
 
 block discarded – undo
504 606 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
505 607 
 			}
506 608 
 			if ($year == '' && $month == '') {
507 
-				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";
508 
-				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";
609 
+				if ($limit) {
610 
+					$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";
611 
+				} else {
612 
+					$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";
613 
+				}
509 614 
 				 try {
510 615 
 					$sth = $this->db->prepare($query);
511 616 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -513,11 +618,16 @@  discard block
 
 block discarded – undo
513 618 
 					echo "error : ".$e->getMessage();
514 619 
 				}
515 620 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
516 
-			} else $all = array();
621 
+			} else {
622 
+				$all = array();
623 
+			}
517 624 
 		} else {
518 625 
 			if ($year == '' && $month == '') {
519 
-				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";
520 
-				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";
626 
+				if ($limit) {
627 
+					$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";
628 
+				} else {
629 
+					$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";
630 
+				}
521 631 
 				 try {
522 632 
 					$sth = $this->db->prepare($query);
523 633 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -525,7 +635,9 @@  discard block
 
 block discarded – undo
525 635 
 					echo "error : ".$e->getMessage();
526 636 
 				}
527 637 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
528 
-			} else $all = array();
638 
+			} else {
639 
+				$all = array();
640 
+			}
529 641 
 		}
530 642 
 		if (empty($all)) {
531 643 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -544,7 +656,9 @@  discard block
 
 block discarded – undo
544 656 
 	}
545 657 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
546 658 
 		$Connection = new Connection($this->db);
547 
-		if ($filter_name == '') $filter_name = $this->filter_name;
659 
+		if ($filter_name == '') {
660 
+			$filter_name = $this->filter_name;
661 
+		}
548 662 
 		if ($Connection->tableExists('countries')) {
549 663 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
550 664 
 				$Spotter = new Spotter($this->db);
 
@@ -554,8 +668,11 @@  discard block
 
 block discarded – undo
554 668 
 					foreach ($airlines as $airline) {
555 669 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
556 670 
 					}
557 
-					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";
558 
-					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";
671 
+					if ($limit) {
672 
+						$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";
673 
+					} else {
674 
+						$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";
675 
+					}
559 676 
 					 try {
560 677 
 						$sth = $this->db->prepare($query);
561 678 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -564,11 +681,16 @@  discard block
 
 block discarded – undo
564 681 
 					}
565 682 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
566 683 
 					return $all;
567 
-				} else return array();
684 
+				} else {
685 
+					return array();
686 
+				}
568 687 
 			} else {
569 688 
 				if ($year == '' && $month == '') {
570 
-					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";
571 
-					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";
689 
+					if ($limit) {
690 
+						$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";
691 
+					} else {
692 
+						$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";
693 
+					}
572 694 
 					 try {
573 695 
 						$sth = $this->db->prepare($query);
574 696 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -577,20 +699,29 @@  discard block
 
 block discarded – undo
577 699 
 					}
578 700 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
579 701 
 					return $all;
580 
-				} else return array();
702 
+				} else {
703 
+					return array();
704 
+				}
581 705 
 			}
582 706 
 			$Spotter = new Spotter($this->db);
583 707 
 			return $Spotter->countAllFlightOverCountries($limit);
584 
-		} else return array();
708 
+		} else {
709 
+			return array();
710 
+		}
585 711 
 	}
586 712 
 	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
587 713 
 		$Connection = new Connection($this->db);
588 
-		if ($filter_name == '') $filter_name = $this->filter_name;
714 
+		if ($filter_name == '') {
715 
+			$filter_name = $this->filter_name;
716 
+		}
589 717 
 		if ($Connection->tableExists('countries')) {
590 718 
 			$all = array();
591 719 
 			if ($year == '' && $month == '') {
592 
-				if ($limit) $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
593 
-				else $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
720 
+				if ($limit) {
721 
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
722 
+				} else {
723 
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
724 
+				}
594 725 
 				 try {
595 726 
 					$sth = $this->db->prepare($query);
596 727 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -608,17 +739,24 @@  discard block
 
 block discarded – undo
608 739 
 				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
609 740 
 			}
610 741 
 			return $all;
611 
-		} else return array();
742 
+		} else {
743 
+			return array();
744 
+		}
612 745 
 	}
613 746 
 	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
614 747 
 		global $globalStatsFilters;
615 748 
 		$Connection = new Connection($this->db);
616 
-		if ($filter_name == '') $filter_name = $this->filter_name;
749 
+		if ($filter_name == '') {
750 
+			$filter_name = $this->filter_name;
751 
+		}
617 752 
 		if ($Connection->tableExists('countries')) {
618 753 
 			$all = array();
619 754 
 			if ($year == '' && $month == '') {
620 
-				if ($limit) $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
621 
-				else $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
755 
+				if ($limit) {
756 
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
757 
+				} else {
758 
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
759 
+				}
622 760 
 				 try {
623 761 
 					$sth = $this->db->prepare($query);
624 762 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -637,14 +775,21 @@  discard block
 
 block discarded – undo
637 775 
 				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
638 776 
 			}
639 777 
 			return $all;
640 
-		} else return array();
778 
+		} else {
779 
+			return array();
780 
+		}
641 781 
 	}
642 782 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
643 783 
 		global $globalStatsFilters;
644 
-		if ($filter_name == '') $filter_name = $this->filter_name;
784 
+		if ($filter_name == '') {
785 
+			$filter_name = $this->filter_name;
786 
+		}
645 787 
 		if ($year == '' && $month == '') {
646 
-			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";
647 
-			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";
788 
+			if ($limit) {
789 
+				$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";
790 
+			} else {
791 
+				$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";
792 
+			}
648 793 
 			try {
649 794 
 				$sth = $this->db->prepare($query);
650 795 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -652,7 +797,9 @@  discard block
 
 block discarded – undo
652 797 
 				echo "error : ".$e->getMessage();
653 798 
 			}
654 799 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
655 
-		} else $all = array();
800 
+		} else {
801 
+			$all = array();
802 
+		}
656 803 
 		if (empty($all)) {
657 804 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
658 805 
 			if ($filter_name != '') {
 
@@ -667,7 +814,9 @@  discard block
 
 block discarded – undo
667 814
668 815 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
669 816 
 		global $globalStatsFilters;
670 
-		if ($filter_name == '') $filter_name = $this->filter_name;
817 
+		if ($filter_name == '') {
818 
+			$filter_name = $this->filter_name;
819 
+		}
671 820 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
672 821 
 			$Spotter = new Spotter($this->db);
673 822 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -676,8 +825,11 @@  discard block
 
 block discarded – undo
676 825 
 				foreach ($airlines as $airline) {
677 826 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
678 827 
 				}
679 
-				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";
680 
-				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";
828 
+				if ($limit) {
829 
+					$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";
830 
+				} else {
831 
+					$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";
832 
+				}
681 833 
 				try {
682 834 
 					$sth = $this->db->prepare($query);
683 835 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -685,11 +837,16 @@  discard block
 
 block discarded – undo
685 837 
 					echo "error : ".$e->getMessage();
686 838 
 				}
687 839 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
688 
-			} else $all = array();
840 
+			} else {
841 
+				$all = array();
842 
+			}
689 843 
 		} else {
690 844 
 			if ($year == '' && $month == '') {
691 
-				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";
692 
-				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";
845 
+				if ($limit) {
846 
+					$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";
847 
+				} else {
848 
+					$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";
849 
+				}
693 850 
 				try {
694 851 
 					$sth = $this->db->prepare($query);
695 852 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -697,7 +854,9 @@  discard block
 
 block discarded – undo
697 854 
 					echo "error : ".$e->getMessage();
698 855 
 				}
699 856 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
700 
-			} else $all = array();
857 
+			} else {
858 
+				$all = array();
859 
+			}
701 860 
 		}
702 861 
 		if (empty($all)) {
703 862 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -716,7 +875,9 @@  discard block
 
 block discarded – undo
716 875 
 	}
717 876 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
718 877 
 		global $globalStatsFilters;
719 
-		if ($filter_name == '') $filter_name = $this->filter_name;
878 
+		if ($filter_name == '') {
879 
+			$filter_name = $this->filter_name;
880 
+		}
720 881 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
721 882 
 			$Spotter = new Spotter($this->db);
722 883 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -725,8 +886,11 @@  discard block
 
 block discarded – undo
725 886 
 				foreach ($airlines as $airline) {
726 887 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
727 888 
 				}
728 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
729 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
889 
+				if ($limit) {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
891 
+				} else {
892 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
893 
+				}
730 894 
 				try {
731 895 
 					$sth = $this->db->prepare($query);
732 896 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -734,11 +898,16 @@  discard block
 
 block discarded – undo
734 898 
 					echo "error : ".$e->getMessage();
735 899 
 				}
736 900 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
737 
-			} else $all = array();
901 
+			} else {
902 
+				$all = array();
903 
+			}
738 904 
 		} else {
739 905 
 			if ($year == '' && $month == '') {
740 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
741 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
906 
+				if ($limit) {
907 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
908 
+				} else {
909 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
910 
+				}
742 911 
 				try {
743 912 
 					$sth = $this->db->prepare($query);
744 913 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -746,7 +915,9 @@  discard block
 
 block discarded – undo
746 915 
 					echo "error : ".$e->getMessage();
747 916 
 				}
748 917 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
749 
-			} else $all = array();
918 
+			} else {
919 
+				$all = array();
920 
+			}
750 921 
 		}
751 922 
 		if (empty($all)) {
752 923 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -771,7 +942,9 @@  discard block
 
 block discarded – undo
771 942 
 				$icao = $value['airport_departure_icao'];
772 943 
 				if (isset($all[$icao])) {
773 944 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
774 
-				} else $all[$icao] = $value;
945 
+				} else {
946 
+					$all[$icao] = $value;
947 
+				}
775 948 
 			}
776 949 
 			$count = array();
777 950 
 			foreach ($all as $key => $row) {
 
@@ -783,7 +956,9 @@  discard block
 
 block discarded – undo
783 956 
 	}
784 957 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
785 958 
 		global $globalStatsFilters;
786 
-		if ($filter_name == '') $filter_name = $this->filter_name;
959 
+		if ($filter_name == '') {
960 
+			$filter_name = $this->filter_name;
961 
+		}
787 962 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
788 963 
 			$Spotter = new Spotter($this->db);
789 964 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -792,8 +967,11 @@  discard block
 
 block discarded – undo
792 967 
 				foreach ($airlines as $airline) {
793 968 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
794 969 
 				}
795 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
796 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
970 
+				if ($limit) {
971 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
972 
+				} else {
973 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
974 
+				}
797 975 
 				try {
798 976 
 					$sth = $this->db->prepare($query);
799 977 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -801,11 +979,16 @@  discard block
 
 block discarded – undo
801 979 
 					echo "error : ".$e->getMessage();
802 980 
 				}
803 981 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
804 
-			} else $all = array();
982 
+			} else {
983 
+				$all = array();
984 
+			}
805 985 
 		} else {
806 986 
 			if ($year == '' && $month == '') {
807 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
808 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
987 
+				if ($limit) {
988 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
989 
+				} else {
990 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
991 
+				}
809 992 
 				try {
810 993 
 					$sth = $this->db->prepare($query);
811 994 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -813,7 +996,9 @@  discard block
 
 block discarded – undo
813 996 
 					echo "error : ".$e->getMessage();
814 997 
 				}
815 998 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
816 
-			} else $all = array();
999 
+			} else {
1000 
+				$all = array();
1001 
+			}
817 1002 
 		}
818 1003 
 		if (empty($all)) {
819 1004 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -838,7 +1023,9 @@  discard block
 
 block discarded – undo
838 1023 
 				$icao = $value['airport_arrival_icao'];
839 1024 
 				if (isset($all[$icao])) {
840 1025 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
841 
-				} else $all[$icao] = $value;
1026 
+				} else {
1027 
+					$all[$icao] = $value;
1028 
+				}
842 1029 
 			}
843 1030 
 			$count = array();
844 1031 
 			foreach ($all as $key => $row) {
 
@@ -850,7 +1037,9 @@  discard block
 
 block discarded – undo
850 1037 
 	}
851 1038 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
852 1039 
 		global $globalDBdriver, $globalStatsFilters;
853 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1040 
+		if ($filter_name == '') {
1041 
+			$filter_name = $this->filter_name;
1042 
+		}
854 1043 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
855 1044 
 			$Spotter = new Spotter($this->db);
856 1045 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -859,20 +1048,32 @@  discard block
 
 block discarded – undo
859 1048 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
860 1049 
 			}
861 1050 
 			if ($globalDBdriver == 'mysql') {
862 
-				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";
863 
-				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";
1051 
+				if ($limit) {
1052 
+					$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";
1053 
+				} else {
1054 
+					$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";
1055 
+				}
864 1056 
 			} else {
865 
-				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";
866 
-				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";
1057 
+				if ($limit) {
1058 
+					$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";
1059 
+				} else {
1060 
+					$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";
1061 
+				}
867 1062 
 			}
868 1063 
 			$query_data = array(':filter_name' => $filter_name);
869 1064 
 		} else {
870 1065 
 			if ($globalDBdriver == 'mysql') {
871 
-				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";
872 
-				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";
1066 
+				if ($limit) {
1067 
+					$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";
1068 
+				} else {
1069 
+					$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";
1070 
+				}
873 1071 
 			} else {
874 
-				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";
875 
-				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";
1072 
+				if ($limit) {
1073 
+					$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";
1074 
+				} else {
1075 
+					$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";
1076 
+				}
876 1077 
 			}
877 1078 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
878 1079 
 		}
 
@@ -900,13 +1101,21 @@  discard block
 
 block discarded – undo
900 1101
901 1102 
 	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
902 1103 
 		global $globalDBdriver, $globalStatsFilters;
903 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1104 
+		if ($filter_name == '') {
1105 
+			$filter_name = $this->filter_name;
1106 
+		}
904 1107 
 		if ($globalDBdriver == 'mysql') {
905 
-			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 = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
906 
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1108 
+			if ($limit) {
1109 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
1110 
+			} else {
1111 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
1112 
+			}
907 1113 
 		} else {
908 
-			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 = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
909 
-			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 = 'marine_bymonth' AND filter_name = :filter_name";
1114 
+			if ($limit) {
1115 
+				$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 = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
1116 
+			} else {
1117 
+				$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 = 'marine_bymonth' AND filter_name = :filter_name";
1118 
+			}
910 1119 
 		}
911 1120 
 		$query_data = array(':filter_name' => $filter_name);
912 1121 
 		try {
 
@@ -929,13 +1138,21 @@  discard block
 
 block discarded – undo
929 1138
930 1139 
 	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
931 1140 
 		global $globalDBdriver, $globalStatsFilters;
932 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1141 
+		if ($filter_name == '') {
1142 
+			$filter_name = $this->filter_name;
1143 
+		}
933 1144 
 		if ($globalDBdriver == 'mysql') {
934 
-			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 = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
935 
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1145 
+			if ($limit) {
1146 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
1147 
+			} else {
1148 
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
1149 
+			}
936 1150 
 		} else {
937 
-			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 = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
938 
-			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 = 'tracker_bymonth' AND filter_name = :filter_name";
1151 
+			if ($limit) {
1152 
+				$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 = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
1153 
+			} else {
1154 
+				$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 = 'tracker_bymonth' AND filter_name = :filter_name";
1155 
+			}
939 1156 
 		}
940 1157 
 		$query_data = array(':filter_name' => $filter_name);
941 1158 
 		try {
 
@@ -958,7 +1175,9 @@  discard block
 
 block discarded – undo
958 1175
959 1176 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
960 1177 
 		global $globalStatsFilters;
961 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1178 
+		if ($filter_name == '') {
1179 
+			$filter_name = $this->filter_name;
1180 
+		}
962 1181 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
963 1182 
 			$Spotter = new Spotter($this->db);
964 1183 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -995,7 +1214,9 @@  discard block
 
 block discarded – undo
995 1214 
 	}
996 1215 
 	public function countAllMarineDatesLastMonth($filter_name = '') {
997 1216 
 		global $globalStatsFilters;
998 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1217 
+		if ($filter_name == '') {
1218 
+			$filter_name = $this->filter_name;
1219 
+		}
999 1220 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND filter_name = :filter_name";
1000 1221 
 		$query_data = array(':filter_name' => $filter_name);
1001 1222 
 		try {
 
@@ -1017,7 +1238,9 @@  discard block
 
 block discarded – undo
1017 1238 
 	}
1018 1239 
 	public function countAllTrackerDatesLastMonth($filter_name = '') {
1019 1240 
 		global $globalStatsFilters;
1020 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1241 
+		if ($filter_name == '') {
1242 
+			$filter_name = $this->filter_name;
1243 
+		}
1021 1244 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND filter_name = :filter_name";
1022 1245 
 		$query_data = array(':filter_name' => $filter_name);
1023 1246 
 		try {
 
@@ -1039,7 +1262,9 @@  discard block
 
 block discarded – undo
1039 1262 
 	}
1040 1263 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1041 1264 
 		global $globalDBdriver, $globalStatsFilters;
1042 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1265 
+		if ($filter_name == '') {
1266 
+			$filter_name = $this->filter_name;
1267 
+		}
1043 1268 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1044 1269 
 			$Spotter = new Spotter($this->db);
1045 1270 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1084,7 +1309,9 @@  discard block
 
 block discarded – undo
1084 1309 
 	}
1085 1310 
 	public function countAllMarineDatesLast7Days($filter_name = '') {
1086 1311 
 		global $globalDBdriver, $globalStatsFilters;
1087 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1312 
+		if ($filter_name == '') {
1313 
+			$filter_name = $this->filter_name;
1314 
+		}
1088 1315 
 		if ($globalDBdriver == 'mysql') {
1089 1316 
 			$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND marine_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
1090 1317 
 		} else {
 
@@ -1110,7 +1337,9 @@  discard block
 
 block discarded – undo
1110 1337 
 	}
1111 1338 
 	public function countAllTrackerDatesLast7Days($filter_name = '') {
1112 1339 
 		global $globalDBdriver, $globalStatsFilters;
1113 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1340 
+		if ($filter_name == '') {
1341 
+			$filter_name = $this->filter_name;
1342 
+		}
1114 1343 
 		if ($globalDBdriver == 'mysql') {
1115 1344 
 			$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND tracker_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
1116 1345 
 		} else {
 
@@ -1136,7 +1365,9 @@  discard block
 
 block discarded – undo
1136 1365 
 	}
1137 1366 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
1138 1367 
 		global $globalStatsFilters;
1139 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1368 
+		if ($filter_name == '') {
1369 
+			$filter_name = $this->filter_name;
1370 
+		}
1140 1371 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1141 1372 
 			$Spotter = new Spotter($this->db);
1142 1373 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1173,7 +1404,9 @@  discard block
 
 block discarded – undo
1173 1404 
 	}
1174 1405 
 	public function countAllDatesMarine($filter_name = '') {
1175 1406 
 		global $globalStatsFilters;
1176 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1407 
+		if ($filter_name == '') {
1408 
+			$filter_name = $this->filter_name;
1409 
+		}
1177 1410 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
1178 1411 
 		$query_data = array(':filter_name' => $filter_name);
1179 1412 
 		try {
 
@@ -1195,7 +1428,9 @@  discard block
 
 block discarded – undo
1195 1428 
 	}
1196 1429 
 	public function countAllDatesTracker($filter_name = '') {
1197 1430 
 		global $globalStatsFilters;
1198 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1431 
+		if ($filter_name == '') {
1432 
+			$filter_name = $this->filter_name;
1433 
+		}
1199 1434 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
1200 1435 
 		$query_data = array(':filter_name' => $filter_name);
1201 1436 
 		try {
 
@@ -1217,7 +1452,9 @@  discard block
 
 block discarded – undo
1217 1452 
 	}
1218 1453 
 	public function countAllDatesByAirlines($filter_name = '') {
1219 1454 
 		global $globalStatsFilters;
1220 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1455 
+		if ($filter_name == '') {
1456 
+			$filter_name = $this->filter_name;
1457 
+		}
1221 1458 
 		$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";
1222 1459 
 		$query_data = array('filter_name' => $filter_name);
1223 1460 
 		try {
 
@@ -1239,7 +1476,9 @@  discard block
 
 block discarded – undo
1239 1476 
 	}
1240 1477 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
1241 1478 
 		global $globalStatsFilters, $globalDBdriver;
1242 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1479 
+		if ($filter_name == '') {
1480 
+			$filter_name = $this->filter_name;
1481 
+		}
1243 1482 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1244 1483 
 			$Spotter = new Spotter($this->db);
1245 1484 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1324,7 +1563,9 @@  discard block
 
 block discarded – undo
1324 1563 
 	}
1325 1564 
 	public function countAllMilitaryMonths($filter_name = '') {
1326 1565 
 		global $globalStatsFilters;
1327 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1566 
+		if ($filter_name == '') {
1567 
+			$filter_name = $this->filter_name;
1568 
+		}
1328 1569 
 		$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";
1329 1570 
 		try {
1330 1571 
 			$sth = $this->db->prepare($query);
 
@@ -1345,7 +1586,9 @@  discard block
 
 block discarded – undo
1345 1586 
 	}
1346 1587 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1347 1588 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1348 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1589 
+		if ($filter_name == '') {
1590 
+			$filter_name = $this->filter_name;
1591 
+		}
1349 1592 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1350 1593 
 			$Spotter = new Spotter($this->db);
1351 1594 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1353,12 +1596,18 @@  discard block
 
 block discarded – undo
1353 1596 
 			foreach ($airlines as $airline) {
1354 1597 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1355 1598 
 			}
1356 
-			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";
1357 
-			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";
1599 
+			if ($limit) {
1600 
+				$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";
1601 
+			} else {
1602 
+				$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";
1603 
+			}
1358 1604 
 			$query_data = array(':filter_name' => $filter_name);
1359 1605 
 		} else {
1360 
-			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";
1361 
-			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";
1606 
+			if ($limit) {
1607 
+				$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";
1608 
+			} else {
1609 
+				$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";
1610 
+			}
1362 1611 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1612 
 		}
1364 1613 
 		if ($orderby == 'hour') {
 
@@ -1368,7 +1617,9 @@  discard block
 
 block discarded – undo
1368 1617 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1369 1618 
 			}
1370 1619 
 		}
1371 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1620 
+		if ($orderby == 'count') {
1621 
+			$query .= " ORDER BY hour_count DESC";
1622 
+		}
1372 1623 
 		try {
1373 1624 
 			$sth = $this->db->prepare($query);
1374 1625 
 			$sth->execute($query_data);
 
@@ -1392,9 +1643,14 @@  discard block
 
 block discarded – undo
1392 1643 
 	}
1393 1644 
 	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1394 1645 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1395 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1396 
-		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1397 
-		else $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1646 
+		if ($filter_name == '') {
1647 
+			$filter_name = $this->filter_name;
1648 
+		}
1649 
+		if ($limit) {
1650 
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1651 
+		} else {
1652 
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
1653 
+		}
1398 1654 
 		$query_data = array(':filter_name' => $filter_name);
1399 1655 
 		if ($orderby == 'hour') {
1400 1656 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1403,7 +1659,9 @@  discard block
 
 block discarded – undo
1403 1659 
 				$query .= " ORDER BY CAST(marine_date AS integer) ASC";
1404 1660 
 			}
1405 1661 
 		}
1406 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1662 
+		if ($orderby == 'count') {
1663 
+			$query .= " ORDER BY hour_count DESC";
1664 
+		}
1407 1665 
 		try {
1408 1666 
 			$sth = $this->db->prepare($query);
1409 1667 
 			$sth->execute($query_data);
 
@@ -1423,9 +1681,14 @@  discard block
 
 block discarded – undo
1423 1681 
 	}
1424 1682 
 	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1425 1683 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1426 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1427 
-		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1428 
-		else $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1684 
+		if ($filter_name == '') {
1685 
+			$filter_name = $this->filter_name;
1686 
+		}
1687 
+		if ($limit) {
1688 
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1689 
+		} else {
1690 
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
1691 
+		}
1429 1692 
 		$query_data = array(':filter_name' => $filter_name);
1430 1693 
 		if ($orderby == 'hour') {
1431 1694 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1434,7 +1697,9 @@  discard block
 
 block discarded – undo
1434 1697 
 				$query .= " ORDER BY CAST(tracker_date AS integer) ASC";
1435 1698 
 			}
1436 1699 
 		}
1437 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1700 
+		if ($orderby == 'count') {
1701 
+			$query .= " ORDER BY hour_count DESC";
1702 
+		}
1438 1703 
 		try {
1439 1704 
 			$sth = $this->db->prepare($query);
1440 1705 
 			$sth->execute($query_data);
 
@@ -1454,8 +1719,12 @@  discard block
 
 block discarded – undo
1454 1719 
 	}
1455 1720 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1456 1721 
 		global $globalStatsFilters;
1457 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1458 
-		if ($year == '') $year = date('Y');
1722 
+		if ($filter_name == '') {
1723 
+			$filter_name = $this->filter_name;
1724 
+		}
1725 
+		if ($year == '') {
1726 
+			$year = date('Y');
1727 
+		}
1459 1728 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1460 1729 
 		if (empty($all)) {
1461 1730 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1474,8 +1743,12 @@  discard block
 
 block discarded – undo
1474 1743 
 	}
1475 1744 
 	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1476 1745 
 		global $globalStatsFilters;
1477 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1478 
-		if ($year == '') $year = date('Y');
1746 
+		if ($filter_name == '') {
1747 
+			$filter_name = $this->filter_name;
1748 
+		}
1749 
+		if ($year == '') {
1750 
+			$year = date('Y');
1751 
+		}
1479 1752 
 		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1480 1753 
 		if (empty($all)) {
1481 1754 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1490,8 +1763,12 @@  discard block
 
 block discarded – undo
1490 1763 
 	}
1491 1764 
 	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1492 1765 
 		global $globalStatsFilters;
1493 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1494 
-		if ($year == '') $year = date('Y');
1766 
+		if ($filter_name == '') {
1767 
+			$filter_name = $this->filter_name;
1768 
+		}
1769 
+		if ($year == '') {
1770 
+			$year = date('Y');
1771 
+		}
1495 1772 
 		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1496 1773 
 		if (empty($all)) {
1497 1774 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1506,8 +1783,12 @@  discard block
 
 block discarded – undo
1506 1783 
 	}
1507 1784 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1508 1785 
 		global $globalStatsFilters;
1509 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1510 
-		if ($year == '') $year = date('Y');
1786 
+		if ($filter_name == '') {
1787 
+			$filter_name = $this->filter_name;
1788 
+		}
1789 
+		if ($year == '') {
1790 
+			$year = date('Y');
1791 
+		}
1511 1792 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1512 1793 
 		if (empty($all)) {
1513 1794 
 			$filters = array();
 
@@ -1523,8 +1804,12 @@  discard block
 
 block discarded – undo
1523 1804 
 	}
1524 1805 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1525 1806 
 		global $globalStatsFilters;
1526 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1527 
-		if ($year == '') $year = date('Y');
1807 
+		if ($filter_name == '') {
1808 
+			$filter_name = $this->filter_name;
1809 
+		}
1810 
+		if ($year == '') {
1811 
+			$year = date('Y');
1812 
+		}
1528 1813 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1529 1814 
 		if (empty($all)) {
1530 1815 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1543,7 +1828,9 @@  discard block
 
 block discarded – undo
1543 1828 
 	}
1544 1829 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1545 1830 
 		global $globalStatsFilters;
1546 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1831 
+		if ($filter_name == '') {
1832 
+			$filter_name = $this->filter_name;
1833 
+		}
1547 1834 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1548 1835 
 			$Spotter = new Spotter($this->db);
1549 1836 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1561,7 +1848,9 @@  discard block
 
 block discarded – undo
1561 1848 
 				}
1562 1849 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1563 1850 
 				$all = $result[0]['nb'];
1564 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1851 
+			} else {
1852 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1853 
+			}
1565 1854 
 		} else {
1566 1855 
 			if ($year == '' && $month == '') {
1567 1856 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1573,7 +1862,9 @@  discard block
 
 block discarded – undo
1573 1862 
 				}
1574 1863 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1575 1864 
 				$all = $result[0]['nb'];
1576 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1865 
+			} else {
1866 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1867 
+			}
1577 1868 
 		}
1578 1869 
 		if (empty($all)) {
1579 1870 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1592,7 +1883,9 @@  discard block
 
 block discarded – undo
1592 1883 
 	}
1593 1884 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1594 1885 
 		global $globalStatsFilters;
1595 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1886 
+		if ($filter_name == '') {
1887 
+			$filter_name = $this->filter_name;
1888 
+		}
1596 1889 
 		if ($year == '' && $month == '') {
1597 1890 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1598 1891 
 			try {
 
@@ -1603,7 +1896,9 @@  discard block
 
 block discarded – undo
1603 1896 
 			}
1604 1897 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1605 1898 
 			$all = $result[0]['nb_airline'];
1606 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1899 
+		} else {
1900 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1901 
+		}
1607 1902 
 		if (empty($all)) {
1608 1903 
 			$filters = array();
1609 1904 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1618,7 +1913,9 @@  discard block
 
 block discarded – undo
1618 1913 
 	}
1619 1914 
 	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1620 1915 
 		global $globalStatsFilters;
1621 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1916 
+		if ($filter_name == '') {
1917 
+			$filter_name = $this->filter_name;
1918 
+		}
1622 1919 
 		$all = array();
1623 1920 
 		if ($year == '' && $month == '') {
1624 1921 
 			$query = "SELECT COUNT(*) AS nb_type FROM stats_marine_type WHERE filter_name = :filter_name";
 
@@ -1645,7 +1942,9 @@  discard block
 
 block discarded – undo
1645 1942 
 	}
1646 1943 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1647 1944 
 		global $globalStatsFilters;
1648 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1945 
+		if ($filter_name == '') {
1946 
+			$filter_name = $this->filter_name;
1947 
+		}
1649 1948 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1650 1949 
 			$Spotter = new Spotter($this->db);
1651 1950 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1700,7 +1999,9 @@  discard block
 
 block discarded – undo
1700 1999 
 	}
1701 2000 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1702 2001 
 		global $globalStatsFilters;
1703 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2002 
+		if ($filter_name == '') {
2003 
+			$filter_name = $this->filter_name;
2004 
+		}
1704 2005 
 		//if ($year == '') $year = date('Y');
1705 2006 
 		if ($year == '' && $month == '') {
1706 2007 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1729,7 +2030,9 @@  discard block
 
 block discarded – undo
1729 2030 
 	}
1730 2031
1731 2032 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1732 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2033 
+		if ($filter_name == '') {
2034 
+			$filter_name = $this->filter_name;
2035 
+		}
1733 2036 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1734 2037 
 			$Spotter = new Spotter($this->db);
1735 2038 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1753,7 +2056,9 @@  discard block
 
 block discarded – undo
1753 2056 
 		return $all;
1754 2057 
 	}
1755 2058 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1756 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2059 
+		if ($filter_name == '') {
2060 
+			$filter_name = $this->filter_name;
2061 
+		}
1757 2062 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1758 2063 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1759 2064 
 		try {
 
@@ -1766,7 +2071,9 @@  discard block
 
 block discarded – undo
1766 2071 
 		return $all;
1767 2072 
 	}
1768 2073 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1769 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2074 
+		if ($filter_name == '') {
2075 
+			$filter_name = $this->filter_name;
2076 
+		}
1770 2077 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1771 2078 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1772 2079 
 		try {
 
@@ -1777,7 +2084,9 @@  discard block
 
 block discarded – undo
1777 2084 
 		}
1778 2085 
 	}
1779 2086 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1780 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2087 
+		if ($filter_name == '') {
2088 
+			$filter_name = $this->filter_name;
2089 
+		}
1781 2090 
 		global $globalArchiveMonths, $globalDBdriver;
1782 2091 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1783 2092 
 			$Spotter = new Spotter($this->db);
 
@@ -1833,7 +2142,9 @@  discard block
 
 block discarded – undo
1833 2142 
 	}
1834 2143 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1835 2144 
 		global $globalArchiveMonths, $globalDBdriver;
1836 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2145 
+		if ($filter_name == '') {
2146 
+			$filter_name = $this->filter_name;
2147 
+		}
1837 2148 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1838 2149 
 			$Spotter = new Spotter($this->db);
1839 2150 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1866,7 +2177,9 @@  discard block
 
 block discarded – undo
1866 2177 
 	}
1867 2178 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1868 2179 
 		global $globalArchiveMonths, $globalDBdriver;
1869 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2180 
+		if ($filter_name == '') {
2181 
+			$filter_name = $this->filter_name;
2182 
+		}
1870 2183 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1871 2184 
 			$Spotter = new Spotter($this->db);
1872 2185 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1897,7 +2210,9 @@  discard block
 
 block discarded – undo
1897 2210 
 	}
1898 2211 
 	public function getStatsAirlineTotal($filter_name = '') {
1899 2212 
 		global $globalArchiveMonths, $globalDBdriver;
1900 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2213 
+		if ($filter_name == '') {
2214 
+			$filter_name = $this->filter_name;
2215 
+		}
1901 2216 
 		if ($globalDBdriver == 'mysql') {
1902 2217 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1903 2218 
 		} else {
 
@@ -1914,7 +2229,9 @@  discard block
 
 block discarded – undo
1914 2229 
 	}
1915 2230 
 	public function getStatsOwnerTotal($filter_name = '') {
1916 2231 
 		global $globalArchiveMonths, $globalDBdriver;
1917 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2232 
+		if ($filter_name == '') {
2233 
+			$filter_name = $this->filter_name;
2234 
+		}
1918 2235 
 		if ($globalDBdriver == 'mysql') {
1919 2236 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1920 2237 
 		} else {
 
@@ -1931,7 +2248,9 @@  discard block
 
 block discarded – undo
1931 2248 
 	}
1932 2249 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1933 2250 
 		global $globalArchiveMonths, $globalDBdriver;
1934 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2251 
+		if ($filter_name == '') {
2252 
+			$filter_name = $this->filter_name;
2253 
+		}
1935 2254 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1936 2255 
 		try {
1937 2256 
 			$sth = $this->db->prepare($query);
 
@@ -1940,12 +2259,17 @@  discard block
 
 block discarded – undo
1940 2259 
 			echo "error : ".$e->getMessage();
1941 2260 
 		}
1942 2261 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1943 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1944 
-		else return 0;
2262 
+		if (isset($all[0]['cnt'])) {
2263 
+			return $all[0]['cnt'];
2264 
+		} else {
2265 
+			return 0;
2266 
+		}
1945 2267 
 	}
1946 2268 
 	public function getStatsPilotTotal($filter_name = '') {
1947 2269 
 		global $globalArchiveMonths, $globalDBdriver;
1948 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2270 
+		if ($filter_name == '') {
2271 
+			$filter_name = $this->filter_name;
2272 
+		}
1949 2273 
 		if ($globalDBdriver == 'mysql') {
1950 2274 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1951 2275 
 		} else {
 
@@ -1962,7 +2286,9 @@  discard block
 
 block discarded – undo
1962 2286 
 	}
1963 2287 
 	public function getStatsPilot($pilot,$filter_name = '') {
1964 2288 
 		global $globalArchiveMonths, $globalDBdriver;
1965 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2289 
+		if ($filter_name == '') {
2290 
+			$filter_name = $this->filter_name;
2291 
+		}
1966 2292 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1967 2293 
 		try {
1968 2294 
 			$sth = $this->db->prepare($query);
 
@@ -1971,13 +2297,18 @@  discard block
 
 block discarded – undo
1971 2297 
 			echo "error : ".$e->getMessage();
1972 2298 
 		}
1973 2299 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1974 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1975 
-		else return 0;
2300 
+		if (isset($all[0]['cnt'])) {
2301 
+			return $all[0]['cnt'];
2302 
+		} else {
2303 
+			return 0;
2304 
+		}
1976 2305 
 	}
1977 2306
1978 2307 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1979 2308 
 		global $globalDBdriver;
1980 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2309 
+		if ($filter_name == '') {
2310 
+			$filter_name = $this->filter_name;
2311 
+		}
1981 2312 
 		if ($globalDBdriver == 'mysql') {
1982 2313 
 			$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";
1983 2314 
 		} else {
 
@@ -1993,7 +2324,9 @@  discard block
 
 block discarded – undo
1993 2324 
 	}
1994 2325 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1995 2326 
 		global $globalDBdriver;
1996 
-		if ($filter_name == '') $filter_name = $this->filter_name;
2327 
+		if ($filter_name == '') {
2328 
+			$filter_name = $this->filter_name;
2329 
+		}
1997 2330 
 		if ($globalDBdriver == 'mysql') {
1998 2331 
 			$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";
1999 2332 
 		} else {
 
@@ -2512,27 +2845,37 @@  discard block
 
 block discarded – undo
2512 2845 
 		date_default_timezone_set('UTC');
2513 2846 
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
2514 2847 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
2515 
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
2848 
+			if ($globalDebug) {
2849 
+				echo '!!! Update Marine stats !!!'."\n";
2850 
+			}
2516 2851 
 			if (isset($last_update[0]['value'])) {
2517 2852 
 				$last_update_day = $last_update[0]['value'];
2518 
-			} else $last_update_day = '2012-12-12 12:12:12';
2853 
+			} else {
2854 
+				$last_update_day = '2012-12-12 12:12:12';
2855 
+			}
2519 2856 
 			$reset = false;
2520 2857 
 			$Marine = new Marine($this->db);
2521 2858 
 			$filtername = 'marine';
2522 2859 
 			if ($Connection->tableExists('countries')) {
2523 
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2860 
+				if ($globalDebug) {
2861 
+					echo 'Count all vessels by countries...'."\n";
2862 
+				}
2524 2863 
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2525 2864 
 				foreach ($alldata as $number) {
2526 2865 
 					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2527 2866 
 				}
2528 2867 
 			}
2529 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2868 
+			if ($globalDebug) {
2869 
+				echo 'Count all vessels by months...'."\n";
2870 
+			}
2530 2871 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2531 2872 
 			$filter_last_month = array('since_date' => $last_month);
2532 2873 
 			$alldata = $Marine->countAllMonths($filter_last_month);
2533 2874 
 			$lastyear = false;
2534 2875 
 			foreach ($alldata as $number) {
2535 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2876 
+				if ($number['year_name'] != date('Y')) {
2877 
+					$lastyear = true;
2878 
+				}
2536 2879 
 				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2537 2880 
 			}
2538 2881 
 			echo 'Marine data...'."\n";
 
@@ -2562,7 +2905,9 @@  discard block
 
 block discarded – undo
2562 2905 
 			foreach ($alldata as $number) {
2563 2906 
 				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2564 2907 
 			}
2565 
-			if ($globalDebug) echo 'Count all types...'."\n";
2908 
+			if ($globalDebug) {
2909 
+				echo 'Count all types...'."\n";
2910 
+			}
2566 2911 
 			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2567 2912 
 			foreach ($alldata as $number) {
2568 2913 
 				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
 
@@ -2574,26 +2919,36 @@  discard block
 
 block discarded – undo
2574 2919 
 		}
2575 2920 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2576 2921 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
2577 
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
2922 
+			if ($globalDebug) {
2923 
+				echo '!!! Update tracker stats !!!'."\n";
2924 
+			}
2578 2925 
 			if (isset($last_update[0]['value'])) {
2579 2926 
 				$last_update_day = $last_update[0]['value'];
2580 
-			} else $last_update_day = '2012-12-12 12:12:12';
2927 
+			} else {
2928 
+				$last_update_day = '2012-12-12 12:12:12';
2929 
+			}
2581 2930 
 			$reset = false;
2582 2931 
 			$Tracker = new Tracker($this->db);
2583 2932 
 			if ($Connection->tableExists('countries')) {
2584 
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2933 
+				if ($globalDebug) {
2934 
+					echo 'Count all trackers by countries...'."\n";
2935 
+				}
2585 2936 
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2586 2937 
 				foreach ($alldata as $number) {
2587 2938 
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2588 2939 
 				}
2589 2940 
 			}
2590 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2941 
+			if ($globalDebug) {
2942 
+				echo 'Count all vessels by months...'."\n";
2943 
+			}
2591 2944 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2592 2945 
 			$filter_last_month = array('since_date' => $last_month);
2593 2946 
 			$alldata = $Tracker->countAllMonths($filter_last_month);
2594 2947 
 			$lastyear = false;
2595 2948 
 			foreach ($alldata as $number) {
2596 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2949 
+				if ($number['year_name'] != date('Y')) {
2950 
+					$lastyear = true;
2951 
+				}
2597 2952 
 				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2598 2953 
 			}
2599 2954 
 			echo 'Tracker data...'."\n";
 
@@ -2623,7 +2978,9 @@  discard block
 
 block discarded – undo
2623 2978 
 			foreach ($alldata as $number) {
2624 2979 
 				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2625 2980 
 			}
2626 
-			if ($globalDebug) echo 'Count all types...'."\n";
2981 
+			if ($globalDebug) {
2982 
+				echo 'Count all types...'."\n";
2983 
+			}
2627 2984 
 			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2628 2985 
 			foreach ($alldata as $number) {
2629 2986 
 				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
 
@@ -2635,10 +2992,14 @@  discard block
 
 block discarded – undo
2635 2992
2636 2993 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
2637 2994 
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
2638 
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
2995 
+			if ($globalDebug) {
2996 
+				echo '!!! Update aicraft stats !!!'."\n";
2997 
+			}
2639 2998 
 			if (isset($last_update[0]['value'])) {
2640 2999 
 				$last_update_day = $last_update[0]['value'];
2641 
-			} else $last_update_day = '2012-12-12 12:12:12';
3000 
+			} else {
3001 
+				$last_update_day = '2012-12-12 12:12:12';
3002 
+			}
2642 3003 
 			$reset = false;
2643 3004 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
2644 3005 
 			if ($globalStatsResetYear) {
 
@@ -2647,43 +3008,63 @@  discard block
 
 block discarded – undo
2647 3008 
 			}
2648 3009 
 			$Spotter = new Spotter($this->db);
2649 3010
2650 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
3011 
+			if ($globalDebug) {
3012 
+				echo 'Count all aircraft types...'."\n";
3013 
+			}
2651 3014 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2652 3015 
 			foreach ($alldata as $number) {
2653 3016 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2654 3017 
 			}
2655 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
3018 
+			if ($globalDebug) {
3019 
+				echo 'Count all airlines...'."\n";
3020 
+			}
2656 3021 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2657 3022 
 			foreach ($alldata as $number) {
2658 3023 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2659 3024 
 			}
2660 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
3025 
+			if ($globalDebug) {
3026 
+				echo 'Count all registrations...'."\n";
3027 
+			}
2661 3028 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2662 3029 
 			foreach ($alldata as $number) {
2663 3030 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2664 3031 
 			}
2665 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
3032 
+			if ($globalDebug) {
3033 
+				echo 'Count all callsigns...'."\n";
3034 
+			}
2666 3035 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2667 3036 
 			foreach ($alldata as $number) {
2668 3037 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2669 3038 
 			}
2670 
-			if ($globalDebug) echo 'Count all owners...'."\n";
3039 
+			if ($globalDebug) {
3040 
+				echo 'Count all owners...'."\n";
3041 
+			}
2671 3042 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2672 3043 
 			foreach ($alldata as $number) {
2673 3044 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2674 3045 
 			}
2675 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
3046 
+			if ($globalDebug) {
3047 
+				echo 'Count all pilots...'."\n";
3048 
+			}
2676 3049 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2677 3050 
 			foreach ($alldata as $number) {
2678 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
3051 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
3052 
+					$number['pilot_id'] = $number['pilot_name'];
3053 
+				}
2679 3054 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2680 3055 
 			}
2681 3056
2682 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
3057 
+			if ($globalDebug) {
3058 
+				echo 'Count all departure airports...'."\n";
3059 
+			}
2683 3060 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2684 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
3061 
+			if ($globalDebug) {
3062 
+				echo 'Count all detected departure airports...'."\n";
3063 
+			}
2685 3064 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2686 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
3065 
+			if ($globalDebug) {
3066 
+				echo 'Order departure airports...'."\n";
3067 
+			}
2687 3068 
 			$alldata = array();
2688 3069 
 			foreach ($pall as $value) {
2689 3070 
 				$icao = $value['airport_departure_icao'];
 
@@ -2693,7 +3074,9 @@  discard block
 
 block discarded – undo
2693 3074 
 				$icao = $value['airport_departure_icao'];
2694 3075 
 				if (isset($alldata[$icao])) {
2695 3076 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2696 
-				} else $alldata[$icao] = $value;
3077 
+				} else {
3078 
+					$alldata[$icao] = $value;
3079 
+				}
2697 3080 
 			}
2698 3081 
 			$count = array();
2699 3082 
 			foreach ($alldata as $key => $row) {
 
@@ -2703,11 +3086,17 @@  discard block
 
 block discarded – undo
2703 3086 
 			foreach ($alldata as $number) {
2704 3087 
 				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);
2705 3088 
 			}
2706 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
3089 
+			if ($globalDebug) {
3090 
+				echo 'Count all arrival airports...'."\n";
3091 
+			}
2707 3092 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2708 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
3093 
+			if ($globalDebug) {
3094 
+				echo 'Count all detected arrival airports...'."\n";
3095 
+			}
2709 3096 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2710 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
3097 
+			if ($globalDebug) {
3098 
+				echo 'Order arrival airports...'."\n";
3099 
+			}
2711 3100 
 			$alldata = array();
2712 3101 
 			foreach ($pall as $value) {
2713 3102 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2717,7 +3106,9 @@  discard block
 
 block discarded – undo
2717 3106 
 				$icao = $value['airport_arrival_icao'];
2718 3107 
 				if (isset($alldata[$icao])) {
2719 3108 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2720 
-				} else $alldata[$icao] = $value;
3109 
+				} else {
3110 
+					$alldata[$icao] = $value;
3111 
+				}
2721 3112 
 			}
2722 3113 
 			$count = array();
2723 3114 
 			foreach ($alldata as $key => $row) {
 
@@ -2728,7 +3119,9 @@  discard block
 
 block discarded – undo
2728 3119 
 				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);
2729 3120 
 			}
2730 3121 
 			if ($Connection->tableExists('countries')) {
2731 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
3122 
+				if ($globalDebug) {
3123 
+					echo 'Count all flights by countries...'."\n";
3124 
+				}
2732 3125 
 				//$SpotterArchive = new SpotterArchive();
2733 3126 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2734 3127 
 				$Spotter = new Spotter($this->db);
 
@@ -2739,7 +3132,9 @@  discard block
 
 block discarded – undo
2739 3132 
 			}
2740 3133
2741 3134 
 			if (isset($globalAccidents) && $globalAccidents) {
2742 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
3135 
+				if ($globalDebug) {
3136 
+					echo 'Count fatalities stats...'."\n";
3137 
+				}
2743 3138 
 				$Accident = new Accident($this->db);
2744 3139 
 				$this->deleteStatsByType('fatalities_byyear');
2745 3140 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2755,48 +3150,68 @@  discard block
 
 block discarded – undo
2755 3150
2756 3151 
 			// Add by month using getstat if month finish...
2757 3152 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2758 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
3153 
+			if ($globalDebug) {
3154 
+				echo 'Count all flights by months...'."\n";
3155 
+			}
2759 3156 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2760 3157 
 			$filter_last_month = array('since_date' => $last_month);
2761 3158 
 			$Spotter = new Spotter($this->db);
2762 3159 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2763 3160 
 			$lastyear = false;
2764 3161 
 			foreach ($alldata as $number) {
2765 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
3162 
+				if ($number['year_name'] != date('Y')) {
3163 
+					$lastyear = true;
3164 
+				}
2766 3165 
 				$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'])));
2767 3166 
 			}
2768 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
3167 
+			if ($globalDebug) {
3168 
+				echo 'Count all military flights by months...'."\n";
3169 
+			}
2769 3170 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2770 3171 
 			foreach ($alldata as $number) {
2771 3172 
 				$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'])));
2772 3173 
 			}
2773 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
3174 
+			if ($globalDebug) {
3175 
+				echo 'Count all owners by months...'."\n";
3176 
+			}
2774 3177 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2775 3178 
 			foreach ($alldata as $number) {
2776 3179 
 				$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'])));
2777 3180 
 			}
2778 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
3181 
+			if ($globalDebug) {
3182 
+				echo 'Count all pilots by months...'."\n";
3183 
+			}
2779 3184 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2780 3185 
 			foreach ($alldata as $number) {
2781 3186 
 				$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'])));
2782 3187 
 			}
2783 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
3188 
+			if ($globalDebug) {
3189 
+				echo 'Count all airlines by months...'."\n";
3190 
+			}
2784 3191 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2785 3192 
 			foreach ($alldata as $number) {
2786 3193 
 				$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'])));
2787 3194 
 			}
2788 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3195 
+			if ($globalDebug) {
3196 
+				echo 'Count all aircrafts by months...'."\n";
3197 
+			}
2789 3198 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2790 3199 
 			foreach ($alldata as $number) {
2791 3200 
 				$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'])));
2792 3201 
 			}
2793 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3202 
+			if ($globalDebug) {
3203 
+				echo 'Count all real arrivals by months...'."\n";
3204 
+			}
2794 3205 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2795 3206 
 			foreach ($alldata as $number) {
2796 3207 
 				$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'])));
2797 3208 
 			}
2798 
-			if ($globalDebug) echo 'Airports data...'."\n";
2799 
-			if ($globalDebug) echo '...Departure'."\n";
3209 
+			if ($globalDebug) {
3210 
+				echo 'Airports data...'."\n";
3211 
+			}
3212 
+			if ($globalDebug) {
3213 
+				echo '...Departure'."\n";
3214 
+			}
2800 3215 
 			$this->deleteStatAirport('daily');
2801 3216 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2802 3217 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2914,7 +3329,9 @@  discard block
 
 block discarded – undo
2914 3329 
 			// Count by airlines
2915 3330 
 			echo '--- Stats by airlines ---'."\n";
2916 3331 
 			if ($Connection->tableExists('countries')) {
2917 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
3332 
+				if ($globalDebug) {
3333 
+					echo 'Count all flights by countries by airlines...'."\n";
3334 
+				}
2918 3335 
 				$SpotterArchive = new SpotterArchive($this->db);
2919 3336 
 				//$Spotter = new Spotter($this->db);
2920 3337 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2923,37 +3340,53 @@  discard block
 
 block discarded – undo
2923 3340 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2924 3341 
 				}
2925 3342 
 			}
2926 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
3343 
+			if ($globalDebug) {
3344 
+				echo 'Count all aircraft types by airlines...'."\n";
3345 
+			}
2927 3346 
 			$Spotter = new Spotter($this->db);
2928 3347 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2929 3348 
 			foreach ($alldata as $number) {
2930 3349 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2931 3350 
 			}
2932 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
3351 
+			if ($globalDebug) {
3352 
+				echo 'Count all aircraft registrations by airlines...'."\n";
3353 
+			}
2933 3354 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2934 3355 
 			foreach ($alldata as $number) {
2935 3356 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2936 3357 
 			}
2937 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
3358 
+			if ($globalDebug) {
3359 
+				echo 'Count all callsigns by airlines...'."\n";
3360 
+			}
2938 3361 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2939 3362 
 			foreach ($alldata as $number) {
2940 3363 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2941 3364 
 			}
2942 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
3365 
+			if ($globalDebug) {
3366 
+				echo 'Count all owners by airlines...'."\n";
3367 
+			}
2943 3368 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2944 3369 
 			foreach ($alldata as $number) {
2945 3370 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2946 3371 
 			}
2947 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
3372 
+			if ($globalDebug) {
3373 
+				echo 'Count all pilots by airlines...'."\n";
3374 
+			}
2948 3375 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2949 3376 
 			foreach ($alldata as $number) {
2950 3377 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2951 3378 
 			}
2952 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
3379 
+			if ($globalDebug) {
3380 
+				echo 'Count all departure airports by airlines...'."\n";
3381 
+			}
2953 3382 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2954 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
3383 
+			if ($globalDebug) {
3384 
+				echo 'Count all detected departure airports by airlines...'."\n";
3385 
+			}
2955 3386 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2956 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
3387 
+			if ($globalDebug) {
3388 
+				echo 'Order detected departure airports by airlines...'."\n";
3389 
+			}
2957 3390 
 			//$alldata = array();
2958 3391 
 			foreach ($dall as $value) {
2959 3392 
 				$icao = $value['airport_departure_icao'];
 
@@ -2974,11 +3407,17 @@  discard block
 
 block discarded – undo
2974 3407 
 			foreach ($alldata as $number) {
2975 3408 
 				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);
2976 3409 
 			}
2977 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
3410 
+			if ($globalDebug) {
3411 
+				echo 'Count all arrival airports by airlines...'."\n";
3412 
+			}
2978 3413 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2979 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
3414 
+			if ($globalDebug) {
3415 
+				echo 'Count all detected arrival airports by airlines...'."\n";
3416 
+			}
2980 3417 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2981 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
3418 
+			if ($globalDebug) {
3419 
+				echo 'Order arrival airports by airlines...'."\n";
3420 
+			}
2982 3421 
 			//$alldata = array();
2983 3422 
 			foreach ($dall as $value) {
2984 3423 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2997,37 +3436,53 @@  discard block
 
 block discarded – undo
2997 3436 
 			}
2998 3437 
 			$alldata = $pall;
2999 3438 
 			foreach ($alldata as $number) {
3000 
-				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);
3439 
+				if ($number['airline_icao'] != '') {
3440 
+					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);
3441 
+				}
3442 
+			}
3443 
+			if ($globalDebug) {
3444 
+				echo 'Count all flights by months by airlines...'."\n";
3001 3445 
 			}
3002 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3003 3446 
 			$Spotter = new Spotter($this->db);
3004 3447 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
3005 3448 
 			$lastyear = false;
3006 3449 
 			foreach ($alldata as $number) {
3007 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
3450 
+				if ($number['year_name'] != date('Y')) {
3451 
+					$lastyear = true;
3452 
+				}
3008 3453 
 				$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']);
3009 3454 
 			}
3010 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3455 
+			if ($globalDebug) {
3456 
+				echo 'Count all owners by months by airlines...'."\n";
3457 
+			}
3011 3458 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3012 3459 
 			foreach ($alldata as $number) {
3013 3460 
 				$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']);
3014 3461 
 			}
3015 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3462 
+			if ($globalDebug) {
3463 
+				echo 'Count all pilots by months by airlines...'."\n";
3464 
+			}
3016 3465 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3017 3466 
 			foreach ($alldata as $number) {
3018 3467 
 				$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']);
3019 3468 
 			}
3020 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3469 
+			if ($globalDebug) {
3470 
+				echo 'Count all aircrafts by months by airlines...'."\n";
3471 
+			}
3021 3472 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3022 3473 
 			foreach ($alldata as $number) {
3023 3474 
 				$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']);
3024 3475 
 			}
3025 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3476 
+			if ($globalDebug) {
3477 
+				echo 'Count all real arrivals by months by airlines...'."\n";
3478 
+			}
3026 3479 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3027 3480 
 			foreach ($alldata as $number) {
3028 3481 
 				$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']);
3029 3482 
 			}
3030 
-			if ($globalDebug) echo '...Departure'."\n";
3483 
+			if ($globalDebug) {
3484 
+				echo '...Departure'."\n";
3485 
+			}
3031 3486 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
3032 3487 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
3033 3488 
 			foreach ($dall as $value) {
 
@@ -3050,7 +3505,9 @@  discard block
 
 block discarded – undo
3050 3505 
 			foreach ($alldata as $number) {
3051 3506 
 				$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']);
3052 3507 
 			}
3053 
-			if ($globalDebug) echo '...Arrival'."\n";
3508 
+			if ($globalDebug) {
3509 
+				echo '...Arrival'."\n";
3510 
+			}
3054 3511 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
3055 3512 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
3056 3513 
 			foreach ($dall as $value) {
 
@@ -3074,13 +3531,19 @@  discard block
 
 block discarded – undo
3074 3531 
 				$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']);
3075 3532 
 			}
3076 3533
3077 
-			if ($globalDebug) echo 'Flights data...'."\n";
3078 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3534 
+			if ($globalDebug) {
3535 
+				echo 'Flights data...'."\n";
3536 
+			}
3537 
+			if ($globalDebug) {
3538 
+				echo '-> countAllDatesLastMonth...'."\n";
3539 
+			}
3079 3540 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3080 3541 
 			foreach ($alldata as $number) {
3081 3542 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3082 3543 
 			}
3083 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
3544 
+			if ($globalDebug) {
3545 
+				echo '-> countAllDates...'."\n";
3546 
+			}
3084 3547 
 			//$previousdata = $this->countAllDatesByAirlines();
3085 3548 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3086 3549 
 			$values = array();
 
@@ -3093,14 +3556,18 @@  discard block
 
 block discarded – undo
3093 3556 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3094 3557 
 			}
3095 3558
3096 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
3559 
+			if ($globalDebug) {
3560 
+				echo '-> countAllHours...'."\n";
3561 
+			}
3097 3562 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3098 3563 
 			foreach ($alldata as $number) {
3099 3564 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3100 3565 
 			}
3101 3566
3102 3567 
 			// Stats by filters
3103 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
3568 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
3569 
+				$globalStatsFilters = array();
3570 
+			}
3104 3571 
 			foreach ($globalStatsFilters as $name => $filter) {
3105 3572 
 				if (!empty($filter)) {
3106 3573 
 					//$filter_name = $filter['name'];
 
@@ -3108,7 +3575,9 @@  discard block
 
 block discarded – undo
3108 3575 
 					$reset = false;
3109 3576 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
3110 3577 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
3111 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3578 
+						if ($globalDebug) {
3579 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3580 
+						}
3112 3581 
 						$this->deleteOldStats($filter_name);
3113 3582 
 						unset($last_update);
3114 3583 
 					}
 
@@ -3125,39 +3594,55 @@  discard block
 
 block discarded – undo
3125 3594 
 						$reset = true;
3126 3595 
 					}
3127 3596 
 					// Count by filter
3128 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3597 
+					if ($globalDebug) {
3598 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
3599 
+					}
3129 3600 
 					$Spotter = new Spotter($this->db);
3130 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3601 
+					if ($globalDebug) {
3602 
+						echo 'Count all aircraft types...'."\n";
3603 
+					}
3131 3604 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3132 3605 
 					foreach ($alldata as $number) {
3133 3606 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3134 3607 
 					}
3135 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
3608 
+					if ($globalDebug) {
3609 
+						echo 'Count all airlines...'."\n";
3610 
+					}
3136 3611 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3137 3612 
 					foreach ($alldata as $number) {
3138 3613 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3139 3614 
 					}
3140 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3615 
+					if ($globalDebug) {
3616 
+						echo 'Count all aircraft registrations...'."\n";
3617 
+					}
3141 3618 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3142 3619 
 					foreach ($alldata as $number) {
3143 3620 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3144 3621 
 					}
3145 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
3622 
+					if ($globalDebug) {
3623 
+						echo 'Count all callsigns...'."\n";
3624 
+					}
3146 3625 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3147 3626 
 					foreach ($alldata as $number) {
3148 3627 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3149 3628 
 					}
3150 
-					if ($globalDebug) echo 'Count all owners...'."\n";
3629 
+					if ($globalDebug) {
3630 
+						echo 'Count all owners...'."\n";
3631 
+					}
3151 3632 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3152 3633 
 					foreach ($alldata as $number) {
3153 3634 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3154 3635 
 					}
3155 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
3636 
+					if ($globalDebug) {
3637 
+						echo 'Count all pilots...'."\n";
3638 
+					}
3156 3639 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3157 3640 
 					foreach ($alldata as $number) {
3158 3641 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3159 3642 
 					}
3160 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
3643 
+					if ($globalDebug) {
3644 
+						echo 'Count departure airports...'."\n";
3645 
+					}
3161 3646 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3162 3647 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3163 3648 
 					$alldata = array();
 
@@ -3169,7 +3654,9 @@  discard block
 
 block discarded – undo
3169 3654 
 						$icao = $value['airport_departure_icao'];
3170 3655 
 						if (isset($alldata[$icao])) {
3171 3656 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
3172 
-						} else $alldata[$icao] = $value;
3657 
+						} else {
3658 
+							$alldata[$icao] = $value;
3659 
+						}
3173 3660 
 					}
3174 3661 
 					$count = array();
3175 3662 
 					foreach ($alldata as $key => $row) {
 
@@ -3179,7 +3666,9 @@  discard block
 
 block discarded – undo
3179 3666 
 					foreach ($alldata as $number) {
3180 3667 
 						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);
3181 3668 
 					}
3182 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3669 
+					if ($globalDebug) {
3670 
+						echo 'Count all arrival airports...'."\n";
3671 
+					}
3183 3672 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3184 3673 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3185 3674 
 					$alldata = array();
 
@@ -3191,7 +3680,9 @@  discard block
 
 block discarded – undo
3191 3680 
 						$icao = $value['airport_arrival_icao'];
3192 3681 
 						if (isset($alldata[$icao])) {
3193 3682 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
3194 
-						} else $alldata[$icao] = $value;
3683 
+						} else {
3684 
+							$alldata[$icao] = $value;
3685 
+						}
3195 3686 
 					}
3196 3687 
 					$count = array();
3197 3688 
 					foreach ($alldata as $key => $row) {
 
@@ -3201,35 +3692,49 @@  discard block
 
 block discarded – undo
3201 3692 
 					foreach ($alldata as $number) {
3202 3693 
 						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);
3203 3694 
 					}
3204 
-					if ($globalDebug) echo 'Count all months...'."\n";
3695 
+					if ($globalDebug) {
3696 
+						echo 'Count all months...'."\n";
3697 
+					}
3205 3698 
 					$Spotter = new Spotter($this->db);
3206 3699 
 					$alldata = $Spotter->countAllMonths($filter);
3207 3700 
 					$lastyear = false;
3208 3701 
 					foreach ($alldata as $number) {
3209 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
3702 
+						if ($number['year_name'] != date('Y')) {
3703 
+							$lastyear = true;
3704 
+						}
3210 3705 
 						$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);
3211 3706 
 					}
3212 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
3707 
+					if ($globalDebug) {
3708 
+						echo 'Count all owners by months...'."\n";
3709 
+					}
3213 3710 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3214 3711 
 					foreach ($alldata as $number) {
3215 3712 
 						$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);
3216 3713 
 					}
3217 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3714 
+					if ($globalDebug) {
3715 
+						echo 'Count all pilots by months...'."\n";
3716 
+					}
3218 3717 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3219 3718 
 					foreach ($alldata as $number) {
3220 3719 
 						$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);
3221 3720 
 					}
3222 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
3721 
+					if ($globalDebug) {
3722 
+						echo 'Count all military by months...'."\n";
3723 
+					}
3223 3724 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3224 3725 
 					foreach ($alldata as $number) {
3225 3726 
 						$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);
3226 3727 
 					}
3227 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3728 
+					if ($globalDebug) {
3729 
+						echo 'Count all aircrafts by months...'."\n";
3730 
+					}
3228 3731 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3229 3732 
 				    	foreach ($alldata as $number) {
3230 3733 
 			    			$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);
3231 3734 
 					}
3232 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3735 
+					if ($globalDebug) {
3736 
+						echo 'Count all real arrivals by months...'."\n";
3737 
+					}
3233 3738 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3234 3739 
 					foreach ($alldata as $number) {
3235 3740 
 						$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);
Please login to merge, or discard this patch.
require/class.SpotterLive.php 2 patches
Indentation   +205 added lines, -205 removed lines patch added patch discarded remove patch 
@@ -13,10 +13,10 @@  discard block
 
 block discarded – undo
13 13
14 14
15 15 
 	/**
16 
-	* Get SQL query part for filter used
17 
-	* @param Array $filter the filter
18 
-	* @return Array the SQL part
19 
-	*/
16 
+	 * Get SQL query part for filter used
17 
+	 * @param Array $filter the filter
18 
+	 * @return Array the SQL part
19 
+	 */
20 20 
 	public function getFilter($filter = array(),$where = false,$and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
22 22 
 		$filters = array();
 
@@ -133,11 +133,11 @@  discard block
 
 block discarded – undo
133 133 
 	}
134 134
135 135 
 	/**
136 
-	* Gets all the spotter information based on the latest data entry
137 
-	*
138 
-	* @return Array the spotter information
139 
-	*
140 
-	*/
136 
+	 * Gets all the spotter information based on the latest data entry
137 
+	 *
138 
+	 * @return Array the spotter information
139 
+	 *
140 
+	 */
141 141 
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
142 142 
 	{
143 143 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -180,11 +180,11 @@  discard block
 
 block discarded – undo
180 180 
 	}
181 181
182 182 
 	/**
183 
-	* Gets Minimal Live Spotter data
184 
-	*
185 
-	* @return Array the spotter information
186 
-	*
187 
-	*/
183 
+	 * Gets Minimal Live Spotter data
184 
+	 *
185 
+	 * @return Array the spotter information
186 
+	 *
187 
+	 */
188 188 
 	public function getMinLiveSpotterData($filter = array())
189 189 
 	{
190 190 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 
@@ -221,11 +221,11 @@  discard block
 
 block discarded – undo
221 221 
 	}
222 222
223 223 
 	/**
224 
-	* Gets Minimal Live Spotter data since xx seconds
225 
-	*
226 
-	* @return Array the spotter information
227 
-	*
228 
-	*/
224 
+	 * Gets Minimal Live Spotter data since xx seconds
225 
+	 *
226 
+	 * @return Array the spotter information
227 
+	 *
228 
+	 */
229 229 
 	public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false)
230 230 
 	{
231 231 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit;
 
@@ -308,11 +308,11 @@  discard block
 
 block discarded – undo
308 308 
 	}
309 309
310 310 
 	/**
311 
-	* Gets number of latest data entry
312 
-	*
313 
-	* @return String number of entry
314 
-	*
315 
-	*/
311 
+	 * Gets number of latest data entry
312 
+	 *
313 
+	 * @return String number of entry
314 
+	 *
315 
+	 */
316 316 
 	public function getLiveSpotterCount($filter = array())
317 317 
 	{
318 318 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -339,11 +339,11 @@  discard block
 
 block discarded – undo
339 339 
 	}
340 340
341 341 
 	/**
342 
-	* Gets all the spotter information based on the latest data entry and coord
343 
-	*
344 
-	* @return Array the spotter information
345 
-	*
346 
-	*/
342 
+	 * Gets all the spotter information based on the latest data entry and coord
343 
+	 *
344 
+	 * @return Array the spotter information
345 
+	 *
346 
+	 */
347 347 
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
348 348 
 	{
349 349 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -368,11 +368,11 @@  discard block
 
 block discarded – undo
368 368 
 	}
369 369
370 370 
 	/**
371 
-	* Gets all the spotter information based on the latest data entry and coord
372 
-	*
373 
-	* @return Array the spotter information
374 
-	*
375 
-	*/
371 
+	 * Gets all the spotter information based on the latest data entry and coord
372 
+	 *
373 
+	 * @return Array the spotter information
374 
+	 *
375 
+	 */
376 376 
 	public function getMinLiveSpotterDatabyCoord($coord, $filter = array())
377 377 
 	{
378 378 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 
@@ -437,11 +437,11 @@  discard block
 
 block discarded – undo
437 437 
 	}
438 438
439 439 
 	/**
440 
-	* Gets all the spotter information based on a user's latitude and longitude
441 
-	*
442 
-	* @return Array the spotter information
443 
-	*
444 
-	*/
440 
+	 * Gets all the spotter information based on a user's latitude and longitude
441 
+	 *
442 
+	 * @return Array the spotter information
443 
+	 *
444 
+	 */
445 445 
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
446 446 
 	{
447 447 
 		$Spotter = new Spotter($this->db);
 
@@ -451,98 +451,98 @@  discard block
 
 block discarded – undo
451 451 
 				return false;
452 452 
 			}
453 453 
 		}
454 
-        if ($lng != '')
455 
-                {
456 
-                        if (!is_numeric($lng))
457 
-                        {
458 
-                                return false;
459 
-                        }
460 
-                }
461 
-
462 
-                if ($radius != '')
463 
-                {
464 
-                        if (!is_numeric($radius))
465 
-                        {
466 
-                                return false;
467 
-                        }
468 
-                }
454 
+		if ($lng != '')
455 
+				{
456 
+						if (!is_numeric($lng))
457 
+						{
458 
+								return false;
459 
+						}
460 
+				}
461 
+
462 
+				if ($radius != '')
463 
+				{
464 
+						if (!is_numeric($radius))
465 
+						{
466 
+								return false;
467 
+						}
468 
+				}
469 469 
 		$additional_query = '';
470 
-        if ($interval != '')
471 
-                {
472 
-                        if (!is_string($interval))
473 
-                        {
474 
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
475 
-			        return false;
476 
-                        } else {
477 
-                if ($interval == '1m')
478 
-                {
479 
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
480 
-                } else if ($interval == '15m'){
481 
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
482 
-                }
483 
-            }
484 
-                } else {
485 
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
486 
-        }
487 
-
488 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
470 
+		if ($interval != '')
471 
+				{
472 
+						if (!is_string($interval))
473 
+						{
474 
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
475 
+					return false;
476 
+						} else {
477 
+				if ($interval == '1m')
478 
+				{
479 
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
480 
+				} else if ($interval == '15m'){
481 
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
482 
+				}
483 
+			}
484 
+				} else {
485 
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
486 
+		}
487 
+
488 
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
489 489 
                    WHERE spotter_live.latitude <> ''
490 490 
                                    AND spotter_live.longitude <> ''
491 491 
                    ".$additional_query."
492 492 
                    HAVING distance < :radius
493 493 
                                    ORDER BY distance";
494 494
495 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
495 
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
496 496
497 
-                return $spotter_array;
498 
-        }
497 
+				return $spotter_array;
498 
+		}
499 499
500 500
501 
-        /**
502 
-	* Gets all the spotter information based on a particular callsign
503 
-	*
504 
-	* @return Array the spotter information
505 
-	*
506 
-	*/
501 
+		/**
502 
+		 * Gets all the spotter information based on a particular callsign
503 
+		 *
504 
+		 * @return Array the spotter information
505 
+		 *
506 
+		 */
507 507 
 	public function getLastLiveSpotterDataByIdent($ident)
508 508 
 	{
509 509 
 		$Spotter = new Spotter($this->db);
510 510 
 		date_default_timezone_set('UTC');
511 511
512 512 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
513 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
513 
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
514 514
515 515 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
516 516
517 517 
 		return $spotter_array;
518 518 
 	}
519 519
520 
-        /**
521 
-	* Gets all the spotter information based on a particular callsign
522 
-	*
523 
-	* @return Array the spotter information
524 
-	*
525 
-	*/
520 
+		/**
521 
+		 * Gets all the spotter information based on a particular callsign
522 
+		 *
523 
+		 * @return Array the spotter information
524 
+		 *
525 
+		 */
526 526 
 	public function getDateLiveSpotterDataByIdent($ident,$date)
527 527 
 	{
528 528 
 		$Spotter = new Spotter($this->db);
529 529 
 		date_default_timezone_set('UTC');
530 530
531 531 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
532 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
532 
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
533 533
534 
-                $date = date('c',$date);
534 
+				$date = date('c',$date);
535 535 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
536 536
537 537 
 		return $spotter_array;
538 538 
 	}
539 539
540 
-        /**
541 
-	* Gets last spotter information based on a particular callsign
542 
-	*
543 
-	* @return Array the spotter information
544 
-	*
545 
-	*/
540 
+		/**
541 
+		 * Gets last spotter information based on a particular callsign
542 
+		 *
543 
+		 * @return Array the spotter information
544 
+		 *
545 
+		 */
546 546 
 	public function getLastLiveSpotterDataById($id)
547 547 
 	{
548 548 
 		$Spotter = new Spotter($this->db);
 
@@ -553,12 +553,12 @@  discard block
 
 block discarded – undo
553 553 
 		return $spotter_array;
554 554 
 	}
555 555
556 
-        /**
557 
-	* Gets last spotter information based on a particular callsign
558 
-	*
559 
-	* @return Array the spotter information
560 
-	*
561 
-	*/
556 
+		/**
557 
+		 * Gets last spotter information based on a particular callsign
558 
+		 *
559 
+		 * @return Array the spotter information
560 
+		 *
561 
+		 */
562 562 
 	public function getDateLiveSpotterDataById($id,$date)
563 563 
 	{
564 564 
 		$Spotter = new Spotter($this->db);
 
@@ -571,21 +571,21 @@  discard block
 
 block discarded – undo
571 571 
 		return $spotter_array;
572 572 
 	}
573 573
574 
-        /**
575 
-	* Gets altitude information based on a particular callsign
576 
-	*
577 
-	* @return Array the spotter information
578 
-	*
579 
-	*/
574 
+		/**
575 
+		 * Gets altitude information based on a particular callsign
576 
+		 *
577 
+		 * @return Array the spotter information
578 
+		 *
579 
+		 */
580 580 
 	public function getAltitudeLiveSpotterDataByIdent($ident)
581 581 
 	{
582 582
583 583 
 		date_default_timezone_set('UTC');
584 584
585 585 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
586 
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
586 
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
587 587
588 
-    		try {
588 
+			try {
589 589
590 590 
 			$sth = $this->db->prepare($query);
591 591 
 			$sth->execute(array(':ident' => $ident));
 
@@ -598,12 +598,12 @@  discard block
 
 block discarded – undo
598 598 
 		return $spotter_array;
599 599 
 	}
600 600
601 
-        /**
602 
-	* Gets all the spotter information based on a particular id
603 
-	*
604 
-	* @return Array the spotter information
605 
-	*
606 
-	*/
601 
+		/**
602 
+		 * Gets all the spotter information based on a particular id
603 
+		 *
604 
+		 * @return Array the spotter information
605 
+		 *
606 
+		 */
607 607 
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
608 608 
 	{
609 609 
 		global $globalDBdriver, $globalLiveInterval;
 
@@ -631,18 +631,18 @@  discard block
 
 block discarded – undo
631 631 
 		return $spotter_array;
632 632 
 	}
633 633
634 
-        /**
635 
-	* Gets all the spotter information based on a particular ident
636 
-	*
637 
-	* @return Array the spotter information
638 
-	*
639 
-	*/
634 
+		/**
635 
+		 * Gets all the spotter information based on a particular ident
636 
+		 *
637 
+		 * @return Array the spotter information
638 
+		 *
639 
+		 */
640 640 
 	public function getAllLiveSpotterDataByIdent($ident)
641 641 
 	{
642 642 
 		date_default_timezone_set('UTC');
643 643 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
644 644 
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
645 
-    		try {
645 
+			try {
646 646
647 647 
 			$sth = $this->db->prepare($query);
648 648 
 			$sth->execute(array(':ident' => $ident));
 
@@ -656,23 +656,23 @@  discard block
 
 block discarded – undo
656 656
657 657
658 658 
 	/**
659 
-	* Deletes all info in the table
660 
-	*
661 
-	* @return String success or false
662 
-	*
663 
-	*/
659 
+	 * Deletes all info in the table
660 
+	 *
661 
+	 * @return String success or false
662 
+	 *
663 
+	 */
664 664 
 	public function deleteLiveSpotterData()
665 665 
 	{
666 666 
 		global $globalDBdriver;
667 667 
 		if ($globalDBdriver == 'mysql') {
668 668 
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
669 669 
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
670 
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
670 
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
671 671 
 		} else {
672 672 
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
673 673 
 		}
674 674
675 
-    		try {
675 
+			try {
676 676
677 677 
 			$sth = $this->db->prepare($query);
678 678 
 			$sth->execute();
 
@@ -684,18 +684,18 @@  discard block
 
 block discarded – undo
684 684 
 	}
685 685
686 686 
 	/**
687 
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
688 
-	*
689 
-	* @return String success or false
690 
-	*
691 
-	*/
687 
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
688 
+	 *
689 
+	 * @return String success or false
690 
+	 *
691 
+	 */
692 692 
 	public function deleteLiveSpotterDataNotUpdated()
693 693 
 	{
694 694 
 		global $globalDBdriver, $globalDebug;
695 695 
 		if ($globalDBdriver == 'mysql') {
696 696 
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
697 
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
698 
-    			try {
697 
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0";
698 
+				try {
699 699
700 700 
 				$sth = $this->db->prepare($query);
701 701 
 				$sth->execute();
 
@@ -703,8 +703,8 @@  discard block
 
 block discarded – undo
703 703 
 				return "error";
704 704 
 			}
705 705 
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
706 
-                        $i = 0;
707 
-                        $j =0;
706 
+						$i = 0;
707 
+						$j =0;
708 708 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
709 709 
 			foreach($all as $row)
710 710 
 			{
 
@@ -712,20 +712,20 @@  discard block
 
 block discarded – undo
712 712 
 				$j++;
713 713 
 				if ($j == 30) {
714 714 
 					if ($globalDebug) echo ".";
715 
-				    	try {
715 
+						try {
716 716
717 717 
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
718 718 
 						$sth->execute();
719 719 
 					} catch(PDOException $e) {
720 720 
 						return "error";
721 721 
 					}
722 
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
723 
-                                	$j = 0;
722 
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
723 
+									$j = 0;
724 724 
 				}
725 725 
 				$query_delete .= "'".$row['flightaware_id']."',";
726 726 
 			}
727 727 
 			if ($i > 0) {
728 
-    				try {
728 
+					try {
729 729
730 730 
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
731 731 
 					$sth->execute();
 
@@ -736,9 +736,9 @@  discard block
 
 block discarded – undo
736 736 
 			return "success";
737 737 
 		} elseif ($globalDBdriver == 'pgsql') {
738 738 
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
739 
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
740 
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
741 
-    			try {
739 
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
740 
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)";
741 
+				try {
742 742
743 743 
 				$sth = $this->db->prepare($query);
744 744 
 				$sth->execute();
 
@@ -782,17 +782,17 @@  discard block
 
 block discarded – undo
782 782 
 	}
783 783
784 784 
 	/**
785 
-	* Deletes all info in the table for an ident
786 
-	*
787 
-	* @return String success or false
788 
-	*
789 
-	*/
785 
+	 * Deletes all info in the table for an ident
786 
+	 *
787 
+	 * @return String success or false
788 
+	 *
789 
+	 */
790 790 
 	public function deleteLiveSpotterDataByIdent($ident)
791 791 
 	{
792 792 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
793 793 
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
794 794
795 
-    		try {
795 
+			try {
796 796
797 797 
 			$sth = $this->db->prepare($query);
798 798 
 			$sth->execute(array(':ident' => $ident));
 
@@ -804,17 +804,17 @@  discard block
 
 block discarded – undo
804 804 
 	}
805 805
806 806 
 	/**
807 
-	* Deletes all info in the table for an id
808 
-	*
809 
-	* @return String success or false
810 
-	*
811 
-	*/
807 
+	 * Deletes all info in the table for an id
808 
+	 *
809 
+	 * @return String success or false
810 
+	 *
811 
+	 */
812 812 
 	public function deleteLiveSpotterDataById($id)
813 813 
 	{
814 814 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
815 815 
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
816 816
817 
-    		try {
817 
+			try {
818 818
819 819 
 			$sth = $this->db->prepare($query);
820 820 
 			$sth->execute(array(':id' => $id));
 
@@ -827,11 +827,11 @@  discard block
 
 block discarded – undo
827 827
828 828
829 829 
 	/**
830 
-	* Gets the aircraft ident within the last hour
831 
-	*
832 
-	* @return String the ident
833 
-	*
834 
-	*/
830 
+	 * Gets the aircraft ident within the last hour
831 
+	 *
832 
+	 * @return String the ident
833 
+	 *
834 
+	 */
835 835 
 	public function getIdentFromLastHour($ident)
836 836 
 	{
837 837 
 		global $globalDBdriver, $globalTimezone;
 
@@ -857,14 +857,14 @@  discard block
 
 block discarded – undo
857 857 
 			$ident_result = $row['ident'];
858 858 
 		}
859 859 
 		return $ident_result;
860 
-        }
860 
+		}
861 861
862 862 
 	/**
863 
-	* Check recent aircraft
864 
-	*
865 
-	* @return String the ident
866 
-	*
867 
-	*/
863 
+	 * Check recent aircraft
864 
+	 *
865 
+	 * @return String the ident
866 
+	 *
867 
+	 */
868 868 
 	public function checkIdentRecent($ident)
869 869 
 	{
870 870 
 		global $globalDBdriver, $globalTimezone;
 
@@ -890,14 +890,14 @@  discard block
 
 block discarded – undo
890 890 
 			$ident_result = $row['flightaware_id'];
891 891 
 		}
892 892 
 		return $ident_result;
893 
-        }
893 
+		}
894 894
895 895 
 	/**
896 
-	* Check recent aircraft by id
897 
-	*
898 
-	* @return String the ident
899 
-	*
900 
-	*/
896 
+	 * Check recent aircraft by id
897 
+	 *
898 
+	 * @return String the ident
899 
+	 *
900 
+	 */
901 901 
 	public function checkIdRecent($id)
902 902 
 	{
903 903 
 		global $globalDBdriver, $globalTimezone;
 
@@ -923,14 +923,14 @@  discard block
 
 block discarded – undo
923 923 
 			$ident_result = $row['flightaware_id'];
924 924 
 		}
925 925 
 		return $ident_result;
926 
-        }
926 
+		}
927 927
928 928 
 	/**
929 
-	* Check recent aircraft by ModeS
930 
-	*
931 
-	* @return String the ModeS
932 
-	*
933 
-	*/
929 
+	 * Check recent aircraft by ModeS
930 
+	 *
931 
+	 * @return String the ModeS
932 
+	 *
933 
+	 */
934 934 
 	public function checkModeSRecent($modes)
935 935 
 	{
936 936 
 		global $globalDBdriver, $globalTimezone;
 
@@ -960,11 +960,11 @@  discard block
 
 block discarded – undo
960 960 
 	}
961 961
962 962 
 	/**
963 
-	* Gets the aircraft data from the last 20 seconds
964 
-	*
965 
-	* @return Array the spotter data
966 
-	*
967 
-	*/
963 
+	 * Gets the aircraft data from the last 20 seconds
964 
+	 *
965 
+	 * @return Array the spotter data
966 
+	 *
967 
+	 */
968 968 
 	public function getRealTimeData($q = '')
969 969 
 	{
970 970 
 		global $globalDBdriver;
 
@@ -1006,16 +1006,16 @@  discard block
 
 block discarded – undo
1006 1006 
 	}
1007 1007
1008 1008 
 	/**
1009 
-	* Adds a new spotter data
1010 
-	*
1011 
-	* @param String $flightaware_id the ID from flightaware
1012 
-	* @param String $ident the flight ident
1013 
-	* @param String $aircraft_icao the aircraft type
1014 
-	* @param String $departure_airport_icao the departure airport
1015 
-	* @param String $arrival_airport_icao the arrival airport
1016 
-	* @return String success or false
1017 
-	*
1018 
-	*/
1009 
+	 * Adds a new spotter data
1010 
+	 *
1011 
+	 * @param String $flightaware_id the ID from flightaware
1012 
+	 * @param String $ident the flight ident
1013 
+	 * @param String $aircraft_icao the aircraft type
1014 
+	 * @param String $departure_airport_icao the departure airport
1015 
+	 * @param String $arrival_airport_icao the arrival airport
1016 
+	 * @return String success or false
1017 
+	 *
1018 
+	 */
1019 1019 
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
1020 1020 
 	{
1021 1021 
 		global $globalURL, $globalArchive, $globalDebug;
 
@@ -1158,10 +1158,10 @@  discard block
 
 block discarded – undo
1158 1158 
 		$arrival_airport_country = '';
1159 1159
1160 1160
1161 
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1162 
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1163 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1164 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1161 
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1162 
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1163 
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1164 
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1165 1165
1166 1166 
 		$query = '';
1167 1167 
 		if ($globalArchive) {
 
@@ -1182,10 +1182,10 @@  discard block
 
 block discarded – undo
1182 1182 
 			return "error : ".$e->getMessage();
1183 1183 
 		}
1184 1184 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1185 
-		    if ($globalDebug) echo '(Add to SBS archive : ';
1186 
-		    $SpotterArchive = new SpotterArchive($this->db);
1187 
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1188 
-		    if ($globalDebug) echo $result.')';
1185 
+			if ($globalDebug) echo '(Add to SBS archive : ';
1186 
+			$SpotterArchive = new SpotterArchive($this->db);
1187 
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1188 
+			if ($globalDebug) echo $result.')';
1189 1189 
 		} elseif ($globalDebug && $putinarchive !== true) {
1190 1190 
 			echo '(Not adding to archive)';
1191 1191 
 		} elseif ($globalDebug && $noarchive === true) {
Please login to merge, or discard this patch.
Spacing   +132 added lines, -132 removed lines patch added patch discarded remove patch 
@@ -17,62 +17,62 @@  discard block
 
 block discarded – undo
17 17 
 	* @param Array $filter the filter
18 18 
 	* @return Array the SQL part
19 19 
 	*/
20 
-	public function getFilter($filter = array(),$where = false,$and = false) {
20 
+	public function getFilter($filter = array(), $where = false, $and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
22 22 
 		$filters = array();
23 23 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
24 24 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
25 25 
 				$filters = $globalStatsFilters[$globalFilterName];
26 26 
 			} else {
27 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
27 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
28 28 
 			}
29 29 
 		}
30 30 
 		if (isset($filter[0]['source'])) {
31 
-			$filters = array_merge($filters,$filter);
31 
+			$filters = array_merge($filters, $filter);
32 32 
 		}
33 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
34 34 
 		$filter_query_join = '';
35 35 
 		$filter_query_where = '';
36 
-		foreach($filters as $flt) {
36 
+		foreach ($filters as $flt) {
37 37 
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
38 38 
 				if ($flt['airlines'][0] != '') {
39 39 
 					if (isset($flt['source'])) {
40 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
40 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
41 41 
 					} else {
42 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
42 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id";
43 43 
 					}
44 44 
 				}
45 45 
 			}
46 46 
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
47 47 
 				if (isset($flt['source'])) {
48 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
48 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
49 49 
 				} else {
50 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
50 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
51 51 
 				}
52 52 
 			}
53 53 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
54 54 
 				if (isset($flt['source'])) {
55 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
55 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
56 56 
 				} else {
57 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
57 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id";
58 58 
 				}
59 59 
 			}
60 60 
 			if (isset($flt['registrations']) && !empty($flt['registrations'])) {
61 61 
 				if (isset($flt['source'])) {
62 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
62 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
63 63 
 				} else {
64 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
64 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id";
65 65 
 				}
66 66 
 			}
67 67 
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
68 68 
 				if (isset($flt['source'])) {
69 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id";
69 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id";
70 70 
 				}
71 71 
 			}
72 72 
 		}
73 73 
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
74 74 
 			if ($filter['airlines'][0] != '') {
75 
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
75 
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
76 76 
 			}
77 77 
 		}
78 78 
 		if (isset($filter['alliance']) && !empty($filter['alliance'])) {
 
@@ -82,13 +82,13 @@  discard block
 
 block discarded – undo
82 82 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id ";
83 83 
 		}
84 84 
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
85 
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id";
85 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id";
86 86 
 		}
87 87 
 		if (isset($filter['source']) && !empty($filter['source'])) {
88 88 
 			if (count($filter['source']) == 1) {
89 89 
 				$filter_query_where .= " AND format_source = '".$filter['source'][0]."'";
90 90 
 			} else {
91 
-				$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
91 
+				$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
92 92 
 			}
93 93 
 		}
94 94 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 
@@ -118,15 +118,15 @@  discard block
 
 block discarded – undo
118 118 
 					$filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'";
119 119 
 				}
120 120 
 			}
121 
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
121 
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
122 122 
 		}
123 123 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
124 
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
124 
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
125 125 
 		}
126 126 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
127 127 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
128 128 
 		if ($filter_query_where != '') {
129 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
129 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
130 130 
 		}
131 131 
 		$filter_query = $filter_query_join.$filter_query_where;
132 132 
 		return $filter_query;
 
@@ -149,8 +149,8 @@  discard block
 
 block discarded – undo
149 149 
 		if ($limit != '')
150 150 
 		{
151 151 
 			$limit_array = explode(',', $limit);
152 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
153 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
152 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
153 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
154 154 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
155 155 
 			{
156 156 
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
 
@@ -174,7 +174,7 @@  discard block
 
 block discarded – undo
174 174 
 		} else {
175 175 
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
176 176 
 		}
177 
-		$spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true);
177 
+		$spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true);
178 178
179 179 
 		return $spotter_array;
180 180 
 	}
 
@@ -189,7 +189,7 @@  discard block
 
 block discarded – undo
189 189 
 	{
190 190 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
191 191 
 		date_default_timezone_set('UTC');
192 
-		$filter_query = $this->getFilter($filter,true,true);
192 
+		$filter_query = $this->getFilter($filter, true, true);
193 193 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
194 194 
 		if ($globalDBdriver == 'mysql') {
195 195 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 
@@ -212,7 +212,7 @@  discard block
 
 block discarded – undo
212 212 
 		try {
213 213 
 			$sth = $this->db->prepare($query);
214 214 
 			$sth->execute();
215 
-		} catch(PDOException $e) {
215 
+		} catch (PDOException $e) {
216 216 
 			echo $e->getMessage();
217 217 
 			die;
218 218 
 		}
 
@@ -226,19 +226,19 @@  discard block
 
 block discarded – undo
226 226 
 	* @return Array the spotter information
227 227 
 	*
228 228 
 	*/
229 
-	public function getMinLastLiveSpotterData($coord = array(),$filter = array(), $limit = false)
229 
+	public function getMinLastLiveSpotterData($coord = array(), $filter = array(), $limit = false)
230 230 
 	{
231 231 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DAircraftsLimit;
232 232 
 		date_default_timezone_set('UTC');
233 233 
 		$usecoord = false;
234 234 
 		if (is_array($coord) && !empty($coord)) {
235 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
236 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
237 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
238 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
235 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
236 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
237 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
238 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
239 239 
 			$usecoord = true;
240 240 
 		}
241 
-		$filter_query = $this->getFilter($filter,true,true);
241 
+		$filter_query = $this->getFilter($filter, true, true);
242 242
243 243 
 		if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200';
244 244 
 		if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300';
 
@@ -299,7 +299,7 @@  discard block
 
 block discarded – undo
299 299 
 		try {
300 300 
 			$sth = $this->db->prepare($query);
301 301 
 			$sth->execute();
302 
-		} catch(PDOException $e) {
302 
+		} catch (PDOException $e) {
303 303 
 			echo $e->getMessage();
304 304 
 			die;
305 305 
 		}
 
@@ -316,7 +316,7 @@  discard block
 
 block discarded – undo
316 316 
 	public function getLiveSpotterCount($filter = array())
317 317 
 	{
318 318 
 		global $globalDBdriver, $globalLiveInterval;
319 
-		$filter_query = $this->getFilter($filter,true,true);
319 
+		$filter_query = $this->getFilter($filter, true, true);
320 320
321 321 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
322 322 
 		if ($globalDBdriver == 'mysql') {
 
@@ -329,7 +329,7 @@  discard block
 
 block discarded – undo
329 329 
 		try {
330 330 
 			$sth = $this->db->prepare($query);
331 331 
 			$sth->execute();
332 
-		} catch(PDOException $e) {
332 
+		} catch (PDOException $e) {
333 333 
 			echo $e->getMessage();
334 334 
 			die;
335 335 
 		}
 
@@ -352,10 +352,10 @@  discard block
 
 block discarded – undo
352 352 
 		$filter_query = $this->getFilter($filter);
353 353
354 354 
 		if (is_array($coord)) {
355 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
356 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
357 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
358 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
355 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
356 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
357 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
358 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
359 359 
 		} else return array();
360 360 
 		if ($globalDBdriver == 'mysql') {
361 361 
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
 
@@ -378,23 +378,23 @@  discard block
 
 block discarded – undo
378 378 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
379 379 
 		$Spotter = new Spotter($this->db);
380 380 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
381 
-		$filter_query = $this->getFilter($filter,true,true);
381 
+		$filter_query = $this->getFilter($filter, true, true);
382 382
383 383 
 		if (is_array($coord)) {
384 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
385 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
386 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
387 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
384 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
385 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
386 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
387 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
388 388 
 		} else return array();
389 389 
 		if ($globalDBdriver == 'mysql') {
390 390 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
391 
-				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
391 
+				$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
392 392 
 				FROM spotter_live
393 393 
 				'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date
394 394 
 				AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.'
395 395 
 				AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0';
396 396 
 			} else {
397 
-				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
397 
+				$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
398 398 
 				FROM spotter_live
399 399 
 				INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate
400 400 
 				    FROM spotter_live l 
@@ -406,14 +406,14 @@  discard block
 
 block discarded – undo
406 406 
 			}
407 407 
 		} else {
408 408 
 			if (isset($globalArchive) && $globalArchive === TRUE) {
409 
-				$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
409 
+				$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
410 410 
 				FROM spotter_live
411 411 
 				".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date
412 412 
 				AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat."
413 413 
 				AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong."
414 414 
 				AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
415 415 
 			} else {
416 
-				$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
416 
+				$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source
417 417 
 				FROM spotter_live
418 418 
 				INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate
419 419 
 				    FROM spotter_live l 
@@ -428,7 +428,7 @@  discard block
 
 block discarded – undo
428 428 
 		try {
429 429 
 			$sth = $this->db->prepare($query);
430 430 
 			$sth->execute();
431 
-		} catch(PDOException $e) {
431 
+		} catch (PDOException $e) {
432 432 
 			echo $e->getMessage();
433 433 
 			die;
434 434 
 		}
 
@@ -477,7 +477,7 @@  discard block
 
 block discarded – undo
477 477 
                 if ($interval == '1m')
478 478 
                 {
479 479 
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
480 
-                } else if ($interval == '15m'){
480 
+                } else if ($interval == '15m') {
481 481 
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
482 482 
                 }
483 483 
             }
 
@@ -485,14 +485,14 @@  discard block
 
 block discarded – undo
485 485 
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
486 486 
         }
487 487
488 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
488 
+                $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live
489 489 
                    WHERE spotter_live.latitude <> ''
490 490 
                                    AND spotter_live.longitude <> ''
491 491 
                    ".$additional_query."
492 492 
                    HAVING distance < :radius
493 493 
                                    ORDER BY distance";
494 494
495 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
495 
+                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
496 496
497 497 
                 return $spotter_array;
498 498 
         }
 
@@ -510,9 +510,9 @@  discard block
 
 block discarded – undo
510 510 
 		date_default_timezone_set('UTC');
511 511
512 512 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
513 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
513 
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
514 514
515 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
515 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true);
516 516
517 517 
 		return $spotter_array;
518 518 
 	}
 
@@ -523,16 +523,16 @@  discard block
 
 block discarded – undo
523 523 
 	* @return Array the spotter information
524 524 
 	*
525 525 
 	*/
526 
-	public function getDateLiveSpotterDataByIdent($ident,$date)
526 
+	public function getDateLiveSpotterDataByIdent($ident, $date)
527 527 
 	{
528 528 
 		$Spotter = new Spotter($this->db);
529 529 
 		date_default_timezone_set('UTC');
530 530
531 531 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
532 
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
532 
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
533 533
534 
-                $date = date('c',$date);
535 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
534 
+                $date = date('c', $date);
535 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
536 536
537 537 
 		return $spotter_array;
538 538 
 	}
 
@@ -548,8 +548,8 @@  discard block
 
 block discarded – undo
548 548 
 		$Spotter = new Spotter($this->db);
549 549 
 		date_default_timezone_set('UTC');
550 550 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
551 
-		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
552 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
551 
+		$query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
552 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true);
553 553 
 		return $spotter_array;
554 554 
 	}
555 555 
 
@@ -559,15 +559,15 @@  discard block
 
 block discarded – undo
559 559 
 	* @return Array the spotter information
560 560 
 	*
561 561 
 	*/
562 
-	public function getDateLiveSpotterDataById($id,$date)
562 
+	public function getDateLiveSpotterDataById($id, $date)
563 563 
 	{
564 564 
 		$Spotter = new Spotter($this->db);
565 565 
 		date_default_timezone_set('UTC');
566 566
567 567 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
568 
-		$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
569 
-		$date = date('c',$date);
570 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
568 
+		$query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
569 
+		$date = date('c', $date);
570 
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
571 571 
 		return $spotter_array;
572 572 
 	}
573 573 
 
@@ -583,13 +583,13 @@  discard block
 
 block discarded – undo
583 583 
 		date_default_timezone_set('UTC');
584 584
585 585 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
586 
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
586 
+                $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
587 587
588 588 
     		try {
589 589
590 590 
 			$sth = $this->db->prepare($query);
591 591 
 			$sth->execute(array(':ident' => $ident));
592 
-		} catch(PDOException $e) {
592 
+		} catch (PDOException $e) {
593 593 
 			echo $e->getMessage();
594 594 
 			die;
595 595 
 		}
 
@@ -604,7 +604,7 @@  discard block
 
 block discarded – undo
604 604 
 	* @return Array the spotter information
605 605 
 	*
606 606 
 	*/
607 
-	public function getAllLiveSpotterDataById($id,$liveinterval = false)
607 
+	public function getAllLiveSpotterDataById($id, $liveinterval = false)
608 608 
 	{
609 609 
 		global $globalDBdriver, $globalLiveInterval;
610 610 
 		date_default_timezone_set('UTC');
 
@@ -623,7 +623,7 @@  discard block
 
 block discarded – undo
623 623 
 		try {
624 624 
 			$sth = $this->db->prepare($query);
625 625 
 			$sth->execute(array(':id' => $id));
626 
-		} catch(PDOException $e) {
626 
+		} catch (PDOException $e) {
627 627 
 			echo $e->getMessage();
628 628 
 			die;
629 629 
 		}
 
@@ -641,12 +641,12 @@  discard block
 
 block discarded – undo
641 641 
 	{
642 642 
 		date_default_timezone_set('UTC');
643 643 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
644 
-		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
644 
+		$query = self::$global_query.' WHERE spotter_live.ident = :ident';
645 645 
     		try {
646 646
647 647 
 			$sth = $this->db->prepare($query);
648 648 
 			$sth->execute(array(':ident' => $ident));
649 
-		} catch(PDOException $e) {
649 
+		} catch (PDOException $e) {
650 650 
 			echo $e->getMessage();
651 651 
 			die;
652 652 
 		}
 
@@ -676,7 +676,7 @@  discard block
 
 block discarded – undo
676 676
677 677 
 			$sth = $this->db->prepare($query);
678 678 
 			$sth->execute();
679 
-		} catch(PDOException $e) {
679 
+		} catch (PDOException $e) {
680 680 
 			return "error";
681 681 
 		}
682 682 
 
@@ -699,14 +699,14 @@  discard block
 
 block discarded – undo
699 699
700 700 
 				$sth = $this->db->prepare($query);
701 701 
 				$sth->execute();
702 
-			} catch(PDOException $e) {
702 
+			} catch (PDOException $e) {
703 703 
 				return "error";
704 704 
 			}
705 705 
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
706 706 
                         $i = 0;
707 
-                        $j =0;
707 
+                        $j = 0;
708 708 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
709 
-			foreach($all as $row)
709 
+			foreach ($all as $row)
710 710 
 			{
711 711 
 				$i++;
712 712 
 				$j++;
 
@@ -714,9 +714,9 @@  discard block
 
 block discarded – undo
714 714 
 					if ($globalDebug) echo ".";
715 715 
 				    	try {
716 716
717 
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
717 
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
718 718 
 						$sth->execute();
719 
-					} catch(PDOException $e) {
719 
+					} catch (PDOException $e) {
720 720 
 						return "error";
721 721 
 					}
722 722 
                                 	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
 
@@ -727,9 +727,9 @@  discard block
 
 block discarded – undo
727 727 
 			if ($i > 0) {
728 728 
     				try {
729 729
730 
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
730 
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
731 731 
 					$sth->execute();
732 
-				} catch(PDOException $e) {
732 
+				} catch (PDOException $e) {
733 733 
 					return "error";
734 734 
 				}
735 735 
 			}
 
@@ -742,7 +742,7 @@  discard block
 
 block discarded – undo
742 742
743 743 
 				$sth = $this->db->prepare($query);
744 744 
 				$sth->execute();
745 
-			} catch(PDOException $e) {
745 
+			} catch (PDOException $e) {
746 746 
 				return "error";
747 747 
 			}
748 748 
 /*			$query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN (";
 
@@ -790,13 +790,13 @@  discard block
 
 block discarded – undo
790 790 
 	public function deleteLiveSpotterDataByIdent($ident)
791 791 
 	{
792 792 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
793 
-		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
793 
+		$query = 'DELETE FROM spotter_live WHERE ident = :ident';
794 794
795 795 
     		try {
796 796
797 797 
 			$sth = $this->db->prepare($query);
798 798 
 			$sth->execute(array(':ident' => $ident));
799 
-		} catch(PDOException $e) {
799 
+		} catch (PDOException $e) {
800 800 
 			return "error";
801 801 
 		}
802 802 
 
@@ -812,13 +812,13 @@  discard block
 
 block discarded – undo
812 812 
 	public function deleteLiveSpotterDataById($id)
813 813 
 	{
814 814 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
815 
-		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
815 
+		$query = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
816 816
817 817 
     		try {
818 818
819 819 
 			$sth = $this->db->prepare($query);
820 820 
 			$sth->execute(array(':id' => $id));
821 
-		} catch(PDOException $e) {
821 
+		} catch (PDOException $e) {
822 822 
 			return "error";
823 823 
 		}
824 824 
 
@@ -836,13 +836,13 @@  discard block
 
 block discarded – undo
836 836 
 	{
837 837 
 		global $globalDBdriver, $globalTimezone;
838 838 
 		if ($globalDBdriver == 'mysql') {
839 
-			$query  = 'SELECT spotter_live.ident FROM spotter_live
839 
+			$query = 'SELECT spotter_live.ident FROM spotter_live
840 840 
 				WHERE spotter_live.ident = :ident
841 841 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
842 842 
 				AND spotter_live.date < UTC_TIMESTAMP()';
843 843 
 			$query_data = array(':ident' => $ident);
844 844 
 		} else {
845 
-			$query  = "SELECT spotter_live.ident FROM spotter_live
845 
+			$query = "SELECT spotter_live.ident FROM spotter_live
846 846 
 				WHERE spotter_live.ident = :ident
847 847 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
848 848 
 				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -851,8 +851,8 @@  discard block
 
 block discarded – undo
851 851
852 852 
 		$sth = $this->db->prepare($query);
853 853 
 		$sth->execute($query_data);
854 
-		$ident_result='';
855 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
854 
+		$ident_result = '';
855 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
856 856 
 		{
857 857 
 			$ident_result = $row['ident'];
858 858 
 		}
 
@@ -869,13 +869,13 @@  discard block
 
 block discarded – undo
869 869 
 	{
870 870 
 		global $globalDBdriver, $globalTimezone;
871 871 
 		if ($globalDBdriver == 'mysql') {
872 
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
872 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
873 873 
 				WHERE spotter_live.ident = :ident
874 874 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)';
875 875 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
876 876 
 			$query_data = array(':ident' => $ident);
877 877 
 		} else {
878 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
878 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
879 879 
 				WHERE spotter_live.ident = :ident
880 880 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
881 881 
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -884,8 +884,8 @@  discard block
 
 block discarded – undo
884 884
885 885 
 		$sth = $this->db->prepare($query);
886 886 
 		$sth->execute($query_data);
887 
-		$ident_result='';
888 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
887 
+		$ident_result = '';
888 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
889 889 
 		{
890 890 
 			$ident_result = $row['flightaware_id'];
891 891 
 		}
 
@@ -902,13 +902,13 @@  discard block
 
 block discarded – undo
902 902 
 	{
903 903 
 		global $globalDBdriver, $globalTimezone;
904 904 
 		if ($globalDBdriver == 'mysql') {
905 
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
905 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
906 906 
 				WHERE spotter_live.flightaware_id = :id
907 907 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)';
908 908 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
909 909 
 			$query_data = array(':id' => $id);
910 910 
 		} else {
911 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
911 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live
912 912 
 				WHERE spotter_live.flightaware_id = :id
913 913 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
914 914 
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
 
@@ -917,8 +917,8 @@  discard block
 
 block discarded – undo
917 917
918 918 
 		$sth = $this->db->prepare($query);
919 919 
 		$sth->execute($query_data);
920 
-		$ident_result='';
921 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
920 
+		$ident_result = '';
921 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
922 922 
 		{
923 923 
 			$ident_result = $row['flightaware_id'];
924 924 
 		}
 
@@ -935,13 +935,13 @@  discard block
 
 block discarded – undo
935 935 
 	{
936 936 
 		global $globalDBdriver, $globalTimezone;
937 937 
 		if ($globalDBdriver == 'mysql') {
938 
-			$query  = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
938 
+			$query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
939 939 
 				WHERE spotter_live.ModeS = :modes
940 940 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)';
941 941 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
942 942 
 			$query_data = array(':modes' => $modes);
943 943 
 		} else {
944 
-			$query  = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
944 
+			$query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live
945 945 
 				WHERE spotter_live.ModeS = :modes
946 946 
 				AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'";
947 947 
 //			//	AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 
@@ -950,8 +950,8 @@  discard block
 
 block discarded – undo
950 950
951 951 
 		$sth = $this->db->prepare($query);
952 952 
 		$sth->execute($query_data);
953 
-		$ident_result='';
954 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
953 
+		$ident_result = '';
954 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
955 955 
 		{
956 956 
 			//$ident_result = $row['spotter_live_id'];
957 957 
 			$ident_result = $row['flightaware_id'];
 
@@ -976,8 +976,8 @@  discard block
 
 block discarded – undo
976 976 
 				return false;
977 977 
 			} else {
978 978 
 				$q_array = explode(" ", $q);
979 
-				foreach ($q_array as $q_item){
980 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
979 
+				foreach ($q_array as $q_item) {
980 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
981 981 
 					$additional_query .= " AND (";
982 982 
 					$additional_query .= "(spotter_live.aircraft_icao like '%".$q_item."%') OR ";
983 983 
 					$additional_query .= "(spotter_live.aircraft_name like '%".$q_item."%') OR ";
 
@@ -992,11 +992,11 @@  discard block
 
 block discarded – undo
992 992 
 			}
993 993 
 		}
994 994 
 		if ($globalDBdriver == 'mysql') {
995 
-			$query  = "SELECT spotter_live.* FROM spotter_live
995 
+			$query = "SELECT spotter_live.* FROM spotter_live
996 996 
 			    WHERE spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
997 997 
 			    AND spotter_live.date < UTC_TIMESTAMP()";
998 998 
 		} else {
999 
-			$query  = "SELECT spotter_live.* FROM spotter_live
999 
+			$query = "SELECT spotter_live.* FROM spotter_live
1000 1000 
 			    WHERE spotter_live.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
1001 1001 
 			    AND spotter_live.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
1002 1002 
 		}
 
@@ -1016,7 +1016,7 @@  discard block
 
 block discarded – undo
1016 1016 
 	* @return String success or false
1017 1017 
 	*
1018 1018 
 	*/
1019 
-	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
1019 
+	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '')
1020 1020 
 	{
1021 1021 
 		global $globalURL, $globalArchive, $globalDebug;
1022 1022 
 		$Common = new Common();
 
@@ -1116,27 +1116,27 @@  discard block
 
 block discarded – undo
1116 1116 
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
1117 1117
1118 1118
1119 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
1120 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1121 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
1122 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1123 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1124 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1125 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1126 
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
1127 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1128 
-		$altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1129 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
1130 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1131 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
1132 
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
1133 
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
1134 
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
1135 
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
1136 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
1137 
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
1138 
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
1139 
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
1119 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
1120 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1121 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
1122 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1123 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1124 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1125 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1126 
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
1127 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1128 
+		$altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1129 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
1130 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1131 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
1132 
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
1133 
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
1134 
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
1135 
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
1136 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
1137 
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
1138 
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
1139 
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
1140 1140
1141 1141 
 		$airline_name = '';
1142 1142 
 		$airline_icao = '';
 
@@ -1158,10 +1158,10 @@  discard block
 
 block discarded – undo
1158 1158 
 		$arrival_airport_country = '';
1159 1159
1160 1160
1161 
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
1162 
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
1163 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
1164 
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
1161 
+            	if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
1162 
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
1163 
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
1164 
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
1165 1165
1166 1166 
 		$query = '';
1167 1167 
 		if ($globalArchive) {
 
@@ -1172,19 +1172,19 @@  discard block
 
 block discarded – undo
1172 1172 
 		$query  .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude)
1173 1173 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)';
1174 1174
1175 
-		$query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real);
1175 
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real);
1176 1176 
 		try {
1177 1177
1178 1178 
 			$sth = $this->db->prepare($query);
1179 1179 
 			$sth->execute($query_values);
1180 1180 
 			$sth->closeCursor();
1181 
-		} catch(PDOException $e) {
1181 
+		} catch (PDOException $e) {
1182 1182 
 			return "error : ".$e->getMessage();
1183 1183 
 		}
1184 1184 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
1185 1185 
 		    if ($globalDebug) echo '(Add to SBS archive : ';
1186 1186 
 		    $SpotterArchive = new SpotterArchive($this->db);
1187 
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
1187 
+		    $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country);
1188 1188 
 		    if ($globalDebug) echo $result.')';
1189 1189 
 		} elseif ($globalDebug && $putinarchive !== true) {
1190 1190 
 			echo '(Not adding to archive)';
 
@@ -1197,7 +1197,7 @@  discard block
 
 block discarded – undo
1197 1197
1198 1198 
 	public function getOrderBy()
1199 1199 
 	{
1200 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
1200 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
1201 1201 
 		return $orderby;
1202 1202 
 	}
1203 1203
Please login to merge, or discard this patch.
getLatestData-tv.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -5,14 +5,14 @@
 
 block discarded – undo
5 5 
 require_once('require/class.Language.php');
6 6
7 7 
 header('Content-Type: text/javascript');
8 
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
8 
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
9 9 
 $SpotterLive = new SpotterLive();
10 10 
 $spotter_array = $SpotterLive->getRealTimeData($q);
11 11
12 12 
 $output = '{';
13 13 
 $output .= '"flights": [';
14 14 
 if (!empty($spotter_array)) {
15 
-	foreach($spotter_array as $spotter_item)
15 
+	foreach ($spotter_array as $spotter_item)
16 16 
 	{
17 17 
 		$output .= '{';
18 18 
 		$output .= '"flight_id": "'.$spotter_item['spotter_id'].'",';
Please login to merge, or discard this patch.
tv.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -29,7 +29,7 @@  discard block
 
 block discarded – undo
29 29 
 <?php
30 30 
 if (isset($_GET['q']))
31 31 
 {
32 
-	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
32 
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
33 33 
 	$spotter_array = $Spotter->searchSpotterData($q, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
34 34 
 } else {
35 35 
 	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
 
@@ -148,18 +148,18 @@  discard block
 
 block discarded – undo
148 148
149 149 
 <?php
150 150 
 	if (isset($_GET['image']) && isset($_GET['q'])) {
151 
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
152 
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
151 
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
152 
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
153 153 
 ?>
154 154 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>&q=<?php print $q; ?>", function( data ) {
155 155 
 <?php
156 156 
 	} elseif (isset($_GET['image'])) {
157 
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
157 
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
158 158 
 ?>
159 159 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>", function( data ) {
160 160 
 <?php
161 161 
 	} elseif (isset($_GET['q'])) {
162 
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
162 
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
163 163 
 ?>
164 164 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&q=<?php print $q; ?>", function( data ) {
165 165 
 <?php
Please login to merge, or discard this patch.