View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 1e2e0c...2114bf )
by Yannick
06:34
created
Status
Category
Toggle Patches
require/class.Stats.php 1 patch
Spacing   +312 added lines, -312 removed lines patch added patch discarded remove patch 
@@ -17,14 +17,14 @@  discard block
 
 block discarded – undo
17 17 
 		$this->db = $Connection->db();
18 18 
         }
19 19
20 
-	public function addLastStatsUpdate($type,$stats_date) {
20 
+	public function addLastStatsUpdate($type, $stats_date) {
21 21 
                 $query = "DELETE FROM config WHERE name = :type;
22 22 
             		INSERT INTO config (name,value) VALUES (:type,:stats_date);";
23 
-                $query_values = array('type' => $type,':stats_date' => $stats_date);
23 
+                $query_values = array('type' => $type, ':stats_date' => $stats_date);
24 24 
                  try {
25 25 
                         $sth = $this->db->prepare($query);
26 26 
                         $sth->execute($query_values);
27 
-                } catch(PDOException $e) {
27 
+                } catch (PDOException $e) {
28 28 
                         return "error : ".$e->getMessage();
29 29 
                 }
30 30 
         }
 
@@ -34,7 +34,7 @@  discard block
 
 block discarded – undo
34 34 
                  try {
35 35 
                         $sth = $this->db->prepare($query);
36 36 
                         $sth->execute(array(':type' => $type));
37 
-                } catch(PDOException $e) {
37 
+                } catch (PDOException $e) {
38 38 
                         echo "error : ".$e->getMessage();
39 39 
                 }
40 40 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
                  try {
55 55 
                         $sth = $this->db->prepare($query);
56 56 
                         $sth->execute(array(':filter_name' => $filter_name));
57 
-                } catch(PDOException $e) {
57 
+                } catch (PDOException $e) {
58 58 
                         return "error : ".$e->getMessage();
59 59 
                 }
60 60 
         }
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
                  try {
65 65 
                         $sth = $this->db->prepare($query);
66 66 
                         $sth->execute();
67 
-                } catch(PDOException $e) {
67 
+                } catch (PDOException $e) {
68 68 
                         return "error : ".$e->getMessage();
69 69 
                 }
70 70 
                 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
                  try {
73 73 
                         $sth = $this->db->prepare($query);
74 74 
                         $sth->execute(array(':filter_name' => $filter_name));
75 
-                } catch(PDOException $e) {
75 
+                } catch (PDOException $e) {
76 76 
                         return "error : ".$e->getMessage();
77 77 
                 }
78 78 
         }
 
@@ -82,43 +82,43 @@  discard block
 
 block discarded – undo
82 82 
                  try {
83 83 
                         $sth = $this->db->prepare($query);
84 84 
                         $sth->execute(array(':filter_name' => $filter_name));
85 
-                } catch(PDOException $e) {
85 
+                } catch (PDOException $e) {
86 86 
                         echo "error : ".$e->getMessage();
87 87 
                 }
88 88 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
89 89 
                 return $all;
90 90 
         }
91 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
91 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
92 92 
 		if ($filter_name == '') $filter_name = $this->filter_name;
93 93 
                 $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
94 94 
                  try {
95 95 
                         $sth = $this->db->prepare($query);
96 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
97 
-                } catch(PDOException $e) {
96 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
97 
+                } catch (PDOException $e) {
98 98 
                         echo "error : ".$e->getMessage();
99 99 
                 }
100 100 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
101 101 
                 return $all;
102 102 
         }
103 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
103 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
104 104 
 		if ($filter_name == '') $filter_name = $this->filter_name;
105 105 
                 $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";
106 106 
                  try {
107 107 
                         $sth = $this->db->prepare($query);
108 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
109 
-                } catch(PDOException $e) {
108 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
109 
+                } catch (PDOException $e) {
110 110 
                         echo "error : ".$e->getMessage();
111 111 
                 }
112 112 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
113 113 
                 return $all;
114 114 
         }
115 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
115 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
116 116 
 		if ($filter_name == '') $filter_name = $this->filter_name;
117 117 
                 $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";
118 118 
                  try {
119 119 
                         $sth = $this->db->prepare($query);
120 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
121 
-                } catch(PDOException $e) {
120 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
121 
+                } catch (PDOException $e) {
122 122 
                         echo "error : ".$e->getMessage();
123 123 
                 }
124 124 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -133,22 +133,22 @@  discard block
 
 block discarded – undo
133 133 
 		else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
134 134 
                  try {
135 135 
                         $sth = $this->db->prepare($query);
136 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
137 
-                } catch(PDOException $e) {
136 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
137 
+                } catch (PDOException $e) {
138 138 
                         echo "error : ".$e->getMessage();
139 139 
                 }
140 140 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
141 141 
                 if (empty($all)) {
142 142 
             	    $filters = array('airlines' => array($stats_airline));
143 143 
             	    if ($filter_name != '') {
144 
-            		    $filters = array_merge($filters,$globalStatsFilters[$filter_name]);
144 
+            		    $filters = array_merge($filters, $globalStatsFilters[$filter_name]);
145 145 
             	    }
146 146 
             	    $Spotter = new Spotter($this->db);
147 
-            	    $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
147 
+            	    $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
148 148 
                 }
149 149 
                 return $all;
150 150 
 	}
151 
-	public function countAllAirlineCountries($limit = true,$filter_name = '') {
151 
+	public function countAllAirlineCountries($limit = true, $filter_name = '') {
152 152 
 		global $globalStatsFilters;
153 153 
 		if ($filter_name == '') $filter_name = $this->filter_name;
154 154 
 		if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count FROM stats_airline,airlines WHERE stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
 
@@ -156,7 +156,7 @@  discard block
 
 block discarded – undo
156 156 
                  try {
157 157 
                         $sth = $this->db->prepare($query);
158 158 
                         $sth->execute(array(':filter_name' => $filter_name));
159 
-                } catch(PDOException $e) {
159 
+                } catch (PDOException $e) {
160 160 
                         echo "error : ".$e->getMessage();
161 161 
                 }
162 162 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -164,28 +164,28 @@  discard block
 
 block discarded – undo
164 164 
             		$Spotter = new Spotter($this->db);
165 165 
             		$filters = array();
166 166 
             		if ($filter_name != '') {
167 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
167 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
168 168 
 			}
169 
-            		$all = $Spotter->countAllAirlineCountries($limit,$filters);
169 
+            		$all = $Spotter->countAllAirlineCountries($limit, $filters);
170 170 
                 }
171 171 
                 return $all;
172 172 
 	}
173 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '') {
173 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '') {
174 174 
 		global $globalStatsFilters;
175 175 
 		if ($filter_name == '') $filter_name = $this->filter_name;
176 176 
 		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";
177 177 
 		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";
178 178 
                  try {
179 179 
                         $sth = $this->db->prepare($query);
180 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
181 
-                } catch(PDOException $e) {
180 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
181 
+                } catch (PDOException $e) {
182 182 
                         echo "error : ".$e->getMessage();
183 183 
                 }
184 184 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
185 185 
                 if (empty($all)) {
186 186 
             		$filters = array('airlines' => array($stats_airline));
187 187 
             		if ($filter_name != '') {
188 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
188 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
189 189 
 			}
190 190 
             		$Spotter = new Spotter($this->db);
191 191 
 			$all = $Spotter->countAllAircraftManufacturers($filters);
 
@@ -200,18 +200,18 @@  discard block
 
 block discarded – undo
200 200 
 		else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country ORDER BY airport_arrival_country_count DESC";
201 201 
                  try {
202 202 
                         $sth = $this->db->prepare($query);
203 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
204 
-                } catch(PDOException $e) {
203 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
204 
+                } catch (PDOException $e) {
205 205 
                         echo "error : ".$e->getMessage();
206 206 
                 }
207 207 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
208 208 
                 if (empty($all)) {
209 209 
 			$filters = array('airlines' => array($stats_airline));
210 210 
 			if ($filter_name != '') {
211 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212 
 			}
213 213 
 			$Spotter = new Spotter($this->db);
214 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
214 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
215 215 
                 }
216 216 
                 return $all;
217 217 
 	}
 
@@ -222,15 +222,15 @@  discard block
 
 block discarded – undo
222 222 
 		else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count FROM stats_airport WHERE stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country ORDER BY airport_departure_country_count DESC";
223 223 
                  try {
224 224 
                         $sth = $this->db->prepare($query);
225 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
226 
-                } catch(PDOException $e) {
225 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
226 
+                } catch (PDOException $e) {
227 227 
                         echo "error : ".$e->getMessage();
228 228 
                 }
229 229 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
230 230 
                 if (empty($all)) {
231 231 
 			$filters = array('airlines' => array($stats_airline));
232 232 
 			if ($filter_name != '') {
233 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
233 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
234 234 
 			}
235 235 
 			$Spotter = new Spotter($this->db);
236 236 
 			$all = $Spotter->countAllDepartureCountries($filters);
 
@@ -238,7 +238,7 @@  discard block
 
 block discarded – undo
238 238 
                 return $all;
239 239 
 	}
240 240
241 
-	public function countAllAirlines($limit = true,$filter_name = '') {
241 
+	public function countAllAirlines($limit = true, $filter_name = '') {
242 242 
 		global $globalStatsFilters;
243 243 
 		if ($filter_name == '') $filter_name = $this->filter_name;
244 244 
 		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 ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
 
@@ -246,7 +246,7 @@  discard block
 
 block discarded – undo
246 246 
                  try {
247 247 
                         $sth = $this->db->prepare($query);
248 248 
                         $sth->execute(array(':filter_name' => $filter_name));
249 
-                } catch(PDOException $e) {
249 
+                } catch (PDOException $e) {
250 250 
                         echo "error : ".$e->getMessage();
251 251 
                 }
252 252 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -254,58 +254,58 @@  discard block
 
 block discarded – undo
254 254 
 	                $Spotter = new Spotter($this->db);
255 255 
             		$filters = array();
256 256 
             		if ($filter_name != '') {
257 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
257 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
258 258 
 			}
259 259
260 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
260 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
261 261 
                 }
262 262 
                 return $all;
263 263 
 	}
264 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '') {
264 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '') {
265 265 
 		global $globalStatsFilters;
266 266 
 		if ($filter_name == '') $filter_name = $this->filter_name;
267 267 
 		if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
268 268 
 		else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
269 269 
                  try {
270 270 
                         $sth = $this->db->prepare($query);
271 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
272 
-                } catch(PDOException $e) {
271 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
272 
+                } catch (PDOException $e) {
273 273 
                         echo "error : ".$e->getMessage();
274 274 
                 }
275 275 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
276 276 
                 if (empty($all)) {
277 277 
 			$filters = array('airlines' => array($stats_airline));
278 278 
 			if ($filter_name != '') {
279 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
279 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
280 280 
 			}
281 281 
 	                $Spotter = new Spotter($this->db);
282 
-    		        $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
282 
+    		        $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
283 283 
                 }
284 284 
                 return $all;
285 285 
 	}
286 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '') {
286 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '') {
287 287 
 		global $globalStatsFilters;
288 288 
 		if ($filter_name == '') $filter_name = $this->filter_name;
289 289 
 		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";
290 290 
 		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";
291 291 
 		 try {
292 292 
 			$sth = $this->db->prepare($query);
293 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
294 
-		} catch(PDOException $e) {
293 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
294 
+		} catch (PDOException $e) {
295 295 
 			echo "error : ".$e->getMessage();
296 296 
 		}
297 297 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
298 298 
 		if (empty($all)) {
299 299 
 			$filters = array('airlines' => array($stats_airline));
300 300 
 			if ($filter_name != '') {
301 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
301 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
302 302 
 			}
303 303 
 			$Spotter = new Spotter($this->db);
304 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
304 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
305 305 
 		}
306 306 
 		return $all;
307 307 
 	}
308 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '') {
308 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '') {
309 309 
 		$Connection = new Connection();
310 310 
 		if ($filter_name == '') $filter_name = $this->filter_name;
311 311 
 		if ($Connection->tableExists('countries')) {
 
@@ -313,8 +313,8 @@  discard block
 
 block discarded – undo
313 313 
 			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";
314 314 
 			 try {
315 315 
 				$sth = $this->db->prepare($query);
316 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
317 
-			} catch(PDOException $e) {
316 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
317 
+			} catch (PDOException $e) {
318 318 
 				echo "error : ".$e->getMessage();
319 319 
 			}
320 320 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -329,70 +329,70 @@  discard block
 
 block discarded – undo
329 329 
 			return array();
330 330 
 		}
331 331 
 	}
332 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '') {
332 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '') {
333 333 
 		global $globalStatsFilters;
334 334 
 		if ($filter_name == '') $filter_name = $this->filter_name;
335 335 
 		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";
336 336 
 		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";
337 337 
                  try {
338 338 
                         $sth = $this->db->prepare($query);
339 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
340 
-                } catch(PDOException $e) {
339 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
340 
+                } catch (PDOException $e) {
341 341 
                         echo "error : ".$e->getMessage();
342 342 
                 }
343 343 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
344 344 
                 if (empty($all)) {
345 345 
 			$filters = array('airlines' => array($stats_airline));
346 346 
 			if ($filter_name != '') {
347 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
347 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
348 348 
 			}
349 349 
             		$Spotter = new Spotter($this->db);
350 
-            		$all = $Spotter->countAllPilots($limit,0,'',$filters);
350 
+            		$all = $Spotter->countAllPilots($limit, 0, '', $filters);
351 351 
                 }
352 352 
                 return $all;
353 353 
 	}
354 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '') {
354 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '') {
355 355 
 		global $globalStatsFilters;
356 356 
 		if ($filter_name == '') $filter_name = $this->filter_name;
357 357 
 		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";
358 358 
 		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";
359 359 
                  try {
360 360 
                         $sth = $this->db->prepare($query);
361 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
362 
-                } catch(PDOException $e) {
361 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
362 
+                } catch (PDOException $e) {
363 363 
                         echo "error : ".$e->getMessage();
364 364 
                 }
365 365 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
366 366 
                 if (empty($all)) {
367 367 
 			$filters = array('airlines' => array($stats_airline));
368 368 
 			if ($filter_name != '') {
369 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
369 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
370 370 
 			}
371 371 
             		$Spotter = new Spotter($this->db);
372 
-            		$all = $Spotter->countAllOwners($limit,0,'',$filters);
372 
+            		$all = $Spotter->countAllOwners($limit, 0, '', $filters);
373 373 
                 }
374 374 
                 return $all;
375 375 
 	}
376 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '') {
376 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '') {
377 377 
 		global $globalStatsFilters;
378 378 
 		if ($filter_name == '') $filter_name = $this->filter_name;
379 379 
 		if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
380 380 
 		else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count FROM stats_airport WHERE departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
381 381 
                  try {
382 382 
                         $sth = $this->db->prepare($query);
383 
-                        $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
384 
-                } catch(PDOException $e) {
383 
+                        $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
384 
+                } catch (PDOException $e) {
385 385 
                         echo "error : ".$e->getMessage();
386 386 
                 }
387 387 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
388 388 
                 if (empty($all)) {
389 389 
 			$filters = array('airlines' => array($stats_airline));
390 390 
             		if ($filter_name != '') {
391 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
391 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
392 392 
 			}
393 393 
             		$Spotter = new Spotter($this->db);
394 
-            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
395 
-        		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
394 
+            		$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
395 
+        		$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
396 396 
         		$all = array();
397 397 
         		foreach ($pall as $value) {
398 398 
         			$icao = $value['airport_departure_icao'];
 
@@ -409,30 +409,30 @@  discard block
 
 block discarded – undo
409 409 
         		foreach ($all as $key => $row) {
410 410 
         			$count[$key] = $row['airport_departure_icao_count'];
411 411 
         		}
412 
-        		array_multisort($count,SORT_DESC,$all);
412 
+        		array_multisort($count, SORT_DESC, $all);
413 413 
                 }
414 414 
                 return $all;
415 415 
 	}
416 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '') {
416 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '') {
417 417 
 		global $globalStatsFilters;
418 418 
 		if ($filter_name == '') $filter_name = $this->filter_name;
419 419 
 		if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
420 420 
 		else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count FROM stats_airport WHERE arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
421 421 
 		try {
422 422 
 			$sth = $this->db->prepare($query);
423 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
424 
-		} catch(PDOException $e) {
423 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
424 
+		} catch (PDOException $e) {
425 425 
 			echo "error : ".$e->getMessage();
426 426 
 		}
427 427 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
428 428 
 		if (empty($all)) {
429 429 
 			$filters = array('airlines' => array($stats_airline));
430 430 
 			if ($filter_name != '') {
431 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
431 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
432 432 
 			}
433 433 
 			$Spotter = new Spotter($this->db);
434 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
435 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
434 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
435 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
436 436 
         		$all = array();
437 437 
         		foreach ($pall as $value) {
438 438 
         			$icao = $value['airport_arrival_icao'];
 
@@ -449,12 +449,12 @@  discard block
 
 block discarded – undo
449 449 
         		foreach ($all as $key => $row) {
450 450 
         			$count[$key] = $row['airport_arrival_icao_count'];
451 451 
         		}
452 
-        		array_multisort($count,SORT_DESC,$all);
452 
+        		array_multisort($count, SORT_DESC, $all);
453 453 
                 }
454 454
455 455 
                 return $all;
456 456 
 	}
457 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
457 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
458 458 
 		global $globalDBdriver, $globalStatsFilters;
459 459 
 		if ($filter_name == '') $filter_name = $this->filter_name;
460 460 
 		if ($globalDBdriver == 'mysql') {
 
@@ -464,18 +464,18 @@  discard block
 
 block discarded – undo
464 464 
 			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";
465 465 
 			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";
466 466 
 		}
467 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
467 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
468 468 
                  try {
469 469 
                         $sth = $this->db->prepare($query);
470 470 
                         $sth->execute($query_data);
471 
-                } catch(PDOException $e) {
471 
+                } catch (PDOException $e) {
472 472 
                         echo "error : ".$e->getMessage();
473 473 
                 }
474 474 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
475 475 
                 if (empty($all)) {
476 476 
 			$filters = array('airlines' => array($stats_airline));
477 477 
 			if ($filter_name != '') {
478 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
478 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
479 479 
 			}
480 480 
             		$Spotter = new Spotter($this->db);
481 481 
             		$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -484,29 +484,29 @@  discard block
 
 block discarded – undo
484 484 
                 return $all;
485 485 
 	}
486 486
487 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
487 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
488 488 
 		global $globalStatsFilters;
489 489 
 		if ($filter_name == '') $filter_name = $this->filter_name;
490 490 
 		$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";
491 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
491 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
492 492 
                  try {
493 493 
                         $sth = $this->db->prepare($query);
494 494 
                         $sth->execute($query_data);
495 
-                } catch(PDOException $e) {
495 
+                } catch (PDOException $e) {
496 496 
                         echo "error : ".$e->getMessage();
497 497 
                 }
498 498 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
499 499 
                 if (empty($all)) {
500 500 
 			$filters = array('airlines' => array($stats_airline));
501 501 
 			if ($filter_name != '') {
502 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
502 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
503 503 
 			}
504 504 
             		$Spotter = new Spotter($this->db);
505 505 
             		$all = $Spotter->countAllDatesLastMonth($filters);
506 506 
                 }
507 507 
                 return $all;
508 508 
 	}
509 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
509 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
510 510 
 		global $globalDBdriver, $globalStatsFilters;
511 511 
 		if ($filter_name == '') $filter_name = $this->filter_name;
512 512 
 		if ($globalDBdriver == 'mysql') {
 
@@ -514,40 +514,40 @@  discard block
 
 block discarded – undo
514 514 
 		} else {
515 515 
 			$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";
516 516 
 		}
517 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
517 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
518 518 
                  try {
519 519 
                         $sth = $this->db->prepare($query);
520 520 
                         $sth->execute($query_data);
521 
-                } catch(PDOException $e) {
521 
+                } catch (PDOException $e) {
522 522 
                         echo "error : ".$e->getMessage();
523 523 
                 }
524 524 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
525 525 
                 if (empty($all)) {
526 526 
 			$filters = array('airlines' => array($stats_airline));
527 527 
 			if ($filter_name != '') {
528 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
528 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
529 529 
 			}
530 530 
             		$Spotter = new Spotter($this->db);
531 531 
             		$all = $Spotter->countAllDatesLast7Days($filters);
532 532 
                 }
533 533 
                 return $all;
534 534 
 	}
535 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
535 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
536 536 
 		global $globalStatsFilters;
537 537 
 		if ($filter_name == '') $filter_name = $this->filter_name;
538 538 
 		$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";
539 
-		$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
539 
+		$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
540 540 
                  try {
541 541 
                         $sth = $this->db->prepare($query);
542 542 
                         $sth->execute($query_data);
543 
-                } catch(PDOException $e) {
543 
+                } catch (PDOException $e) {
544 544 
                         echo "error : ".$e->getMessage();
545 545 
                 }
546 546 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
547 547 
                 if (empty($all)) {
548 548 
 			$filters = array('airlines' => array($stats_airline));
549 549 
 			if ($filter_name != '') {
550 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
550 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
551 551 
 			}
552 552 
             		$Spotter = new Spotter($this->db);
553 553 
             		$all = $Spotter->countAllDates($filters);
 
@@ -562,35 +562,35 @@  discard block
 
 block discarded – undo
562 562 
                  try {
563 563 
                         $sth = $this->db->prepare($query);
564 564 
                         $sth->execute($query_data);
565 
-                } catch(PDOException $e) {
565 
+                } catch (PDOException $e) {
566 566 
                         echo "error : ".$e->getMessage();
567 567 
                 }
568 568 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
569 569 
                 if (empty($all)) {
570 570 
             		$filters = array();
571 571 
             		if ($filter_name != '') {
572 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
572 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
573 573 
 			}
574 574 
             		$Spotter = new Spotter($this->db);
575 575 
             		$all = $Spotter->countAllDatesByAirlines($filters);
576 576 
                 }
577 577 
                 return $all;
578 578 
 	}
579 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
579 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
580 580 
 		global $globalStatsFilters;
581 581 
 		if ($filter_name == '') $filter_name = $this->filter_name;
582 582 
 	    	$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
583 583 
                  try {
584 584 
                         $sth = $this->db->prepare($query);
585 585 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
586 
-                } catch(PDOException $e) {
586 
+                } catch (PDOException $e) {
587 587 
                         echo "error : ".$e->getMessage();
588 588 
                 }
589 589 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
590 590 
                 if (empty($all)) {
591 591 
 			$filters = array('airlines' => array($stats_airline));
592 592 
 			if ($filter_name != '') {
593 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
593 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
594 594 
 			}
595 595 
             		$Spotter = new Spotter($this->db);
596 596 
             		$all = $Spotter->countAllMonths($filters);
 
@@ -604,21 +604,21 @@  discard block
 
 block discarded – undo
604 604 
                  try {
605 605 
                         $sth = $this->db->prepare($query);
606 606 
                         $sth->execute(array(':filter_name' => $filter_name));
607 
-                } catch(PDOException $e) {
607 
+                } catch (PDOException $e) {
608 608 
                         echo "error : ".$e->getMessage();
609 609 
                 }
610 610 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
611 611 
                 if (empty($all)) {
612 612 
             		$filters = array();
613 613 
             		if ($filter_name != '') {
614 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
614 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
615 615 
 			}
616 616 
             		$Spotter = new Spotter($this->db);
617 617 
             		$all = $Spotter->countAllMilitaryMonths($filters);
618 618 
                 }
619 619 
                 return $all;
620 620 
 	}
621 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
621 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
622 622 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
623 623 
 		if ($filter_name == '') $filter_name = $this->filter_name;
624 624 
 		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";
 
@@ -635,17 +635,17 @@  discard block
 
 block discarded – undo
635 635 
                  try {
636 636 
                         $sth = $this->db->prepare($query);
637 637 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
638 
-                } catch(PDOException $e) {
638 
+                } catch (PDOException $e) {
639 639 
                         echo "error : ".$e->getMessage();
640 640 
                 }
641 641 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
642 642 
                 if (empty($all)) {
643 643 
 			$filters = array('airlines' => array($stats_airline));
644 644 
 			if ($filter_name != '') {
645 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
645 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
646 646 
 			}
647 647 
             		$Spotter = new Spotter($this->db);
648 
-            		$all = $Spotter->countAllHours($orderby,$filters);
648 
+            		$all = $Spotter->countAllHours($orderby, $filters);
649 649 
                 }
650 650 
                 return $all;
651 651 
 	}
 
@@ -653,11 +653,11 @@  discard block
 
 block discarded – undo
653 653 
 	public function countOverallFlights($stats_airline = '', $filter_name = '') {
654 654 
 		global $globalStatsFilters;
655 655 
 		if ($filter_name == '') $filter_name = $this->filter_name;
656 
-		$all = $this->getSumStats('flights_bymonth',date('Y'),$stats_airline,$filter_name);
656 
+		$all = $this->getSumStats('flights_bymonth', date('Y'), $stats_airline, $filter_name);
657 657 
 		if (empty($all)) {
658 658 
 			$filters = array('airlines' => array($stats_airline));
659 659 
 			if ($filter_name != '') {
660 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
660 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
661 661 
 			}
662 662 
 			$Spotter = new Spotter($this->db);
663 663 
 			$all = $Spotter->countOverallFlights($filters);
 
@@ -667,39 +667,39 @@  discard block
 
 block discarded – undo
667 667 
 	public function countOverallMilitaryFlights($filter_name = '') {
668 668 
 		global $globalStatsFilters;
669 669 
 		if ($filter_name == '') $filter_name = $this->filter_name;
670 
-		$all = $this->getSumStats('military_flights_bymonth',date('Y'),'',$filter_name);
670 
+		$all = $this->getSumStats('military_flights_bymonth', date('Y'), '', $filter_name);
671 671 
 		if (empty($all)) {
672 672 
 		        $filters = array();
673 673 
             		if ($filter_name != '') {
674 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
674 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
675 675 
 			}
676 676 
 			$Spotter = new Spotter($this->db);
677 677 
 			$all = $Spotter->countOverallMilitaryFlights($filters);
678 678 
 		}
679 679 
 		return $all;
680 680 
 	}
681 
-	public function countOverallArrival($stats_airline = '',$filter_name = '') {
681 
+	public function countOverallArrival($stats_airline = '', $filter_name = '') {
682 682 
 		global $globalStatsFilters;
683 683 
 		if ($filter_name == '') $filter_name = $this->filter_name;
684 
-		$all = $this->getSumStats('realarrivals_bymonth',date('Y'),$stats_airline,$filter_name);
684 
+		$all = $this->getSumStats('realarrivals_bymonth', date('Y'), $stats_airline, $filter_name);
685 685 
 		if (empty($all)) {
686 686 
 			$filters = array('airlines' => array($stats_airline));
687 687 
 			if ($filter_name != '') {
688 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
688 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
689 689 
 			}
690 690 
 			$Spotter = new Spotter($this->db);
691 691 
 			$all = $Spotter->countOverallArrival($filters);
692 692 
 		}
693 693 
 		return $all;
694 694 
 	}
695 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '') {
695 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '') {
696 696 
 		global $globalStatsFilters;
697 697 
 		if ($filter_name == '') $filter_name = $this->filter_name;
698 
-		$all = $this->getSumStats('aircrafts_bymonth',date('Y'),$stats_airline,$filter_name);
698 
+		$all = $this->getSumStats('aircrafts_bymonth', date('Y'), $stats_airline, $filter_name);
699 699 
 		if (empty($all)) {
700 700 
 			$filters = array('airlines' => array($stats_airline));
701 701 
 			if ($filter_name != '') {
702 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
702 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
703 703 
 			}
704 704 
 			$Spotter = new Spotter($this->db);
705 705 
 			$all = $Spotter->countOverallAircrafts($filters);
 
@@ -713,7 +713,7 @@  discard block
 
 block discarded – undo
713 713 
                  try {
714 714 
                         $sth = $this->db->prepare($query);
715 715 
                         $sth->execute(array(':filter_name' => $filter_name));
716 
-                } catch(PDOException $e) {
716 
+                } catch (PDOException $e) {
717 717 
                         echo "error : ".$e->getMessage();
718 718 
                 }
719 719 
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -722,14 +722,14 @@  discard block
 
 block discarded – undo
722 722 
 		if (empty($all)) {
723 723 
             		$filters = array();
724 724 
             		if ($filter_name != '') {
725 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
725 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
726 726 
 			}
727 727 
 			$Spotter = new Spotter($this->db);
728 728 
 			$all = $Spotter->countOverallAirlines($filters);
729 729 
 		}
730 730 
 		return $all;
731 731 
 	}
732 
-	public function countOverallOwners($stats_airline = '',$filter_name = '') {
732 
+	public function countOverallOwners($stats_airline = '', $filter_name = '') {
733 733 
 		global $globalStatsFilters;
734 734 
 		if ($filter_name == '') $filter_name = $this->filter_name;
735 735 
 		/*
 
@@ -743,25 +743,25 @@  discard block
 
 block discarded – undo
743 743 
                 $result = $sth->fetchAll(PDO::FETCH_ASSOC);
744 744 
                 $all = $result[0]['nb_owner'];
745 745 
                 */
746 
-		$all = $this->getSumStats('owners_bymonth',date('Y'),$stats_airline,$filter_name);
746 
+		$all = $this->getSumStats('owners_bymonth', date('Y'), $stats_airline, $filter_name);
747 747 
 		if (empty($all)) {
748 748 
 			$filters = array('airlines' => array($stats_airline));
749 749 
 			if ($filter_name != '') {
750 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
750 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
751 751 
 			}
752 752 
 			$Spotter = new Spotter($this->db);
753 753 
 			$all = $Spotter->countOverallOwners($filters);
754 754 
 		}
755 755 
 		return $all;
756 756 
 	}
757 
-	public function countOverallPilots($stats_airline = '',$filter_name = '') {
757 
+	public function countOverallPilots($stats_airline = '', $filter_name = '') {
758 758 
 		global $globalStatsFilters;
759 759 
 		if ($filter_name == '') $filter_name = $this->filter_name;
760 
-		$all = $this->getSumStats('pilots_bymonth',date('Y'),$stats_airline,$filter_name);
760 
+		$all = $this->getSumStats('pilots_bymonth', date('Y'), $stats_airline, $filter_name);
761 761 
 		if (empty($all)) {
762 762 
 			$filters = array('airlines' => array($stats_airline));
763 763 
 			if ($filter_name != '') {
764 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
764 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
765 765 
 			}
766 766 
 			$Spotter = new Spotter($this->db);
767 767 
 			$all = $Spotter->countOverallPilots($filters);
 
@@ -769,33 +769,33 @@  discard block
 
 block discarded – undo
769 769 
 		return $all;
770 770 
 	}
771 771
772 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
772 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
773 773 
 		if ($filter_name == '') $filter_name = $this->filter_name;
774 774 
 		$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";
775 
-		$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
775 
+		$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
776 776 
                  try {
777 777 
                         $sth = $this->db->prepare($query);
778 778 
                         $sth->execute($query_values);
779 
-                } catch(PDOException $e) {
779 
+                } catch (PDOException $e) {
780 780 
                         echo "error : ".$e->getMessage();
781 781 
                 }
782 782 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
783 783 
                 return $all;
784 784 
 	}
785 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
785 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
786 786 
 		if ($filter_name == '') $filter_name = $this->filter_name;
787 787 
                 $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
788 
-                $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
788 
+                $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
789 789 
                  try {
790 790 
                         $sth = $this->db->prepare($query);
791 791 
                         $sth->execute($query_values);
792 
-                } catch(PDOException $e) {
792 
+                } catch (PDOException $e) {
793 793 
                         echo "error : ".$e->getMessage();
794 794 
                 }
795 795 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
796 796 
                 return $all;
797 797 
         }
798 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '') {
798 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '') {
799 799 
 		if ($filter_name == '') $filter_name = $this->filter_name;
800 800 
     		global $globalArchiveMonths, $globalDBdriver;
801 801 
     		if ($globalDBdriver == 'mysql') {
 
@@ -803,11 +803,11 @@  discard block
 
 block discarded – undo
803 803 
 	        } else {
804 804 
             		$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";
805 805 
                 }
806 
-                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
806 
+                $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
807 807 
                  try {
808 808 
                         $sth = $this->db->prepare($query);
809 809 
                         $sth->execute($query_values);
810 
-                } catch(PDOException $e) {
810 
+                } catch (PDOException $e) {
811 811 
                         echo "error : ".$e->getMessage();
812 812 
                 }
813 813 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -825,7 +825,7 @@  discard block
 
 block discarded – undo
825 825 
                  try {
826 826 
                         $sth = $this->db->prepare($query);
827 827 
                         $sth->execute($query_values);
828 
-                } catch(PDOException $e) {
828 
+                } catch (PDOException $e) {
829 829 
                         echo "error : ".$e->getMessage();
830 830 
                 }
831 831 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -842,7 +842,7 @@  discard block
 
 block discarded – undo
842 842 
                  try {
843 843 
                         $sth = $this->db->prepare($query);
844 844 
                         $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
845 
-                } catch(PDOException $e) {
845 
+                } catch (PDOException $e) {
846 846 
                         echo "error : ".$e->getMessage();
847 847 
                 }
848 848 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -859,7 +859,7 @@  discard block
 
 block discarded – undo
859 859 
                  try {
860 860 
                         $sth = $this->db->prepare($query);
861 861 
                         $sth->execute(array(':filter_name' => $filter_name));
862 
-                } catch(PDOException $e) {
862 
+                } catch (PDOException $e) {
863 863 
                         echo "error : ".$e->getMessage();
864 864 
                 }
865 865 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -876,7 +876,7 @@  discard block
 
 block discarded – undo
876 876 
                  try {
877 877 
                         $sth = $this->db->prepare($query);
878 878 
                         $sth->execute(array(':filter_name' => $filter_name));
879 
-                } catch(PDOException $e) {
879 
+                } catch (PDOException $e) {
880 880 
                         echo "error : ".$e->getMessage();
881 881 
                 }
882 882 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -893,14 +893,14 @@  discard block
 
 block discarded – undo
893 893 
                  try {
894 894 
                         $sth = $this->db->prepare($query);
895 895 
                         $sth->execute(array(':filter_name' => $filter_name));
896 
-                } catch(PDOException $e) {
896 
+                } catch (PDOException $e) {
897 897 
                         echo "error : ".$e->getMessage();
898 898 
                 }
899 899 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
900 900 
                 return $all[0]['total'];
901 901 
         }
902 902
903 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
903 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
904 904 
 		global $globalDBdriver;
905 905 
 		if ($filter_name == '') $filter_name = $this->filter_name;
906 906 
 		if ($globalDBdriver == 'mysql') {
 
@@ -908,15 +908,15 @@  discard block
 
 block discarded – undo
908 908 
                 } else {
909 909 
 			$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);";
910 910 
 		}
911 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
911 
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
912 912 
                  try {
913 913 
                         $sth = $this->db->prepare($query);
914 914 
                         $sth->execute($query_values);
915 
-                } catch(PDOException $e) {
915 
+                } catch (PDOException $e) {
916 916 
                         return "error : ".$e->getMessage();
917 917 
                 }
918 918 
         }
919 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
919 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
920 920 
 		global $globalDBdriver;
921 921 
 		if ($filter_name == '') $filter_name = $this->filter_name;
922 922 
 		if ($globalDBdriver == 'mysql') {
 
@@ -925,163 +925,163 @@  discard block
 
 block discarded – undo
925 925 
             		//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
926 926 
 			$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);";
927 927 
                 }
928 
-                $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
928 
+                $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
929 929 
                  try {
930 930 
                         $sth = $this->db->prepare($query);
931 931 
                         $sth->execute($query_values);
932 
-                } catch(PDOException $e) {
932 
+                } catch (PDOException $e) {
933 933 
                         return "error : ".$e->getMessage();
934 934 
                 }
935 935 
         }
936 
-	public function getStatsSource($date,$stats_type = '') {
936 
+	public function getStatsSource($date, $stats_type = '') {
937 937 
 		if ($stats_type == '') {
938 938 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name";
939 939 
 			$query_values = array(':date' => $date);
940 940 
 		} else {
941 941 
 			$query = "SELECT * FROM stats_source WHERE stats_date = :date AND stats_type = :stats_type ORDER BY source_name";
942 
-			$query_values = array(':date' => $date,':stats_type' => $stats_type);
942 
+			$query_values = array(':date' => $date, ':stats_type' => $stats_type);
943 943 
 		}
944 944 
                  try {
945 945 
                         $sth = $this->db->prepare($query);
946 946 
                         $sth->execute($query_values);
947 
-                } catch(PDOException $e) {
947 
+                } catch (PDOException $e) {
948 948 
                         echo "error : ".$e->getMessage();
949 949 
                 }
950 950 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
951 951 
                 return $all;
952 952 
         }
953 953
954 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
954 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
955 955 
 		global $globalDBdriver;
956 956 
 		if ($globalDBdriver == 'mysql') {
957 957 
 			$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";
958 958 
 		} else {
959 959 
 			$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);";
960 960 
                 }
961 
-                $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
961 
+                $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
962 962 
                  try {
963 963 
                         $sth = $this->db->prepare($query);
964 964 
                         $sth->execute($query_values);
965 
-                } catch(PDOException $e) {
965 
+                } catch (PDOException $e) {
966 966 
                         return "error : ".$e->getMessage();
967 967 
                 }
968 968 
         }
969 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
969 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
970 970 
                 $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
971 
-                $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
971 
+                $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
972 972 
                  try {
973 973 
                         $sth = $this->db->prepare($query);
974 974 
                         $sth->execute($query_values);
975 
-                } catch(PDOException $e) {
975 
+                } catch (PDOException $e) {
976 976 
                         return "error : ".$e->getMessage();
977 977 
                 }
978 978 
         }
979 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '') {
979 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '') {
980 980 
 		global $globalDBdriver;
981 981 
 		if ($globalDBdriver == 'mysql') {
982 982 
 			$query = "INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) VALUES (:aircraft_icao,:registration,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
983 983 
 		} else {
984 984 
 			$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);";
985 985 
 		}
986 
-                $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
986 
+                $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
987 987 
                  try {
988 988 
                         $sth = $this->db->prepare($query);
989 989 
                         $sth->execute($query_values);
990 
-                } catch(PDOException $e) {
990 
+                } catch (PDOException $e) {
991 991 
                         return "error : ".$e->getMessage();
992 992 
                 }
993 993 
         }
994 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '') {
994 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '') {
995 995 
 		global $globalDBdriver;
996 996 
 		if ($globalDBdriver == 'mysql') {
997 997 
 			$query = "INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) VALUES (:callsign_icao,:airline_icao,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
998 998 
 		} else {
999 999 
 			$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);";
1000 1000 
 		}
1001 
-                $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1001 
+                $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1002 1002 
                  try {
1003 1003 
                         $sth = $this->db->prepare($query);
1004 1004 
                         $sth->execute($query_values);
1005 
-                } catch(PDOException $e) {
1005 
+                } catch (PDOException $e) {
1006 1006 
                         return "error : ".$e->getMessage();
1007 1007 
                 }
1008 1008 
         }
1009 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$filter_name = '') {
1009 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $filter_name = '') {
1010 1010 
 		global $globalDBdriver;
1011 1011 
 		if ($globalDBdriver == 'mysql') {
1012 1012 
 			$query = "INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) VALUES (:iso2,:iso3,:name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
1013 1013 
 		} else {
1014 1014 
 			$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
1015 1015 
 		}
1016 
-                $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
1016 
+                $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1017 1017 
                  try {
1018 1018 
                         $sth = $this->db->prepare($query);
1019 1019 
                         $sth->execute($query_values);
1020 
-                } catch(PDOException $e) {
1020 
+                } catch (PDOException $e) {
1021 1021 
                         return "error : ".$e->getMessage();
1022 1022 
                 }
1023 1023 
         }
1024 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
1024 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '') {
1025 1025 
 		global $globalDBdriver;
1026 1026 
 		if ($globalDBdriver == 'mysql') {
1027 1027 
 			$query = "INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline, filter_name) VALUES (:aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, stats_airline = :stats_airline";
1028 1028 
 		} else {
1029 1029 
 			$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);";
1030 1030 
 		}
1031 
-                $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);
1031 
+                $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);
1032 1032 
                  try {
1033 1033 
                         $sth = $this->db->prepare($query);
1034 1034 
                         $sth->execute($query_values);
1035 
-                } catch(PDOException $e) {
1035 
+                } catch (PDOException $e) {
1036 1036 
                         return "error : ".$e->getMessage();
1037 1037 
                 }
1038 1038 
         }
1039 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '') {
1039 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '') {
1040 1040 
 		global $globalDBdriver;
1041 1041 
 		if ($globalDBdriver == 'mysql') {
1042 1042 
 			$query = "INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) VALUES (:airline_icao,:airline_name,:cnt,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt,airline_name = :airline_name";
1043 1043 
 		} else {
1044 1044 
 			$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);";
1045 1045 
 		}
1046 
-                $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1046 
+                $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1047 1047 
                  try {
1048 1048 
                         $sth = $this->db->prepare($query);
1049 1049 
                         $sth->execute($query_values);
1050 
-                } catch(PDOException $e) {
1050 
+                } catch (PDOException $e) {
1051 1051 
                         return "error : ".$e->getMessage();
1052 1052 
                 }
1053 1053 
         }
1054 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '') {
1054 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '') {
1055 1055 
 		global $globalDBdriver;
1056 1056 
 		if ($globalDBdriver == 'mysql') {
1057 1057 
 			$query = "INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) VALUES (:owner_name,:cnt,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt";
1058 1058 
 		} else {
1059 1059 
 			$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);";
1060 1060 
 		}
1061 
-                $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1061 
+                $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1062 1062 
                  try {
1063 1063 
                         $sth = $this->db->prepare($query);
1064 1064 
                         $sth->execute($query_values);
1065 
-                } catch(PDOException $e) {
1065 
+                } catch (PDOException $e) {
1066 1066 
                         return "error : ".$e->getMessage();
1067 1067 
                 }
1068 1068 
         }
1069 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '') {
1069 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '') {
1070 1070 
 		global $globalDBdriver;
1071 1071 
 		if ($globalDBdriver == 'mysql') {
1072 1072 
 			$query = "INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) VALUES (:pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, pilot_name = :pilot_name";
1073 1073 
 		} else {
1074 1074 
 			$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);";
1075 1075 
 		}
1076 
-                $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);
1076 
+                $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);
1077 1077 
                  try {
1078 1078 
                         $sth = $this->db->prepare($query);
1079 1079 
                         $sth->execute($query_values);
1080 
-                } catch(PDOException $e) {
1080 
+                } catch (PDOException $e) {
1081 1081 
                         return "error : ".$e->getMessage();
1082 1082 
                 }
1083 1083 
         }
1084 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1084 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1085 1085 
 		global $globalDBdriver;
1086 1086 
 		if ($airport_icao != '') {
1087 1087 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1089,16 +1089,16 @@  discard block
 
 block discarded – undo
1089 1089 
 			} else {
1090 1090 
 				$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);";
1091 1091 
 			}
1092 
-			$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);
1092 
+			$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);
1093 1093 
 			try {
1094 1094 
 				$sth = $this->db->prepare($query);
1095 1095 
 				$sth->execute($query_values);
1096 
-			} catch(PDOException $e) {
1096 
+			} catch (PDOException $e) {
1097 1097 
 				return "error : ".$e->getMessage();
1098 1098 
 			}
1099 1099 
                 }
1100 1100 
         }
1101 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1101 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1102 1102 
 		global $globalDBdriver;
1103 1103 
 		if ($airport_icao != '') {
1104 1104 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1106,16 +1106,16 @@  discard block
 
 block discarded – undo
1106 1106 
 			} else {
1107 1107 
 				$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);";
1108 1108 
 			}
1109 
-			$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);
1109 
+			$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);
1110 1110 
 			 try {
1111 1111 
 				$sth = $this->db->prepare($query);
1112 1112 
 				$sth->execute($query_values);
1113 
-			} catch(PDOException $e) {
1113 
+			} catch (PDOException $e) {
1114 1114 
 				return "error : ".$e->getMessage();
1115 1115 
 			}
1116 1116 
                 }
1117 1117 
         }
1118 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1118 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1119 1119 
 		global $globalDBdriver;
1120 1120 
 		if ($airport_icao != '') {
1121 1121 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1123,16 +1123,16 @@  discard block
 
 block discarded – undo
1123 1123 
 			} else {
1124 1124 
 				$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);";
1125 1125 
 			}
1126 
-	                $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);
1126 
+	                $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);
1127 1127 
 			 try {
1128 1128 
                     		$sth = $this->db->prepare($query);
1129 1129 
 	                        $sth->execute($query_values);
1130 
-    		        } catch(PDOException $e) {
1130 
+    		        } catch (PDOException $e) {
1131 1131 
             		        return "error : ".$e->getMessage();
1132 1132 
 	                }
1133 1133 
 	        }
1134 1134 
         }
1135 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1135 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1136 1136 
 		global $globalDBdriver;
1137 1137 
 		if ($airport_icao != '') {
1138 1138 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1140,11 +1140,11 @@  discard block
 
 block discarded – undo
1140 1140 
 			} else {
1141 1141 
 				$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);";
1142 1142 
 			}
1143 
-			$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);
1143 
+			$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);
1144 1144 
 			try {
1145 1145 
 				$sth = $this->db->prepare($query);
1146 1146 
 				$sth->execute($query_values);
1147 
-			} catch(PDOException $e) {
1147 
+			} catch (PDOException $e) {
1148 1148 
 				return "error : ".$e->getMessage();
1149 1149 
 			}
1150 1150 
                 }
 
@@ -1156,7 +1156,7 @@  discard block
 
 block discarded – undo
1156 1156 
                  try {
1157 1157 
                         $sth = $this->db->prepare($query);
1158 1158 
                         $sth->execute($query_values);
1159 
-                } catch(PDOException $e) {
1159 
+                } catch (PDOException $e) {
1160 1160 
                         return "error : ".$e->getMessage();
1161 1161 
                 }
1162 1162 
         }
 
@@ -1166,7 +1166,7 @@  discard block
 
 block discarded – undo
1166 1166 
                  try {
1167 1167 
                         $sth = $this->db->prepare($query);
1168 1168 
                         $sth->execute($query_values);
1169 
-                } catch(PDOException $e) {
1169 
+                } catch (PDOException $e) {
1170 1170 
                         return "error : ".$e->getMessage();
1171 1171 
                 }
1172 1172 
         }
 
@@ -1176,13 +1176,13 @@  discard block
 
 block discarded – undo
1176 1176 
                  try {
1177 1177 
                         $sth = $this->db->prepare($query);
1178 1178 
                         $sth->execute($query_values);
1179 
-                } catch(PDOException $e) {
1179 
+                } catch (PDOException $e) {
1180 1180 
                         return "error : ".$e->getMessage();
1181 1181 
                 }
1182 1182 
         }
1183 1183
1184 1184 
         public function addOldStats() {
1185 
-    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats;
1185 
+    		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats;
1186 1186 
     		$Common = new Common();
1187 1187 
     		$Connection = new Connection();
1188 1188 
     		date_default_timezone_set('UTC');
 
@@ -1415,40 +1415,40 @@  discard block
 
 block discarded – undo
1415 1415 
 				$last_update_day = $last_update[0]['value'];
1416 1416 
 			} else $last_update_day = '2012-12-12 12:12:12';
1417 1417 
 			$Spotter = new Spotter($this->db);
1418 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1418 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
1419 1419 
 			foreach ($alldata as $number) {
1420 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer']);
1420 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer']);
1421 1421 
 			}
1422 1422 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
1423 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
1423 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
1424 1424 
 			foreach ($alldata as $number) {
1425 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name']);
1425 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name']);
1426 1426 
 			}
1427 1427 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
1428 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
1428 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
1429 1429 
 			foreach ($alldata as $number) {
1430 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao']);
1430 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao']);
1431 1431 
 			}
1432 1432 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
1433 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
1433 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
1434 1434 
 			foreach ($alldata as $number) {
1435 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
1435 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
1436 1436 
 			}
1437 1437 
 			if ($globalDebug) echo 'Count all owners...'."\n";
1438 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
1438 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
1439 1439 
 			foreach ($alldata as $number) {
1440 
-				$this->addStatOwner($number['owner_name'],$number['owner_count']);
1440 
+				$this->addStatOwner($number['owner_name'], $number['owner_count']);
1441 1441 
 			}
1442 1442 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
1443 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
1443 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
1444 1444 
 			foreach ($alldata as $number) {
1445 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source']);
1445 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source']);
1446 1446 
 			}
1447 1447
1448 1448 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
1449 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
1449 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
1450 1450 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
1451 
-        		$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
1451 
+        		$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
1452 1452 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
1453 1453 
 	        	$alldata = array();
1454 1454 
 	        	
@@ -1466,14 +1466,14 @@  discard block
 
 block discarded – undo
1466 1466 
     			foreach ($alldata as $key => $row) {
1467 1467 
     				$count[$key] = $row['airport_departure_icao_count'];
1468 1468 
         		}
1469 
-			array_multisort($count,SORT_DESC,$alldata);
1469 
+			array_multisort($count, SORT_DESC, $alldata);
1470 1470 
 			foreach ($alldata as $number) {
1471 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count']);
1471 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count']);
1472 1472 
 			}
1473 1473 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
1474 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
1474 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
1475 1475 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
1476 
-        		$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
1476 
+        		$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
1477 1477 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
1478 1478 
 	        	$alldata = array();
1479 1479 
     			foreach ($pall as $value) {
 
@@ -1490,16 +1490,16 @@  discard block
 
 block discarded – undo
1490 1490 
         		foreach ($alldata as $key => $row) {
1491 1491 
         			$count[$key] = $row['airport_arrival_icao_count'];
1492 1492 
 	        	}
1493 
-    			array_multisort($count,SORT_DESC,$alldata);
1493 
+    			array_multisort($count, SORT_DESC, $alldata);
1494 1494 
                         foreach ($alldata as $number) {
1495 
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count']);
1495 
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count']);
1496 1496 
 			}
1497 1497 
 			if ($Connection->tableExists('countries')) {
1498 1498 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
1499 1499 
 				$SpotterArchive = new SpotterArchive();
1500 
-				$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
1500 
+				$alldata = $SpotterArchive->countAllFlightOverCountries(false, 0, $last_update_day);
1501 1501 
 				foreach ($alldata as $number) {
1502 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count']);
1502 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count']);
1503 1503 
 				}
1504 1504 
 			}
1505 1505 
 			
@@ -1513,37 +1513,37 @@  discard block
 
 block discarded – undo
1513 1513 
 			$lastyear = false;
1514 1514 
 			foreach ($alldata as $number) {
1515 1515 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1516 
-				$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'])));
1516 
+				$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'])));
1517 1517 
 			}
1518 1518 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
1519 1519 
 			$alldata = $Spotter->countAllMilitaryMonths();
1520 1520 
 			foreach ($alldata as $number) {
1521 
-				$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'])));
1521 
+				$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'])));
1522 1522 
 			}
1523 1523 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
1524 1524 
 			$alldata = $Spotter->countAllMonthsOwners();
1525 1525 
 			foreach ($alldata as $number) {
1526 
-				$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'])));
1526 
+				$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'])));
1527 1527 
 			}
1528 1528 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
1529 1529 
 			$alldata = $Spotter->countAllMonthsPilots();
1530 1530 
 			foreach ($alldata as $number) {
1531 
-				$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'])));
1531 
+				$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'])));
1532 1532 
 			}
1533 1533 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
1534 1534 
 			$alldata = $Spotter->countAllMonthsAirlines();
1535 1535 
 			foreach ($alldata as $number) {
1536 
-				$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'])));
1536 
+				$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'])));
1537 1537 
 			}
1538 1538 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
1539 1539 
 			$alldata = $Spotter->countAllMonthsAircrafts();
1540 1540 
 			foreach ($alldata as $number) {
1541 
-				$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'])));
1541 
+				$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'])));
1542 1542 
 			}
1543 1543 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
1544 1544 
 			$alldata = $Spotter->countAllMonthsRealArrivals();
1545 1545 
 			foreach ($alldata as $number) {
1546 
-				$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'])));
1546 
+				$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'])));
1547 1547 
 			}
1548 1548 
 			if ($globalDebug) echo 'Airports data...'."\n";
1549 1549 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -1588,7 +1588,7 @@  discard block
 
 block discarded – undo
1588 1588 
     			}
1589 1589 
     			$alldata = $pall;
1590 1590 
 			foreach ($alldata as $number) {
1591 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
1591 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
1592 1592 
 			}
1593 1593 
 			echo '...Arrival'."\n";
1594 1594 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -1630,7 +1630,7 @@  discard block
 
 block discarded – undo
1630 1630 
     			}
1631 1631 
     			$alldata = $pall;
1632 1632 
 			foreach ($alldata as $number) {
1633 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
1633 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
1634 1634 
 			}
1635 1635
1636 1636 
 			echo 'Flights data...'."\n";
 
@@ -1638,28 +1638,28 @@  discard block
 
 block discarded – undo
1638 1638 
 			echo '-> countAllDatesLastMonth...'."\n";
1639 1639 
 			$alldata = $Spotter->countAllDatesLastMonth();
1640 1640 
 			foreach ($alldata as $number) {
1641 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
1641 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
1642 1642 
 			}
1643 1643 
 			echo '-> countAllDates...'."\n";
1644 1644 
 			$previousdata = $this->countAllDates();
1645 1645 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
1646 1646 
 			$this->deleteStatFlight('date');
1647 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates());
1647 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates());
1648 1648 
 			$values = array();
1649 1649 
 			foreach ($alldata as $cnt) {
1650 1650 
 				$values[] = $cnt['date_count'];
1651 1651 
 			}
1652 
-			array_multisort($values,SORT_DESC,$alldata);
1653 
-			array_splice($alldata,11);
1652 
+			array_multisort($values, SORT_DESC, $alldata);
1653 
+			array_splice($alldata, 11);
1654 1654 
 			foreach ($alldata as $number) {
1655 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
1655 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
1656 1656 
 			}
1657 1657
1658 1658 
 			$this->deleteStatFlight('hour');
1659 1659 
 			echo '-> countAllHours...'."\n";
1660 1660 
 			$alldata = $Spotter->countAllHours('hour');
1661 1661 
 			foreach ($alldata as $number) {
1662 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
1662 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
1663 1663 
 			}
1664 1664
1665 1665 
 
@@ -1668,34 +1668,34 @@  discard block
 
 block discarded – undo
1668 1668 
 			echo '--- Stats by airlines ---'."\n";
1669 1669 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
1670 1670 
 			$Spotter = new Spotter($this->db);
1671 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
1671 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
1672 1672 
 			foreach ($alldata as $number) {
1673 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao']);
1673 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao']);
1674 1674 
 			}
1675 1675 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
1676 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
1676 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
1677 1677 
 			foreach ($alldata as $number) {
1678 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao']);
1678 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao']);
1679 1679 
 			}
1680 1680 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
1681 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
1681 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
1682 1682 
 			foreach ($alldata as $number) {
1683 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao']);
1683 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao']);
1684 1684 
 			}
1685 1685 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
1686 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
1686 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
1687 1687 
 			foreach ($alldata as $number) {
1688 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao']);
1688 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao']);
1689 1689 
 			}
1690 1690 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
1691 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
1691 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
1692 1692 
 			foreach ($alldata as $number) {
1693 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source']);
1693 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source']);
1694 1694 
 			}
1695 1695 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
1696 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
1696 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
1697 1697 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
1698 
-       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
1698 
+       			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
1699 1699 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
1700 1700 
 	        	//$alldata = array();
1701 1701 
     			foreach ($dall as $value) {
 
@@ -1715,12 +1715,12 @@  discard block
 
 block discarded – undo
1715 1715 
     			}
1716 1716 
     			$alldata = $pall;
1717 1717 
 			foreach ($alldata as $number) {
1718 
-				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']);
1718 
+				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']);
1719 1719 
 			}
1720 1720 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
1721 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
1721 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
1722 1722 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
1723 
-        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
1723 
+        		$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
1724 1724 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
1725 1725 
 	        	//$alldata = array();
1726 1726 
     			foreach ($dall as $value) {
 
@@ -1740,7 +1740,7 @@  discard block
 
 block discarded – undo
1740 1740 
     			}
1741 1741 
     			$alldata = $pall;
1742 1742 
                         foreach ($alldata as $number) {
1743 
-				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']);
1743 
+				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']);
1744 1744 
 			}
1745 1745 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
1746 1746 
 			$Spotter = new Spotter($this->db);
 
@@ -1748,27 +1748,27 @@  discard block
 
 block discarded – undo
1748 1748 
 			$lastyear = false;
1749 1749 
 			foreach ($alldata as $number) {
1750 1750 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
1751 
-				$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']);
1751 
+				$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']);
1752 1752 
 			}
1753 1753 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
1754 1754 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines();
1755 1755 
 			foreach ($alldata as $number) {
1756 
-				$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']);
1756 
+				$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']);
1757 1757 
 			}
1758 1758 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
1759 1759 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines();
1760 1760 
 			foreach ($alldata as $number) {
1761 
-				$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']);
1761 
+				$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']);
1762 1762 
 			}
1763 1763 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
1764 1764 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines();
1765 1765 
 			foreach ($alldata as $number) {
1766 
-				$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']);
1766 
+				$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']);
1767 1767 
 			}
1768 1768 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
1769 1769 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines();
1770 1770 
 			foreach ($alldata as $number) {
1771 
-				$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']);
1771 
+				$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']);
1772 1772 
 			}
1773 1773 
 			if ($globalDebug) echo '...Departure'."\n";
1774 1774 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -1791,7 +1791,7 @@  discard block
 
 block discarded – undo
1791 1791 
     			}
1792 1792 
     			$alldata = $pall;
1793 1793 
 			foreach ($alldata as $number) {
1794 
-				$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']);
1794 
+				$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']);
1795 1795 
 			}
1796 1796 
 			if ($globalDebug) echo '...Arrival'."\n";
1797 1797 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -1814,32 +1814,32 @@  discard block
 
 block discarded – undo
1814 1814 
     			}
1815 1815 
     			$alldata = $pall;
1816 1816 
 			foreach ($alldata as $number) {
1817 
-				$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']);
1817 
+				$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']);
1818 1818 
 			}
1819 1819
1820 1820 
 			if ($globalDebug) echo 'Flights data...'."\n";
1821 1821 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
1822 1822 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines();
1823 1823 
 			foreach ($alldata as $number) {
1824 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
1824 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
1825 1825 
 			}
1826 1826 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
1827 1827 
 			//$previousdata = $this->countAllDatesByAirlines();
1828 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines());
1828 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines());
1829 1829 
 			$values = array();
1830 1830 
 			foreach ($alldata as $cnt) {
1831 1831 
 				$values[] = $cnt['date_count'];
1832 1832 
 			}
1833 
-			array_multisort($values,SORT_DESC,$alldata);
1834 
-			array_splice($alldata,11);
1833 
+			array_multisort($values, SORT_DESC, $alldata);
1834 
+			array_splice($alldata, 11);
1835 1835 
 			foreach ($alldata as $number) {
1836 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
1836 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
1837 1837 
 			}
1838 1838
1839 1839 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
1840 1840 
 			$alldata = $Spotter->countAllHoursByAirlines('hour');
1841 1841 
 			foreach ($alldata as $number) {
1842 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
1842 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
1843 1843 
 			}
1844 1844
1845 1845 
 
@@ -1856,32 +1856,32 @@  discard block
 
 block discarded – undo
1856 1856 
 				// Count by filter
1857 1857 
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
1858 1858 
 				$Spotter = new Spotter($this->db);
1859 
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
1859 
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
1860 1860 
 				foreach ($alldata as $number) {
1861 
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name);
1861 
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name);
1862 1862 
 				}
1863 
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
1863 
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
1864 1864 
 				foreach ($alldata as $number) {
1865 
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name);
1865 
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name);
1866 1866 
 				}
1867 
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
1867 
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
1868 1868 
 				foreach ($alldata as $number) {
1869 
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name);
1869 
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name);
1870 1870 
 				}
1871 
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
1871 
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
1872 1872 
 				foreach ($alldata as $number) {
1873 
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name);
1873 
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name);
1874 1874 
 				}
1875 
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
1875 
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
1876 1876 
 				foreach ($alldata as $number) {
1877 
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name);
1877 
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name);
1878 1878 
 				}
1879 
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
1879 
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
1880 1880 
 				foreach ($alldata as $number) {
1881 
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source']);
1881 
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source']);
1882 1882 
 				}
1883 
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
1884 
-	       			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
1883 
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
1884 
+	       			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
1885 1885 
 		        	$alldata = array();
1886 1886 
 	    			foreach ($pall as $value) {
1887 1887 
 		        		$icao = $value['airport_departure_icao'];
 
@@ -1897,12 +1897,12 @@  discard block
 
 block discarded – undo
1897 1897 
     				foreach ($alldata as $key => $row) {
1898 1898 
     					$count[$key] = $row['airport_departure_icao_count'];
1899 1899 
     				}
1900 
-				array_multisort($count,SORT_DESC,$alldata);
1900 
+				array_multisort($count, SORT_DESC, $alldata);
1901 1901 
 				foreach ($alldata as $number) {
1902 
-    					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);
1902 
+    					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);
1903 1903 
 				}
1904 
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
1905 
-    				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
1904 
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
1905 
+    				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
1906 1906 
 				$alldata = array();
1907 1907 
     				foreach ($pall as $value) {
1908 1908 
 		        		$icao = $value['airport_arrival_icao'];
 
@@ -1918,40 +1918,40 @@  discard block
 
 block discarded – undo
1918 1918 
         			foreach ($alldata as $key => $row) {
1919 1919 
     					$count[$key] = $row['airport_arrival_icao_count'];
1920 1920 
 		        	}
1921 
-        			array_multisort($count,SORT_DESC,$alldata);
1921 
+        			array_multisort($count, SORT_DESC, $alldata);
1922 1922 
 				foreach ($alldata as $number) {
1923 
-					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);
1923 
+					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);
1924 1924 
 				}
1925 1925 
 				$Spotter = new Spotter($this->db);
1926 1926 
 				$alldata = $Spotter->countAllMonths($filter);
1927 1927 
 				$lastyear = false;
1928 1928 
 				foreach ($alldata as $number) {
1929 1929 
 					if ($number['year_name'] != date('Y')) $lastyear = true;
1930 
-					$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);
1930 
+					$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);
1931 1931 
 				}
1932 1932 
 				$alldata = $Spotter->countAllMonthsOwners($filter);
1933 1933 
 				foreach ($alldata as $number) {
1934 
-					$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);
1934 
+					$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);
1935 1935 
 				}
1936 1936 
 				$alldata = $Spotter->countAllMonthsPilots($filter);
1937 1937 
 				foreach ($alldata as $number) {
1938 
-					$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);
1938 
+					$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);
1939 1939 
 				}
1940 1940 
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
1941 1941 
 				foreach ($alldata as $number) {
1942 
-					$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);
1942 
+					$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);
1943 1943 
 				}
1944 1944 
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
1945 1945 
 				foreach ($alldata as $number) {
1946 
-					$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);
1946 
+					$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);
1947 1947 
 				}
1948 1948 
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
1949 1949 
 				foreach ($alldata as $number) {
1950 
-					$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);
1950 
+					$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);
1951 1951 
 				}
1952 1952 
 				echo '...Departure'."\n";
1953 
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
1954 
-        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
1953 
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
1954 
+        			$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
1955 1955 
 				foreach ($dall as $value) {
1956 1956 
     					$icao = $value['departure_airport_icao'];
1957 1957 
     					$ddate = $value['date'];
 
@@ -1969,11 +1969,11 @@  discard block
 
 block discarded – undo
1969 1969 
     				}
1970 1970 
 	    			$alldata = $pall;
1971 1971 
 				foreach ($alldata as $number) {
1972 
-					$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);
1972 
+					$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);
1973 1973 
 				}
1974 1974 
 				echo '...Arrival'."\n";
1975 
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
1976 
-    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
1975 
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
1976 
+    				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
1977 1977 
 				foreach ($dall as $value) {
1978 1978 
 					$icao = $value['arrival_airport_icao'];
1979 1979 
 					$ddate = $value['date'];
 
@@ -1991,40 +1991,40 @@  discard block
 
 block discarded – undo
1991 1991 
     				}
1992 1992 
     				$alldata = $pall;
1993 1993 
 				foreach ($alldata as $number) {
1994 
-					$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);
1994 
+					$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);
1995 1995 
 				}
1996 1996
1997 1997 
 				echo 'Flights data...'."\n";
1998 1998 
 				echo '-> countAllDatesLastMonth...'."\n";
1999 1999 
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
2000 2000 
 				foreach ($alldata as $number) {
2001 
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2001 
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2002 2002 
 				}
2003 2003 
 				echo '-> countAllDates...'."\n";
2004 
-				$previousdata = $this->countAllDates('',$filter_name);
2005 
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2004 
+				$previousdata = $this->countAllDates('', $filter_name);
2005 
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2006 2006 
 				$values = array();
2007 2007 
 				foreach ($alldata as $cnt) {
2008 2008 
 					$values[] = $cnt['date_count'];
2009 2009 
 				}
2010 
-				array_multisort($values,SORT_DESC,$alldata);
2011 
-				array_splice($alldata,11);
2010 
+				array_multisort($values, SORT_DESC, $alldata);
2011 
+				array_splice($alldata, 11);
2012 2012 
 				foreach ($alldata as $number) {
2013 
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2013 
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2014 2014 
 				}
2015 2015
2016 2016 
 				echo '-> countAllHours...'."\n";
2017 
-				$alldata = $Spotter->countAllHours('hour',$filter);
2017 
+				$alldata = $Spotter->countAllHours('hour', $filter);
2018 2018 
 				foreach ($alldata as $number) {
2019 
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2019 
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2020 2020 
 				}
2021 2021 
 				echo 'Insert last stats update date...'."\n";
2022 2022 
 				date_default_timezone_set('UTC');
2023 
-				$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2023 
+				$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2024 2024 
 				if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2025 
-					if (date('Y',strtotime($last_update_day)) != date('Y')) {
2025 
+					if (date('Y', strtotime($last_update_day)) != date('Y')) {
2026 2026 
 						$this->deleteOldStats($filter_name);
2027 
-						$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2027 
+						$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2028 2028 
 					}
2029 2029 
 				}
2030 2030 
 
@@ -2037,16 +2037,16 @@  discard block
 
 block discarded – undo
2037 2037 
 				// SUM all previous month to put as year
2038 2038 
 				$previous_year = date('Y');
2039 2039 
 				$previous_year--;
2040 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2041 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2042 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2043 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2040 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2041 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2042 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2043 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2044 2044 
 				$allairlines = $this->getAllAirlineNames();
2045 2045 
 				foreach ($allairlines as $data) {
2046 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2047 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2048 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2049 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2046 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2047 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2048 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2049 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2050 2050 
 				}
2051 2051
2052 2052 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -2055,7 +2055,7 @@  discard block
 
 block discarded – undo
2055 2055 
 						try {
2056 2056 
 							$sth = $this->db->prepare($query);
2057 2057 
 							$sth->execute();
2058 
-						} catch(PDOException $e) {
2058 
+						} catch (PDOException $e) {
2059 2059 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2060 2060 
 						}
2061 2061 
 					}
 
@@ -2064,15 +2064,15 @@  discard block
 
 block discarded – undo
2064 2064 
 					try {
2065 2065 
 						$sth = $this->db->prepare($query);
2066 2066 
 						$sth->execute();
2067 
-					} catch(PDOException $e) {
2067 
+					} catch (PDOException $e) {
2068 2068 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2069 2069 
 					}
2070 2070 
 				}
2071 2071 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2072 2072 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2073 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2073 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2074 2074 
 						$this->deleteOldStats();
2075 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2075 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2076 2076 
 						$lastyearupdate = true;
2077 2077 
 					}
2078 2078 
 				}
 
@@ -2094,7 +2094,7 @@  discard block
 
 block discarded – undo
2094 2094 
 					try {
2095 2095 
 						$sth = $this->db->prepare($query);
2096 2096 
 						$sth->execute();
2097 
-					} catch(PDOException $e) {
2097 
+					} catch (PDOException $e) {
2098 2098 
 						return "error : ".$e->getMessage();
2099 2099 
 					}
2100 2100 
 				}
 
@@ -2108,14 +2108,14 @@  discard block
 
 block discarded – undo
2108 2108 
 				try {
2109 2109 
 					$sth = $this->db->prepare($query);
2110 2110 
 					$sth->execute();
2111 
-				} catch(PDOException $e) {
2111 
+				} catch (PDOException $e) {
2112 2112 
 					return "error : ".$e->getMessage();
2113 2113 
 				}
2114 2114 
 			}
2115 2115 
 			if (!isset($lastyearupdate)) {
2116 2116 
 				echo 'Insert last stats update date...'."\n";
2117 2117 
 				date_default_timezone_set('UTC');
2118 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2118 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2119 2119 
 			}
2120 2120 
 		//}
2121 2121 
 	}
Please login to merge, or discard this patch.
require/class.Spotter.php 1 patch
Spacing   +1010 added lines, -1010 removed lines patch added patch discarded remove patch 
@@ -4,7 +4,7 @@  discard block
 
 block discarded – undo
4 4 
 require_once(dirname(__FILE__).'/class.Image.php');
5 5 
 $global_query = "SELECT spotter_output.* FROM spotter_output";
6 6
7 
-class Spotter{
7 
+class Spotter {
8 8 
 	public $db;
9 9
10 10 
 	public function __construct($dbc = null) {
 
@@ -17,64 +17,64 @@  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;
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 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
31 31 
 		$filter_query_join = '';
32 32 
 		$filter_query_where = '';
33 
-		foreach($filters as $flt) {
33 
+		foreach ($filters as $flt) {
34 34 
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
35 35 
 				if ($flt['airlines'][0] != '') {
36 36 
 					if (isset($flt['source'])) {
37 
-						$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'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
37 
+						$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'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
38 38 
 					} else {
39 
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
39 
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
40 40 
 					}
41 41 
 				}
42 42 
 			}
43 43 
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
44 44 
 				if (isset($flt['source'])) {
45 
-					$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'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
45 
+					$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'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
46 46 
 				} else {
47 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
47 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
48 48 
 				}
49 49 
 			}
50 50 
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
51 51 
 				if (isset($flt['source'])) {
52 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
52 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
53 53 
 				}
54 54 
 			}
55 55 
 		}
56 56 
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
57 57 
 			if ($filter['airlines'][0] != '') {
58 
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
58 
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
59 59 
 			}
60 60 
 		}
61 61 
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
62 62 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_output.flightaware_id ";
63 63 
 		}
64 64 
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
65 
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
65 
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) so ON so.flightaware_id = spotter_output.flightaware_id";
66 66 
 			}
67 67 
 		if (isset($filter['source']) && !empty($filter['source'])) {
68 
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
68 
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
69 69 
 		}
70 70 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
71 71 
 			$filter_query_where = " WHERE ident = '".$filter['ident']."'";
72 72 
 		}
73 73 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 74 
 			if ($filter_query_where == '') {
75 
-				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75 
+				$filter_query_where = " WHERE format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
76 76 
 			} else {
77 
-				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
77 
+				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
78 78 
 			}
79 79 
 		}
80 80 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 	* @return Array the spotter information
93 93 
 	*
94 94 
 	*/
95 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
95 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
96 96 
 	{
97 97 
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
98 98 
 		$Image = new Image($this->db);
 
@@ -122,7 +122,7 @@  discard block
 
 block discarded – undo
122 122 
 			$sth = $this->db->prepare($query.$limitQuery);
123 123 
 			$sth->execute($params);
124 124 
 		} catch (PDOException $e) {
125 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
125 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
126 126 
 			exit();
127 127 
 		}
128 128 
 		
@@ -132,7 +132,7 @@  discard block
 
 block discarded – undo
132 132 
 		$spotter_array = array();
133 133
134 134
135 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
135 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
136 136 
 		{
137 137 
 			$num_rows++;
138 138 
 			$temp_array = array();
 
@@ -177,7 +177,7 @@  discard block
 
 block discarded – undo
177 177 
 			if (isset($row['route_stop'])) {
178 178 
 				$temp_array['route_stop'] = $row['route_stop'];
179 179 
 				if ($row['route_stop'] != '') {
180 
-					$allroute = explode(' ',$row['route_stop']);
180 
+					$allroute = explode(' ', $row['route_stop']);
181 181
182 182 
 					foreach ($allroute as $route) {
183 183 
 						$route_airport_array = $this->getAllAirportInfo($route);
 
@@ -232,11 +232,11 @@  discard block
 
 block discarded – undo
232 232 
 				{
233 233 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
234 234 
 				} else {
235 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
235 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
236 236 
 				}
237 237 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
238 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
239 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
238 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
239 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
240 240 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
241 241 
 			}
242 242 
 			
@@ -270,9 +270,9 @@  discard block
 
 block discarded – undo
270 270 
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
271 271 
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
272 272 
 					if (is_numeric(substr($row['ident'], 2, 1))) {
273 
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource);
273 
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource);
274 274 
 					} elseif (is_numeric(substr($row['ident'], 3, 1))) {
275 
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
275 
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
276 276 
 					} else {
277 277 
 						$airline_array = $this->getAllAirlineInfo('NA');
278 278 
 					}
 
@@ -309,7 +309,7 @@  discard block
 
 block discarded – undo
309 309 
 				}
310 310 
 			}
311 311 
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
312 
-				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3));
312 
+				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3));
313 313 
 				//$acars_array = ACARS->getLiveAcarsData('BA40YL');
314 314 
 				if (count($acars_array) > 0) {
315 315 
 					$temp_array['acars'] = $acars_array;
 
@@ -326,11 +326,11 @@  discard block
 
 block discarded – undo
326 326 
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
327 327 
 			}
328 328
329 
-			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
329 
+			if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
330 330 
 			{
331 331 
 				if ($globalIVAO) {
332 
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
333 
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
332 
+					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']);
333 
+					else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']);
334 334 
 				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
335 335 
 				if (count($image_array) > 0) {
336 336 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -354,7 +354,7 @@  discard block
 
 block discarded – undo
354 354 
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
355 355 
 			}
356 356
357 
-			if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
357 
+			if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
358 358 
 				if ($schedules === true) {
359 359 
 					$schedule_array = $Schedule->getSchedule($temp_array['ident']);
360 360 
 					//print_r($schedule_array);
 
@@ -436,12 +436,12 @@  discard block
 
 block discarded – undo
436 436 
 			if (isset($row['squawk'])) {
437 437 
 				$temp_array['squawk'] = $row['squawk'];
438 438 
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
439 
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
440 
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
439 
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']);
440 
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
441 441 
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
442 
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
443 
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
444 
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
442 
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']);
443 
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
444 
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
445 445 
 			}
446 446
447 447 
 			$temp_array['query_number_rows'] = $num_rows;
 
@@ -460,7 +460,7 @@  discard block
 
 block discarded – undo
460 460 
 	* @return Array the spotter information
461 461 
 	*
462 462 
 	*/
463 
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
463 
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
464 464 
 	{
465 465 
 		global $globalTimezone, $globalDBdriver;
466 466 
 		require_once(dirname(__FILE__).'/class.Translation.php');
 
@@ -470,7 +470,7 @@  discard block
 
 block discarded – undo
470 470
471 471 
 		$query_values = array();
472 472 
 		$additional_query = '';
473 
-		$filter_query = $this->getFilter($filters,true,true);
473 
+		$filter_query = $this->getFilter($filters, true, true);
474 474 
 		if ($q != "")
475 475 
 		{
476 476 
 			if (!is_string($q))
 
@@ -478,8 +478,8 @@  discard block
 
 block discarded – undo
478 478 
 				return false;
479 479 
 			} else {
480 480 
 				$q_array = explode(" ", $q);
481 
-				foreach ($q_array as $q_item){
482 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
481 
+				foreach ($q_array as $q_item) {
482 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
483 483 
 					$additional_query .= " AND (";
484 484 
 					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
485 485 
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
 
@@ -511,37 +511,37 @@  discard block
 
 block discarded – undo
511 511
512 512 
 		if ($registration != "")
513 513 
 		{
514 
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
514 
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
515 515 
 			if (!is_string($registration))
516 516 
 			{
517 517 
 				return false;
518 518 
 			} else {
519 519 
 				$additional_query .= " AND spotter_output.registration = :registration";
520 
-				$query_values = array_merge($query_values,array(':registration' => $registration));
520 
+				$query_values = array_merge($query_values, array(':registration' => $registration));
521 521 
 			}
522 522 
 		}
523 523
524 524 
 		if ($aircraft_icao != "")
525 525 
 		{
526 
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
526 
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
527 527 
 			if (!is_string($aircraft_icao))
528 528 
 			{
529 529 
 				return false;
530 530 
 			} else {
531 531 
 				$additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao";
532 
-				$query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao));
532 
+				$query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao));
533 533 
 			}
534 534 
 		}
535 535
536 536 
 		if ($aircraft_manufacturer != "")
537 537 
 		{
538 
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
538 
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
539 539 
 			if (!is_string($aircraft_manufacturer))
540 540 
 			{
541 541 
 				return false;
542 542 
 			} else {
543 543 
 				$additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer";
544 
-				$query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer));
544 
+				$query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer));
545 545 
 			}
546 546 
 		}
547 547 
 
@@ -557,25 +557,25 @@  discard block
 
 block discarded – undo
557 557
558 558 
 		if ($airline_icao != "")
559 559 
 		{
560 
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
560 
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
561 561 
 			if (!is_string($airline_icao))
562 562 
 			{
563 563 
 				return false;
564 564 
 			} else {
565 565 
 				$additional_query .= " AND spotter_output.airline_icao = :airline_icao";
566 
-				$query_values = array_merge($query_values,array(':airline_icao' => $airline_icao));
566 
+				$query_values = array_merge($query_values, array(':airline_icao' => $airline_icao));
567 567 
 			}
568 568 
 		}
569 569
570 570 
 		if ($airline_country != "")
571 571 
 		{
572 
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
572 
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
573 573 
 			if (!is_string($airline_country))
574 574 
 			{
575 575 
 				return false;
576 576 
 			} else {
577 577 
 				$additional_query .= " AND spotter_output.airline_country = :airline_country";
578 
-				$query_values = array_merge($query_values,array(':airline_country' => $airline_country));
578 
+				$query_values = array_merge($query_values, array(':airline_country' => $airline_country));
579 579 
 			}
580 580 
 		}
581 581 
 
@@ -602,31 +602,31 @@  discard block
 
 block discarded – undo
602 602
603 603 
 		if ($airport != "")
604 604 
 		{
605 
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
605 
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
606 606 
 			if (!is_string($airport))
607 607 
 			{
608 608 
 				return false;
609 609 
 			} else {
610 610 
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)";
611 
-				$query_values = array_merge($query_values,array(':airport' => $airport));
611 
+				$query_values = array_merge($query_values, array(':airport' => $airport));
612 612 
 			}
613 613 
 		}
614 614
615 615 
 		if ($airport_country != "")
616 616 
 		{
617 
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
617 
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
618 618 
 			if (!is_string($airport_country))
619 619 
 			{
620 620 
 				return false;
621 621 
 			} else {
622 622 
 				$additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)";
623 
-				$query_values = array_merge($query_values,array(':airport_country' => $airport_country));
623 
+				$query_values = array_merge($query_values, array(':airport_country' => $airport_country));
624 624 
 			}
625 625 
 		}
626 626
627 627 
 		if ($callsign != "")
628 628 
 		{
629 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
629 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
630 630 
 			if (!is_string($callsign))
631 631 
 			{
632 632 
 				return false;
 
@@ -634,79 +634,79 @@  discard block
 
 block discarded – undo
634 634 
 				$translate = $Translation->ident2icao($callsign);
635 635 
 				if ($translate != $callsign) {
636 636 
 					$additional_query .= " AND (spotter_output.ident = :callsign OR spotter_output.ident = :translate)";
637 
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
637 
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
638 638 
 				} else {
639 639 
 					$additional_query .= " AND spotter_output.ident = :callsign";
640 
-					$query_values = array_merge($query_values,array(':callsign' => $callsign));
640 
+					$query_values = array_merge($query_values, array(':callsign' => $callsign));
641 641 
 				}
642 642 
 			}
643 643 
 		}
644 644
645 645 
 		if ($owner != "")
646 646 
 		{
647 
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
647 
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
648 648 
 			if (!is_string($owner))
649 649 
 			{
650 650 
 				return false;
651 651 
 			} else {
652 652 
 				$additional_query .= " AND spotter_output.owner_name = :owner";
653 
-				$query_values = array_merge($query_values,array(':owner' => $owner));
653 
+				$query_values = array_merge($query_values, array(':owner' => $owner));
654 654 
 			}
655 655 
 		}
656 656
657 657 
 		if ($pilot_name != "")
658 658 
 		{
659 
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
659 
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
660 660 
 			if (!is_string($pilot_name))
661 661 
 			{
662 662 
 				return false;
663 663 
 			} else {
664 664 
 				$additional_query .= " AND spotter_output.pilot_name = :pilot_name";
665 
-				$query_values = array_merge($query_values,array(':pilot_name' => $pilot_name));
665 
+				$query_values = array_merge($query_values, array(':pilot_name' => $pilot_name));
666 666 
 			}
667 667 
 		}
668 668
669 669 
 		if ($pilot_id != "")
670 670 
 		{
671 
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
671 
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
672 672 
 			if (!is_string($pilot_id))
673 673 
 			{
674 674 
 				return false;
675 675 
 			} else {
676 676 
 				$additional_query .= " AND spotter_output.pilot_id = :pilot_id";
677 
-				$query_values = array_merge($query_values,array(':pilot_id' => $pilot_id));
677 
+				$query_values = array_merge($query_values, array(':pilot_id' => $pilot_id));
678 678 
 			}
679 679 
 		}
680 680
681 681 
 		if ($departure_airport_route != "")
682 682 
 		{
683 
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
683 
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
684 684 
 			if (!is_string($departure_airport_route))
685 685 
 			{
686 686 
 				return false;
687 687 
 			} else {
688 688 
 				$additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route";
689 
-				$query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route));
689 
+				$query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route));
690 690 
 			}
691 691 
 		}
692 692
693 693 
 		if ($arrival_airport_route != "")
694 694 
 		{
695 
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
695 
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
696 696 
 			if (!is_string($arrival_airport_route))
697 697 
 			{
698 698 
 				return false;
699 699 
 			} else {
700 700 
 				$additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route";
701 
-				$query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route));
701 
+				$query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route));
702 702 
 			}
703 703 
 		}
704 704
705 705 
 		if ($altitude != "")
706 706 
 		{
707 707 
 			$altitude_array = explode(",", $altitude);
708 
-			$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
709 
-			$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
708 
+			$altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
709 
+			$altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
710 710
711 711 
 			if ($altitude_array[1] != "")
712 712 
 			{                
@@ -722,8 +722,8 @@  discard block
 
 block discarded – undo
722 722 
 		if ($date_posted != "")
723 723 
 		{
724 724 
 			$date_array = explode(",", $date_posted);
725 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
726 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
725 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
726 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
727 727
728 728 
 			if ($globalTimezone != '') {
729 729 
 				date_default_timezone_set($globalTimezone);
 
@@ -754,8 +754,8 @@  discard block
 
 block discarded – undo
754 754 
 		{
755 755 
 			$limit_array = explode(",", $limit);
756 756
757 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
758 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
757 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
758 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
759 759
760 760 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
761 761 
 			{
 
@@ -784,23 +784,23 @@  discard block
 
 block discarded – undo
784 784
785 785
786 786 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
787 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
787 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
788 788
789 789 
 			if ($globalDBdriver == 'mysql') {
790 
-				$query="SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance
790 
+				$query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance
791 791 
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
792 792 
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
793 793 
 			} else {
794 
-				$query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
794 
+				$query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
795 795 
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
796 796 
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(spotter_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
797 797 
 			}
798 798 
 		} else {
799 
-			$query  = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> ''
799 
+			$query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> ''
800 800 
 					".$additional_query."
801 801 
 					".$orderby_query;
802 802 
 		}
803 
-		$spotter_array = $this->getDataFromDB($query, $query_values,$limit_query);
803 
+		$spotter_array = $this->getDataFromDB($query, $query_values, $limit_query);
804 804 
 		return $spotter_array;
805 805 
 	}
806 806 
 	
@@ -823,8 +823,8 @@  discard block
 
 block discarded – undo
823 823 
 		{
824 824 
 			$limit_array = explode(",", $limit);
825 825
826 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
827 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
826 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
827 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
828 828
829 829 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
830 830 
 			{
 
@@ -841,9 +841,9 @@  discard block
 
 block discarded – undo
841 841 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
842 842 
 		}
843 843
844 
-		$query  = $global_query.$filter_query." ".$orderby_query;
844 
+		$query = $global_query.$filter_query." ".$orderby_query;
845 845
846 
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
846 
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
847 847
848 848 
 		return $spotter_array;
849 849 
 	}
 
@@ -889,34 +889,34 @@  discard block
 
 block discarded – undo
889 889 
 			{
890 890 
 				return false;
891 891 
 			} else {
892 
-				if ($interval == "30m"){
892 
+				if ($interval == "30m") {
893 893 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date ';
894 
-				} else if ($interval == "1h"){
894 
+				} else if ($interval == "1h") {
895 895 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date ';
896 
-				} else if ($interval == "3h"){
896 
+				} else if ($interval == "3h") {
897 897 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date ';
898 
-				} else if ($interval == "6h"){
898 
+				} else if ($interval == "6h") {
899 899 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date ';
900 
-				} else if ($interval == "12h"){
900 
+				} else if ($interval == "12h") {
901 901 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date ';
902 
-				} else if ($interval == "24h"){
902 
+				} else if ($interval == "24h") {
903 903 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date ';
904 
-				} else if ($interval == "7d"){
904 
+				} else if ($interval == "7d") {
905 905 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date ';
906 
-				} else if ($interval == "30d"){
906 
+				} else if ($interval == "30d") {
907 907 
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date ';
908 908 
 				}
909 909 
 			}
910 910 
 		}
911 911
912 
-		$query  = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output
912 
+		$query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output
913 913 
                    WHERE spotter_output.latitude <> ''
914 914 
 				   AND spotter_output.longitude <> ''
915 915 
                    ".$additional_query."
916 916 
                    HAVING distance < :radius
917 917 
 				   ORDER BY distance";
918 918
919 
-		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query);
919 
+		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query);
920 920
921 921 
 		return $spotter_array;
922 922 
 	}
 
@@ -928,21 +928,21 @@  discard block
 
 block discarded – undo
928 928 
 	* @return Array the spotter information
929 929 
 	*
930 930 
 	*/
931 
-	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
931 
+	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array())
932 932 
 	{
933 933 
 		global $global_query;
934 934
935 935 
 		date_default_timezone_set('UTC');
936 936
937 
-		$filter_query = $this->getFilter($filter,true,true);
937 
+		$filter_query = $this->getFilter($filter, true, true);
938 938
939 939 
 		$limit_query = '';
940 940 
 		if ($limit != "")
941 941 
 		{
942 942 
 			$limit_array = explode(",", $limit);
943 943
944 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
945 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
944 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
945 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
946 946
947 947 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
948 948 
 			{
 
@@ -959,7 +959,7 @@  discard block
 
 block discarded – undo
959 959 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
960 960 
 		}
961 961
962 
-		$query  = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
962 
+		$query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
963 963
964 964 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
965 965 
 
@@ -978,15 +978,15 @@  discard block
 
 block discarded – undo
978 978 
 		global $global_query;
979 979
980 980 
 		date_default_timezone_set('UTC');
981 
-		$filter_query = $this->getFilter($filter,true,true);
981 
+		$filter_query = $this->getFilter($filter, true, true);
982 982
983 983 
 		$limit_query = '';
984 984 
 		if ($limit != "")
985 985 
 		{
986 986 
 			$limit_array = explode(",", $limit);
987 987
988 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
989 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
988 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
989 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
990 990
991 991 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
992 992 
 			{
 
@@ -1003,7 +1003,7 @@  discard block
 
 block discarded – undo
1003 1003 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1004 1004 
 		}
1005 1005
1006 
-		$query  = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1006 
+		$query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1007 1007
1008 1008 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1009 1009 
 
@@ -1017,20 +1017,20 @@  discard block
 
 block discarded – undo
1017 1017 
 	* @return Array the spotter information
1018 1018 
 	*
1019 1019 
 	*/
1020 
-	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
1020 
+	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array())
1021 1021 
 	{
1022 1022 
 		global $global_query;
1023 1023
1024 1024 
 		date_default_timezone_set('UTC');
1025 
-		$filter_query = $this->getFilter($filter,true,true);
1025 
+		$filter_query = $this->getFilter($filter, true, true);
1026 1026
1027 1027 
 		$limit_query = '';
1028 1028 
 		if ($limit != "")
1029 1029 
 		{
1030 1030 
 			$limit_array = explode(",", $limit);
1031 1031
1032 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1033 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1032 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1033 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1034 1034
1035 1035 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1036 1036 
 			{
 
@@ -1047,7 +1047,7 @@  discard block
 
 block discarded – undo
1047 1047 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1048 1048 
 		}
1049 1049
1050 
-		$query  = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1050 
+		$query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1051 1051
1052 1052 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1053 1053 
 
@@ -1067,7 +1067,7 @@  discard block
 
 block discarded – undo
1067 1067
1068 1068 
 		date_default_timezone_set('UTC');
1069 1069
1070 
-		$filter_query = $this->getFilter($filter,true,true);
1070 
+		$filter_query = $this->getFilter($filter, true, true);
1071 1071
1072 1072 
 		$limit_query = '';
1073 1073 
 		
@@ -1075,8 +1075,8 @@  discard block
 
 block discarded – undo
1075 1075 
 		{
1076 1076 
 			$limit_array = explode(",", $limit);
1077 1077
1078 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1079 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1078 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1079 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1080 1080
1081 1081 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1082 1082 
 			{
 
@@ -1093,7 +1093,7 @@  discard block
 
 block discarded – undo
1093 1093 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1094 1094 
 		}
1095 1095
1096 
-		$query  = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1096 
+		$query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1097 1097
1098 1098 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1099 1099 
 
@@ -1112,14 +1112,14 @@  discard block
 
 block discarded – undo
1112 1112 
 		global $global_query;
1113 1113
1114 1114 
 		date_default_timezone_set('UTC');
1115 
-		$filter_query = $this->getFilter($filter,true,true);
1115 
+		$filter_query = $this->getFilter($filter, true, true);
1116 1116 
 		$limit_query = '';
1117 1117 
 		if ($limit != "")
1118 1118 
 		{
1119 1119 
 			$limit_array = explode(",", $limit);
1120 1120
1121 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1122 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1121 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1122 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1123 1123
1124 1124 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1125 1125 
 			{
 
@@ -1136,7 +1136,7 @@  discard block
 
 block discarded – undo
1136 1136 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
1137 1137 
 		}
1138 1138
1139 
-		$query  = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1139 
+		$query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
1140 1140
1141 1141 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1142 1142 
 
@@ -1160,9 +1160,9 @@  discard block
 
 block discarded – undo
1160 1160 
 		$query_values = array(':id' => $id);
1161 1161
1162 1162 
 		//$query  = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." ";
1163 
-		$query  = $global_query." WHERE ".$additional_query." ";
1163 
+		$query = $global_query." WHERE ".$additional_query." ";
1164 1164
1165 
-		$spotter_array = $this->getDataFromDB($query,$query_values);
1165 
+		$spotter_array = $this->getDataFromDB($query, $query_values);
1166 1166
1167 1167 
 		return $spotter_array;
1168 1168 
 	}
 
@@ -1200,8 +1200,8 @@  discard block
 
 block discarded – undo
1200 1200 
 		{
1201 1201 
 			$limit_array = explode(",", $limit);
1202 1202
1203 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1204 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1203 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1204 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1205 1205
1206 1206 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1207 1207 
 			{
 
@@ -1242,7 +1242,7 @@  discard block
 
 block discarded – undo
1242 1242 
 		$query_values = array();
1243 1243 
 		$limit_query = '';
1244 1244 
 		$additional_query = '';
1245 
-		$filter_query = $this->getFilter($filter,true,true);
1245 
+		$filter_query = $this->getFilter($filter, true, true);
1246 1246
1247 1247 
 		if ($aircraft_type != "")
1248 1248 
 		{
 
@@ -1259,8 +1259,8 @@  discard block
 
 block discarded – undo
1259 1259 
 		{
1260 1260 
 			$limit_array = explode(",", $limit);
1261 1261
1262 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1263 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1262 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1263 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1264 1264
1265 1265 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1266 1266 
 			{
 
@@ -1316,8 +1316,8 @@  discard block
 
 block discarded – undo
1316 1316 
 		{
1317 1317 
 			$limit_array = explode(",", $limit);
1318 1318
1319 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1320 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1319 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1320 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1321 1321
1322 1322 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1323 1323 
 			{
 
@@ -1333,7 +1333,7 @@  discard block
 
 block discarded – undo
1333 1333 
 		} else {
1334 1334 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1335 1335 
 		}
1336 
-		$filter_query = $this->getFilter($filter,true,true);
1336 
+		$filter_query = $this->getFilter($filter, true, true);
1337 1337
1338 1338 
 		//$query = $global_query.$filter_query." spotter_output.ident <> '' ".$additional_query." ".$orderby_query;
1339 1339 
 		$query = $global_query.$filter_query." ".$additional_query." ".$orderby_query;
 
@@ -1352,7 +1352,7 @@  discard block
 
 block discarded – undo
1352 1352 
 	* @return Array the spotter information
1353 1353 
 	*
1354 1354 
 	*/
1355 
-	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
1355 
+	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array())
1356 1356 
 	{
1357 1357 
 		global $global_query;
1358 1358 
 		
@@ -1361,7 +1361,7 @@  discard block
 
 block discarded – undo
1361 1361 
 		$query_values = array();
1362 1362 
 		$limit_query = '';
1363 1363 
 		$additional_query = '';
1364 
-		$filter_query = $this->getFilter($filters,true,true);
1364 
+		$filter_query = $this->getFilter($filters, true, true);
1365 1365
1366 1366 
 		if ($airline != "")
1367 1367 
 		{
 
@@ -1378,8 +1378,8 @@  discard block
 
 block discarded – undo
1378 1378 
 		{
1379 1379 
 			$limit_array = explode(",", $limit);
1380 1380
1381 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1382 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1381 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1382 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1383 1383
1384 1384 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1385 1385 
 			{
 
@@ -1409,7 +1409,7 @@  discard block
 
 block discarded – undo
1409 1409 
 	* @return Array the spotter information
1410 1410 
 	*
1411 1411 
 	*/
1412 
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1412 
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1413 1413 
 	{
1414 1414 
 		global $global_query;
1415 1415 
 		
@@ -1417,7 +1417,7 @@  discard block
 
 block discarded – undo
1417 1417 
 		$query_values = array();
1418 1418 
 		$limit_query = '';
1419 1419 
 		$additional_query = '';
1420 
-		$filter_query = $this->getFilter($filters,true,true);
1420 
+		$filter_query = $this->getFilter($filters, true, true);
1421 1421
1422 1422 
 		if ($airport != "")
1423 1423 
 		{
 
@@ -1434,8 +1434,8 @@  discard block
 
 block discarded – undo
1434 1434 
 		{
1435 1435 
 			$limit_array = explode(",", $limit);
1436 1436
1437 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1438 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1437 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1438 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1439 1439
1440 1440 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1441 1441 
 			{
 
@@ -1467,7 +1467,7 @@  discard block
 
 block discarded – undo
1467 1467 
 	* @return Array the spotter information
1468 1468 
 	*
1469 1469 
 	*/
1470 
-	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
1470 
+	public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array())
1471 1471 
 	{
1472 1472 
 		global $global_query, $globalTimezone, $globalDBdriver;
1473 1473 
 		
@@ -1475,7 +1475,7 @@  discard block
 
 block discarded – undo
1475 1475 
 		$limit_query = '';
1476 1476 
 		$additional_query = '';
1477 1477
1478 
-		$filter_query = $this->getFilter($filter,true,true);
1478 
+		$filter_query = $this->getFilter($filter, true, true);
1479 1479
1480 1480 
 		if ($date != "")
1481 1481 
 		{
 
@@ -1504,8 +1504,8 @@  discard block
 
 block discarded – undo
1504 1504 
 		{
1505 1505 
 			$limit_array = explode(",", $limit);
1506 1506
1507 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1508 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1507 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1508 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1509 1509
1510 1510 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1511 1511 
 			{
 
@@ -1535,7 +1535,7 @@  discard block
 
 block discarded – undo
1535 1535 
 	* @return Array the spotter information
1536 1536 
 	*
1537 1537 
 	*/
1538 
-	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
1538 
+	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array())
1539 1539 
 	{
1540 1540 
 		global $global_query;
1541 1541 
 		
@@ -1544,7 +1544,7 @@  discard block
 
 block discarded – undo
1544 1544 
 		$query_values = array();
1545 1545 
 		$limit_query = '';
1546 1546 
 		$additional_query = '';
1547 
-		$filter_query = $this->getFilter($filters,true,true);
1547 
+		$filter_query = $this->getFilter($filters, true, true);
1548 1548 
 		if ($country != "")
1549 1549 
 		{
1550 1550 
 			if (!is_string($country))
 
@@ -1561,8 +1561,8 @@  discard block
 
 block discarded – undo
1561 1561 
 		{
1562 1562 
 			$limit_array = explode(",", $limit);
1563 1563
1564 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1565 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1564 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1565 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1566 1566
1567 1567 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1568 1568 
 			{
 
@@ -1602,7 +1602,7 @@  discard block
 
 block discarded – undo
1602 1602 
 		$query_values = array();
1603 1603 
 		$additional_query = '';
1604 1604 
 		$limit_query = '';
1605 
-		$filter_query = $this->getFilter($filters,true,true);
1605 
+		$filter_query = $this->getFilter($filters, true, true);
1606 1606
1607 1607 
 		if ($aircraft_manufacturer != "")
1608 1608 
 		{
 
@@ -1619,8 +1619,8 @@  discard block
 
 block discarded – undo
1619 1619 
 		{
1620 1620 
 			$limit_array = explode(",", $limit);
1621 1621
1622 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1623 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1622 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1623 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1624 1624
1625 1625 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1626 1626 
 			{
 
@@ -1662,14 +1662,14 @@  discard block
 
 block discarded – undo
1662 1662 
 		$query_values = array();
1663 1663 
 		$additional_query = '';
1664 1664 
 		$limit_query = '';
1665 
-		$filter_query = $this->getFilter($filters,true,true);
1665 
+		$filter_query = $this->getFilter($filters, true, true);
1666 1666 
 		if ($departure_airport_icao != "")
1667 1667 
 		{
1668 1668 
 			if (!is_string($departure_airport_icao))
1669 1669 
 			{
1670 1670 
 				return false;
1671 1671 
 			} else {
1672 
-				$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
1672 
+				$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
1673 1673 
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)";
1674 1674 
 				//$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao AND spotter_output.real_departure_airport_icao IS NULL) OR spotter_output.real_departure_airport_icao = :departure_airport_icao";
1675 1675 
 				$query_values = array(':departure_airport_icao' => $departure_airport_icao);
 
@@ -1682,10 +1682,10 @@  discard block
 
 block discarded – undo
1682 1682 
 			{
1683 1683 
 				return false;
1684 1684 
 			} else {
1685 
-				$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
1685 
+				$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
1686 1686 
 				$additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)";
1687 1687 
 				//$additional_query .= " AND ((spotter_output.arrival_airport_icao = :arrival_airport_icao AND spotter_output.real_arrival_airport_icao IS NULL) OR spotter_output.real_arrival_airport_icao = :arrival_airport_icao)";
1688 
-				$query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao));
1688 
+				$query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao));
1689 1689 
 			}
1690 1690 
 		}
1691 1691 
 		
@@ -1693,8 +1693,8 @@  discard block
 
 block discarded – undo
1693 1693 
 		{
1694 1694 
 			$limit_array = explode(",", $limit);
1695 1695
1696 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1697 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1696 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1697 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1698 1698
1699 1699 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1700 1700 
 			{
 
@@ -1733,15 +1733,15 @@  discard block
 
 block discarded – undo
1733 1733 
 		global $global_query;
1734 1734
1735 1735 
 		date_default_timezone_set('UTC');
1736 
-		$filter_query = $this->getFilter($filter,true,true);
1736 
+		$filter_query = $this->getFilter($filter, true, true);
1737 1737 
 		$limit_query = '';
1738 1738
1739 1739 
 		if ($limit != "")
1740 1740 
 		{
1741 1741 
 			$limit_array = explode(",", $limit);
1742 1742
1743 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1744 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1743 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1744 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1745 1745
1746 1746 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1747 1747 
 			{
 
@@ -1758,7 +1758,7 @@  discard block
 
 block discarded – undo
1758 1758 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
1759 1759 
 		}
1760 1760
1761 
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1761 
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
1762 1762
1763 1763 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
1764 1764 
 
@@ -1771,19 +1771,19 @@  discard block
 
 block discarded – undo
1771 1771 
 	* @return String the highlight text
1772 1772 
 	*
1773 1773 
 	*/
1774 
-	public function getHighlightByRegistration($registration,$filter = array())
1774 
+	public function getHighlightByRegistration($registration, $filter = array())
1775 1775 
 	{
1776 1776 
 		global $global_query;
1777 1777
1778 1778 
 		date_default_timezone_set('UTC');
1779 
-		$filter_query = $this->getFilter($filter,true,true);
1780 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
1779 
+		$filter_query = $this->getFilter($filter, true, true);
1780 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
1781 1781
1782 
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1782 
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
1783 1783 
 		$sth = $this->db->prepare($query);
1784 1784 
 		$sth->execute(array(':registration' => $registration));
1785 1785
1786 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1786 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1787 1787 
 		{
1788 1788 
 			$highlight = $row['highlight'];
1789 1789 
 		}
 
@@ -1799,14 +1799,14 @@  discard block
 
 block discarded – undo
1799 1799 
 	* @return String usage
1800 1800 
 	*
1801 1801 
 	*/
1802 
-	public function getSquawkUsage($squawk = '',$country = 'FR')
1802 
+	public function getSquawkUsage($squawk = '', $country = 'FR')
1803 1803 
 	{
1804 1804
1805 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_STRING);
1806 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
1805 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_STRING);
1806 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
1807 1807
1808 1808 
 		$query  = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1";
1809 
-		$query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country);
1809 
+		$query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country);
1810 1810
1811 1811 
 		$sth = $this->db->prepare($query);
1812 1812 
 		$sth->execute($query_values);
 
@@ -1828,9 +1828,9 @@  discard block
 
 block discarded – undo
1828 1828 
 	public function getAirportIcao($airport_iata = '')
1829 1829 
 	{
1830 1830
1831 
-		$airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING);
1831 
+		$airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING);
1832 1832
1833 
-		$query  = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1833 
+		$query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
1834 1834 
 		$query_values = array(':airport' => $airport_iata);
1835 1835
1836 1836 
 		$sth = $this->db->prepare($query);
 
@@ -1852,12 +1852,12 @@  discard block
 
 block discarded – undo
1852 1852 
 	* @return Float distance to the airport
1853 1853 
 	*
1854 1854 
 	*/
1855 
-	public function getAirportDistance($airport_icao,$latitude,$longitude)
1855 
+	public function getAirportDistance($airport_icao, $latitude, $longitude)
1856 1856 
 	{
1857 1857
1858 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
1858 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
1859 1859
1860 
-		$query  = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1860 
+		$query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
1861 1861 
 		$query_values = array(':airport' => $airport_icao);
1862 1862 
 		$sth = $this->db->prepare($query);
1863 1863 
 		$sth->execute($query_values);
 
@@ -1867,7 +1867,7 @@  discard block
 
 block discarded – undo
1867 1867 
 			$airport_latitude = $row['latitude'];
1868 1868 
 			$airport_longitude = $row['longitude'];
1869 1869 
 			$Common = new Common();
1870 
-			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
1870 
+			return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude);
1871 1871 
 		} else return '';
1872 1872 
 	}
1873 1873 
 	
@@ -1881,11 +1881,11 @@  discard block
 
 block discarded – undo
1881 1881 
 	public function getAllAirportInfo($airport = '')
1882 1882 
 	{
1883 1883
1884 
-		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
1884 
+		$airport = filter_var($airport, FILTER_SANITIZE_STRING);
1885 1885
1886 1886 
 		$query_values = array();
1887 1887 
 		if ($airport == 'NA') {
1888 
-			return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => ''));
1888 
+			return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => ''));
1889 1889 
 		} elseif ($airport == '') {
1890 1890 
 			$query  = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport";
1891 1891 
 		} else {
 
@@ -1933,14 +1933,14 @@  discard block
 
 block discarded – undo
1933 1933 
 	{
1934 1934 
 		$lst_countries = '';
1935 1935 
 		foreach ($countries as $country) {
1936 
-			$country = filter_var($country,FILTER_SANITIZE_STRING);
1936 
+			$country = filter_var($country, FILTER_SANITIZE_STRING);
1937 1937 
 			if ($lst_countries == '') {
1938 1938 
 				$lst_countries = "'".$country."'";
1939 1939 
 			} else {
1940 1940 
 				$lst_countries .= ",'".$country."'";
1941 1941 
 			}
1942 1942 
 		}
1943 
-		$query  = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1943 
+		$query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
1944 1944
1945 1945 
 		$sth = $this->db->prepare($query);
1946 1946 
 		$sth->execute();
 
@@ -1948,7 +1948,7 @@  discard block
 
 block discarded – undo
1948 1948 
 		$airport_array = array();
1949 1949 
 		$temp_array = array();
1950 1950
1951 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1951 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1952 1952 
 		{
1953 1953 
 			$temp_array['name'] = $row['name'];
1954 1954 
 			$temp_array['city'] = $row['city'];
 
@@ -1976,10 +1976,10 @@  discard block
 
 block discarded – undo
1976 1976 
 	{
1977 1977 
 		global $globalDBdriver;
1978 1978 
 		if (is_array($coord)) {
1979 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1980 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1981 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1982 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1979 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1980 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1981 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1982 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1983 1983 
 		} else return array();
1984 1984 
 		if ($globalDBdriver == 'mysql') {
1985 1985 
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
 
@@ -1991,7 +1991,7 @@  discard block
 
 block discarded – undo
1991 1991
1992 1992 
 		$airport_array = array();
1993 1993
1994 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1994 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1995 1995 
 		{
1996 1996 
 			$temp_array = $row;
1997 1997 
 
@@ -2011,13 +2011,13 @@  discard block
 
 block discarded – undo
2011 2011 
 	public function getAllWaypointsInfobyCoord($coord)
2012 2012 
 	{
2013 2013 
 		if (is_array($coord)) {
2014 
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2015 
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2016 
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2017 
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
2014 
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2015 
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2016 
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2017 
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
2018 2018 
 		} else return array();
2019 2019 
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
2020 
-		$query  = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
2020 
+		$query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
2021 2021 
 		//$query  = "SELECT waypoints.* FROM waypoints";
2022 2022 
 		//$query  = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end";
2023 2023 
 		//$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
 
@@ -2029,7 +2029,7 @@  discard block
 
 block discarded – undo
2029 2029
2030 2030 
 		$waypoints_array = array();
2031 2031
2032 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2032 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2033 2033 
 		{
2034 2034 
 			$temp_array = $row;
2035 2035 
 
@@ -2051,10 +2051,10 @@  discard block
 
 block discarded – undo
2051 2051 
 	{
2052 2052 
 		global $globalUseRealAirlines;
2053 2053 
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
2054 
-		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
2054 
+		$airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING));
2055 2055 
 		if ($airline_icao == 'NA') {
2056 2056 
 			$airline_array = array();
2057 
-			$airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2057 
+			$airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
2058 2058 
 			return $airline_array;
2059 2059 
 		} else {
2060 2060 
 			if (strlen($airline_icao) == 2) {
 
@@ -2075,7 +2075,7 @@  discard block
 
 block discarded – undo
2075 2075 
 			if ($fromsource === NULL) {
2076 2076 
 				$sth->execute(array(':airline_icao' => $airline_icao));
2077 2077 
 			} else {
2078 
-				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
2078 
+				$sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource));
2079 2079 
 			}
2080 2080 
                         /*
2081 2081 
 			$airline_array = array();
 
@@ -2117,12 +2117,12 @@  discard block
 
 block discarded – undo
2117 2117 
 	*/
2118 2118 
 	public function getAllAircraftInfo($aircraft_type)
2119 2119 
 	{
2120 
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2120 
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2121 2121
2122 2122 
 		if ($aircraft_type == 'NA') {
2123 
-			return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2123 
+			return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
2124 2124 
 		}
2125 
-		$query  = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2125 
+		$query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
2126 2126
2127 2127 
 		$sth = $this->db->prepare($query);
2128 2128 
 		$sth->execute(array(':aircraft_type' => $aircraft_type));
 
@@ -2154,7 +2154,7 @@  discard block
 
 block discarded – undo
2154 2154 
 	*/
2155 2155 
 	public function getAircraftIcao($aircraft_type)
2156 2156 
 	{
2157 
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
2157 
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
2158 2158 
 		$all_aircraft = array('737-300' => 'B733',
2159 2159 
 				'777-200' => 'B772',
2160 2160 
 				'777-200ER' => 'B772',
 
@@ -2166,10 +2166,10 @@  discard block
 
 block discarded – undo
2166 2166 
 				'A380' => 'A388');
2167 2167 
 		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
2168 2168
2169 
-		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2169 
+		$query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
2170 2170 
 		$aircraft_type = strtoupper($aircraft_type);
2171 2171 
 		$sth = $this->db->prepare($query);
2172 
-		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
2172 
+		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,));
2173 2173 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
2174 2174 
 		if (isset($result[0]['icao'])) return $result[0]['icao'];
2175 2175 
 		else return '';
 
@@ -2184,9 +2184,9 @@  discard block
 
 block discarded – undo
2184 2184 
 	*/
2185 2185 
 	public function getAllAircraftType($aircraft_modes)
2186 2186 
 	{
2187 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
2187 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
2188 2188
2189 
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
2189 
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
2190 2190
2191 2191 
 		$sth = $this->db->prepare($query);
2192 2192 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -2207,9 +2207,9 @@  discard block
 
 block discarded – undo
2207 2207 
 	*/
2208 2208 
 	public function getAllAircraftTypeByRegistration($registration)
2209 2209 
 	{
2210 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2210 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2211 2211
2212 
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
2212 
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
2213 2213
2214 2214 
 		$sth = $this->db->prepare($query);
2215 2215 
 		$sth->execute(array(':registration' => $registration));
 
@@ -2230,8 +2230,8 @@  discard block
 
 block discarded – undo
2230 2230 
 	*/
2231 2231 
 	public function getOperator($operator)
2232 2232 
 	{
2233 
-		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
2234 
-		$query  = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2233 
+		$operator = filter_var($operator, FILTER_SANITIZE_STRING);
2234 
+		$query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
2235 2235
2236 2236 
 		$sth = $this->db->prepare($query);
2237 2237 
 		$sth->execute(array(':operator' => $operator));
 
@@ -2252,9 +2252,9 @@  discard block
 
 block discarded – undo
2252 2252 
 	*/
2253 2253 
 	public function getRouteInfo($callsign)
2254 2254 
 	{
2255 
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
2255 
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
2256 2256 
                 if ($callsign == '') return array();
2257 
-		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2257 
+		$query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
2258 2258
2259 2259 
 		$sth = $this->db->prepare($query);
2260 2260 
 		$sth->execute(array(':callsign' => $callsign));
 
@@ -2275,9 +2275,9 @@  discard block
 
 block discarded – undo
2275 2275 
 	*/
2276 2276 
 	public function getAircraftInfoByRegistration($registration)
2277 2277 
 	{
2278 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2278 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2279 2279
2280 
-		$query  = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2280 
+		$query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
2281 2281
2282 2282 
 		$sth = $this->db->prepare($query);
2283 2283 
 		$sth->execute(array(':registration' => $registration));
 
@@ -2285,7 +2285,7 @@  discard block
 
 block discarded – undo
2285 2285 
 		$aircraft_array = array();
2286 2286 
 		$temp_array = array();
2287 2287
2288 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2288 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2289 2289 
 		{
2290 2290 
 			$temp_array['airline_icao'] = $row['airline_icao'];
2291 2291 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -2307,7 +2307,7 @@  discard block
 
 block discarded – undo
2307 2307 
 	*/
2308 2308 
 	public function getAircraftOwnerByRegistration($registration)
2309 2309 
 	{
2310 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
2310 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
2311 2311 
 		$Connection = new Connection($this->db);
2312 2312 
 		if ($Connection->tableExists('aircraft_owner')) {
2313 2313 
 			$query  = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1";
 
@@ -2329,7 +2329,7 @@  discard block
 
 block discarded – undo
2329 2329 
 	public function getAllFlightsforSitemap()
2330 2330 
 	{
2331 2331 
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
2332 
-		$query  = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2332 
+		$query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
2333 2333
2334 2334 
 		$sth = $this->db->prepare($query);
2335 2335 
 		$sth->execute();
 
@@ -2376,7 +2376,7 @@  discard block
 
 block discarded – undo
2376 2376 
 		$manufacturer_array = array();
2377 2377 
 		$temp_array = array();
2378 2378
2379 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2379 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2380 2380 
 		{
2381 2381 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
2382 2382 
 
@@ -2413,7 +2413,7 @@  discard block
 
 block discarded – undo
2413 2413 
 		$aircraft_array = array();
2414 2414 
 		$temp_array = array();
2415 2415
2416 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2416 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2417 2417 
 		{
2418 2418 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
2419 2419 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 
@@ -2434,8 +2434,8 @@  discard block
 
 block discarded – undo
2434 2434 
 	*/
2435 2435 
 	public function getAllAircraftRegistrations($filters = array())
2436 2436 
 	{
2437 
-		$filter_query = $this->getFilter($filters,true,true);
2438 
-		$query  = "SELECT DISTINCT spotter_output.registration
2437 
+		$filter_query = $this->getFilter($filters, true, true);
2438 
+		$query = "SELECT DISTINCT spotter_output.registration
2439 2439 
 				FROM spotter_output".$filter_query." spotter_output.registration <> ''
2440 2440 
 				ORDER BY spotter_output.registration ASC";
2441 2441 
 
@@ -2445,7 +2445,7 @@  discard block
 
 block discarded – undo
2445 2445 
 		$aircraft_array = array();
2446 2446 
 		$temp_array = array();
2447 2447
2448 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2448 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2449 2449 
 		{
2450 2450 
 			$temp_array['registration'] = $row['registration'];
2451 2451 
 
@@ -2462,11 +2462,11 @@  discard block
 
 block discarded – undo
2462 2462 
 	* @return Array list of source name
2463 2463 
 	*
2464 2464 
 	*/
2465 
-	public function getAllSourceName($type = '',$filters = array())
2465 
+	public function getAllSourceName($type = '', $filters = array())
2466 2466 
 	{
2467 
-		$filter_query = $this->getFilter($filters,true,true);
2467 
+		$filter_query = $this->getFilter($filters, true, true);
2468 2468 
 		$query_values = array();
2469 
-		$query  = "SELECT DISTINCT spotter_output.source_name
2469 
+		$query = "SELECT DISTINCT spotter_output.source_name
2470 2470 
 				FROM spotter_output".$filter_query." spotter_output.source_name <> ''";
2471 2471 
 		if ($type != '') {
2472 2472 
 			$query_values = array(':type' => $type);
 
@@ -2481,7 +2481,7 @@  discard block
 
 block discarded – undo
2481 2481 
 		$source_array = array();
2482 2482 
 		$temp_array = array();
2483 2483
2484 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2484 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2485 2485 
 		{
2486 2486 
 			$temp_array['source_name'] = $row['source_name'];
2487 2487 
 			$source_array[] = $temp_array;
 
@@ -2497,11 +2497,11 @@  discard block
 
 block discarded – undo
2497 2497 
 	* @return Array list of airline names
2498 2498 
 	*
2499 2499 
 	*/
2500 
-	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
2500 
+	public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array())
2501 2501 
 	{
2502 
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
2503 
-		$filter_query = $this->getFilter($filters,true,true);
2504 
-		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
2502 
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
2503 
+		$filter_query = $this->getFilter($filters, true, true);
2504 
+		$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
2505 2505 
 		if ($airline_type == '' || $airline_type == 'all') {
2506 2506 
 			/*
2507 2507 
 			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
 
@@ -2520,7 +2520,7 @@  discard block
 
 block discarded – undo
2520 2520 
 				$query_data = array(':forsource' => $forsource);
2521 2521 
 			}
2522 2522 
 		} else {
2523 
-			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2523 
+			$query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
2524 2524 
 					FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
2525 2525 
 					AND spotter_output.airline_type = :airline_type
2526 2526 
 					ORDER BY spotter_output.airline_icao ASC";
 
@@ -2533,7 +2533,7 @@  discard block
 
 block discarded – undo
2533 2533 
 		$airline_array = array();
2534 2534 
 		$temp_array = array();
2535 2535
2536 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2536 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2537 2537 
 		{
2538 2538 
 			$temp_array['airline_icao'] = $row['airline_icao'];
2539 2539 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -2553,8 +2553,8 @@  discard block
 
 block discarded – undo
2553 2553 
 	*/
2554 2554 
 	public function getAllAirlineCountries($filters = array())
2555 2555 
 	{
2556 
-		$filter_query = $this->getFilter($filters,true,true);
2557 
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2556 
+		$filter_query = $this->getFilter($filters, true, true);
2557 
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2558 2558 
 				FROM spotter_output".$filter_query." spotter_output.airline_country <> ''
2559 2559 
 				ORDER BY spotter_output.airline_country ASC";
2560 2560 
 		
@@ -2565,7 +2565,7 @@  discard block
 
 block discarded – undo
2565 2565 
 		$airline_array = array();
2566 2566 
 		$temp_array = array();
2567 2567
2568 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2568 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2569 2569 
 		{
2570 2570 
 			$temp_array['airline_country'] = $row['airline_country'];
2571 2571 
 
@@ -2585,9 +2585,9 @@  discard block
 
 block discarded – undo
2585 2585 
 	*/
2586 2586 
 	public function getAllAirportNames($filters = array())
2587 2587 
 	{
2588 
-		$filter_query = $this->getFilter($filters,true,true);
2588 
+		$filter_query = $this->getFilter($filters, true, true);
2589 2589 
 		$airport_array = array();
2590 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2590 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
2591 2591 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA'
2592 2592 
 				ORDER BY spotter_output.departure_airport_city ASC";
2593 2593 
 		
@@ -2596,7 +2596,7 @@  discard block
 
 block discarded – undo
2596 2596 
 		$sth->execute();
2597 2597
2598 2598 
 		$temp_array = array();
2599 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2599 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2600 2600 
 		{
2601 2601 
 			$temp_array['airport_icao'] = $row['airport_icao'];
2602 2602 
 			$temp_array['airport_name'] = $row['airport_name'];
 
@@ -2606,14 +2606,14 @@  discard block
 
 block discarded – undo
2606 2606 
 			$airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array;
2607 2607 
 		}
2608 2608
2609 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2609 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
2610 2610 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA'
2611 2611 
 								ORDER BY spotter_output.arrival_airport_city ASC";
2612 2612
2613 2613 
 		$sth = $this->db->prepare($query);
2614 2614 
 		$sth->execute();
2615 2615
2616 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2616 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2617 2617 
 			{
2618 2618 
 		//	if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao'])
2619 2619 
 		//	{
 
@@ -2653,21 +2653,21 @@  discard block
 
 block discarded – undo
2653 2653
2654 2654 
 		$temp_array = array();
2655 2655
2656 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2656 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2657 2657 
 		{
2658 2658 
 			$temp_array['airport_country'] = $row['airport_country'];
2659 2659
2660 2660 
 			$airport_array[$row['airport_country']] = $temp_array;
2661 2661 
 		}
2662 
-		$filter_query = $this->getFilter($filters,true,true);
2663 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2662 
+		$filter_query = $this->getFilter($filters, true, true);
2663 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2664 2664 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> ''
2665 2665 
 								ORDER BY spotter_output.arrival_airport_country ASC";
2666 2666
2667 2667 
 		$sth = $this->db->prepare($query);
2668 2668 
 		$sth->execute();
2669 2669
2670 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2670 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2671 2671 
 		{
2672 2672 
 			if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country'])
2673 2673 
 			{
 
@@ -2690,9 +2690,9 @@  discard block
 
 block discarded – undo
2690 2690 
 	*/
2691 2691 
 	public function getAllCountries($filters = array())
2692 2692 
 	{
2693 
-		$Connection= new Connection($this->db);
2693 
+		$Connection = new Connection($this->db);
2694 2694 
 		if ($Connection->tableExists('countries')) {
2695 
-			$query  = "SELECT countries.name AS airport_country
2695 
+			$query = "SELECT countries.name AS airport_country
2696 2696 
 				FROM countries
2697 2697 
 				ORDER BY countries.name ASC";
2698 2698 
 			$sth = $this->db->prepare($query);
 
@@ -2701,14 +2701,14 @@  discard block
 
 block discarded – undo
2701 2701 
 			$temp_array = array();
2702 2702 
 			$country_array = array();
2703 2703
2704 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2704 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2705 2705 
 			{
2706 2706 
 				$temp_array['country'] = $row['airport_country'];
2707 2707 
 				$country_array[$row['airport_country']] = $temp_array;
2708 2708 
 			}
2709 2709 
 		} else {
2710 
-			$filter_query = $this->getFilter($filters,true,true);
2711 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2710 
+			$filter_query = $this->getFilter($filters, true, true);
2711 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
2712 2712 
 								FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> ''
2713 2713 
 								ORDER BY spotter_output.departure_airport_country ASC";
2714 2714 
 
@@ -2717,20 +2717,20 @@  discard block
 
 block discarded – undo
2717 2717
2718 2718 
 			$temp_array = array();
2719 2719 
 			$country_array = array();
2720 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
2720 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2721 2721 
 			{
2722 2722 
 				$temp_array['country'] = $row['airport_country'];
2723 2723 
 				$country_array[$row['airport_country']] = $temp_array;
2724 2724 
 			}
2725 2725
2726 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2726 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
2727 2727 
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> ''
2728 2728 
 								ORDER BY spotter_output.arrival_airport_country ASC";
2729 2729
2730 2730 
 		$sth = $this->db->prepare($query);
2731 2731 
 		$sth->execute();
2732 2732
2733 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2733 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2734 2734 
 		{
2735 2735 
 			if ($country_array[$row['airport_country']]['country'] != $row['airport_country'])
2736 2736 
 			{
 
@@ -2740,14 +2740,14 @@  discard block
 
 block discarded – undo
2740 2740 
 			}
2741 2741 
 		}
2742 2742
2743 
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2743 
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
2744 2744 
 								FROM spotter_output".$filter_query." spotter_output.airline_country <> ''
2745 2745 
 								ORDER BY spotter_output.airline_country ASC";
2746 2746
2747 2747 
 		$sth = $this->db->prepare($query);
2748 2748 
 		$sth->execute();
2749 2749
2750 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2750 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2751 2751 
 		{
2752 2752 
 			if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country'])
2753 2753 
 			{
 
@@ -2771,8 +2771,8 @@  discard block
 
 block discarded – undo
2771 2771 
 	*/
2772 2772 
 	public function getAllIdents($filters = array())
2773 2773 
 	{
2774 
-		$filter_query = $this->getFilter($filters,true,true);
2775 
-		$query  = "SELECT DISTINCT spotter_output.ident
2774 
+		$filter_query = $this->getFilter($filters, true, true);
2775 
+		$query = "SELECT DISTINCT spotter_output.ident
2776 2776 
 								FROM spotter_output".$filter_query." spotter_output.ident <> ''
2777 2777 
 								ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0";
2778 2778 
 
@@ -2782,7 +2782,7 @@  discard block
 
 block discarded – undo
2782 2782 
 		$ident_array = array();
2783 2783 
 		$temp_array = array();
2784 2784
2785 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
2785 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
2786 2786 
 		{
2787 2787 
 			$temp_array['ident'] = $row['ident'];
2788 2788 
 			$ident_array[] = $temp_array;
 
@@ -2796,9 +2796,9 @@  discard block
 
 block discarded – undo
2796 2796 
 	* @return Array number, icao, name and city of airports
2797 2797 
 	*/
2798 2798
2799 
-	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
2799 
+	public function getLast7DaysAirportsDeparture($airport_icao = '', $filters = array()) {
2800 2800 
 		global $globalTimezone, $globalDBdriver;
2801 
-		$filter_query = $this->getFilter($filters,true,true);
2801 
+		$filter_query = $this->getFilter($filters, true, true);
2802 2802 
 		if ($globalTimezone != '') {
2803 2803 
 			date_default_timezone_set($globalTimezone);
2804 2804 
 			$datetime = new DateTime();
 
@@ -2863,7 +2863,7 @@  discard block
 
 block discarded – undo
2863 2863
2864 2864 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
2865 2865 
 		global $globalTimezone, $globalDBdriver;
2866 
-		$filter_query = $this->getFilter($filters,true,true);
2866 
+		$filter_query = $this->getFilter($filters, true, true);
2867 2867 
 		if ($globalTimezone != '') {
2868 2868 
 			date_default_timezone_set($globalTimezone);
2869 2869 
 			$datetime = new DateTime();
 
@@ -2947,7 +2947,7 @@  discard block
 
 block discarded – undo
2947 2947
2948 2948 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
2949 2949 
 		global $globalTimezone, $globalDBdriver;
2950 
-		$filter_query = $this->getFilter($filters,true,true);
2950 
+		$filter_query = $this->getFilter($filters, true, true);
2951 2951 
 		if ($globalTimezone != '') {
2952 2952 
 			date_default_timezone_set($globalTimezone);
2953 2953 
 			$datetime = new DateTime();
 
@@ -2980,9 +2980,9 @@  discard block
 
 block discarded – undo
2980 2980 
 	* @return Array number, icao, name and city of airports
2981 2981 
 	*/
2982 2982
2983 
-	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
2983 
+	public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $filters = array()) {
2984 2984 
 		global $globalTimezone, $globalDBdriver;
2985 
-		$filter_query = $this->getFilter($filters,true,true);
2985 
+		$filter_query = $this->getFilter($filters, true, true);
2986 2986 
 		if ($globalTimezone != '') {
2987 2987 
 			date_default_timezone_set($globalTimezone);
2988 2988 
 			$datetime = new DateTime();
 
@@ -3114,12 +3114,12 @@  discard block
 
 block discarded – undo
3114 3114 
 		} else $offset = '+00:00';
3115 3115
3116 3116 
 		if ($globalDBdriver == 'mysql') {
3117 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3117 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
3118 3118 
 								FROM spotter_output
3119 3119 
 								WHERE spotter_output.date <> ''
3120 3120 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
3121 3121 
 		} else {
3122 
-			$query  = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3122 
+			$query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
3123 3123 
 								FROM spotter_output
3124 3124 
 								WHERE spotter_output.date <> ''
3125 3125 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
 
@@ -3131,7 +3131,7 @@  discard block
 
 block discarded – undo
3131 3131 
 		$date_array = array();
3132 3132 
 		$temp_array = array();
3133 3133
3134 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3134 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3135 3135 
 		{
3136 3136 
 			$temp_array['date'] = $row['date'];
3137 3137 
 
@@ -3151,7 +3151,7 @@  discard block
 
 block discarded – undo
3151 3151 
 	*/
3152 3152 
 	public function getAllRoutes()
3153 3153 
 	{
3154 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao
3154 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao
3155 3155 
 				FROM spotter_output
3156 3156 
 				WHERE spotter_output.ident <> ''
3157 3157 
 				GROUP BY route
 
@@ -3162,7 +3162,7 @@  discard block
 
 block discarded – undo
3162 3162
3163 3163 
 		$routes_array = array();
3164 3164 
 		$temp_array = array();
3165 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3165 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3166 3166 
 		{
3167 3167 
 			$temp_array['route'] = $row['route'];
3168 3168 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -3181,21 +3181,21 @@  discard block
 
 block discarded – undo
3181 3181 
 	* @return String success or false
3182 3182 
 	*
3183 3183 
 	*/
3184 
-	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
3184 
+	public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL)
3185 3185 
 	{
3186 3186 
 		if (!is_numeric(substr($ident, 0, 3)))
3187 3187 
 		{
3188 3188 
 			if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3189 
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3189 
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3190 3190 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3191 
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3191 
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3192 3192 
 			} else {
3193 3193 
 				$airline_array = $this->getAllAirlineInfo("NA");
3194 3194 
 			}
3195 3195 
 			if (count($airline_array) == 0) {
3196 3196 
 				$airline_array = $this->getAllAirlineInfo("NA");
3197 3197 
 			}
3198 
-			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3198 
+			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3199 3199 
 				$airline_array = $this->getAllAirlineInfo("NA");
3200 3200 
 			}
3201 3201 
 		} else {
 
@@ -3208,7 +3208,7 @@  discard block
 
 block discarded – undo
3208 3208
3209 3209
3210 3210 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
3211 
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
3211 
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type);
3212 3212
3213 3213 
 		try {
3214 3214 
 			$sth = $this->db->prepare($query);
 
@@ -3229,11 +3229,11 @@  discard block
 
 block discarded – undo
3229 3229 
 	* @return String success or false
3230 3230 
 	*
3231 3231 
 	*/
3232 
-	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
3232 
+	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '')
3233 3233 
 	{
3234 3234 
 		if ($groundspeed == '') $groundspeed = NULL;
3235 3235 
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
3236 
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3236 
+                $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
3237 3237
3238 3238 
 		try {
3239 3239 
 			$sth = $this->db->prepare($query);
 
@@ -3273,7 +3273,7 @@  discard block
 
 block discarded – undo
3273 3273 
 	* @param String $verticalrate vertival rate of flight
3274 3274 
 	* @return String success or false
3275 3275 
 	*/
3276 
-	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '')
3276 
+	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '')
3277 3277 
 	{
3278 3278 
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
3279 3279 
 		
@@ -3297,13 +3297,13 @@  discard block
 
 block discarded – undo
3297 3297 
 				if ($ModeS != '') {
3298 3298 
 					$timeelapsed = microtime(true);
3299 3299 
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
3300 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3300 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3301 3301 
 				} else {
3302 
-					$myhex = explode('-',$flightaware_id);
3302 
+					$myhex = explode('-', $flightaware_id);
3303 3303 
 					if (count($myhex) > 0) {
3304 3304 
 						$timeelapsed = microtime(true);
3305 3305 
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
3306 
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3306 
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3307 3307 
 					}
3308 3308 
 				}
3309 3309 
 			}
 
@@ -3325,24 +3325,24 @@  discard block
 
 block discarded – undo
3325 3325 
 				{
3326 3326 
 					$timeelapsed = microtime(true);
3327 3327 
 					if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
3328 
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
3328 
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
3329 3329 
 					} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
3330 
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
3330 
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
3331 3331 
 					} else {
3332 3332 
 						$airline_array = $this->getAllAirlineInfo("NA");
3333 3333 
 					}
3334 3334 
 					if (count($airline_array) == 0) {
3335 3335 
 						$airline_array = $this->getAllAirlineInfo("NA");
3336 3336 
 					}
3337 
-					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
3337 
+					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
3338 3338 
 						$airline_array = $this->getAllAirlineInfo("NA");
3339 3339 
 					}
3340 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3340 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3341 3341
3342 3342 
 				} else {
3343 3343 
 					$timeelapsed = microtime(true);
3344 3344 
 					$airline_array = $this->getAllAirlineInfo("NA");
3345 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3345 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3346 3346 
 				}
3347 3347 
 			}
3348 3348 
 		} else $airline_array = array();
 
@@ -3359,27 +3359,27 @@  discard block
 
 block discarded – undo
3359 3359 
 				{
3360 3360 
 					$timeelapsed = microtime(true);
3361 3361 
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3362 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3362 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3363 3363 
 				} else {
3364 3364 
 					$timeelapsed = microtime(true);
3365 3365 
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3366 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3366 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3367 3367 
 				}
3368 3368 
 			}
3369 3369 
 		} else {
3370 3370 
 			if ($ModeS != '') {
3371 3371 
 				$timeelapsed = microtime(true);
3372 3372 
 				$aircraft_icao = $this->getAllAircraftType($ModeS);
3373 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3373 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3374 3374 
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
3375 3375 
 				{
3376 3376 
 					$timeelapsed = microtime(true);
3377 3377 
 					$aircraft_array = $this->getAllAircraftInfo("NA");
3378 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3378 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3379 3379 
 				} else {
3380 3380 
 					$timeelapsed = microtime(true);
3381 3381 
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
3382 
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3382 
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3383 3383 
 				}
3384 3384 
 			}
3385 3385 
 		}
 
@@ -3395,7 +3395,7 @@  discard block
 
 block discarded – undo
3395 3395 
 			} else {
3396 3396 
 				$timeelapsed = microtime(true);
3397 3397 
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
3398 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3398 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3399 3399 
 			}
3400 3400 
 		}
3401 3401 
 		
@@ -3410,7 +3410,7 @@  discard block
 
 block discarded – undo
3410 3410 
 			} else {
3411 3411 
 				$timeelapsed = microtime(true);
3412 3412 
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
3413 
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3413 
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3414 3414 
 			}
3415 3415 
 		}
3416 3416 
 
@@ -3474,7 +3474,7 @@  discard block
 
 block discarded – undo
3474 3474 
 		{
3475 3475 
 			$timeelapsed = microtime(true);
3476 3476 
 			$image_array = $Image->getSpotterImage($registration);
3477 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3477 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3478 3478 
 			if (!isset($image_array[0]['registration']))
3479 3479 
 			{
3480 3480 
 				//echo "Add image !!!! \n";
 
@@ -3482,7 +3482,7 @@  discard block
 
 block discarded – undo
3482 3482 
 			}
3483 3483 
 			$timeelapsed = microtime(true);
3484 3484 
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
3485 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3485 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3486 3486 
 			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
3487 3487 
 		}
3488 3488 
     
@@ -3490,33 +3490,33 @@  discard block
 
 block discarded – undo
3490 3490 
 		{
3491 3491 
             		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
3492 3492 
             		else $airline_icao = '';
3493 
-			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
3493 
+			$image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao);
3494 3494 
 			if (!isset($image_array[0]['registration']))
3495 3495 
 			{
3496 3496 
 				//echo "Add image !!!! \n";
3497 
-				$Image->addSpotterImage('',$aircraft_icao,$airline_icao);
3497 
+				$Image->addSpotterImage('', $aircraft_icao, $airline_icao);
3498 3498 
 			}
3499 3499 
 		}
3500 3500
3501 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
3502 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
3503 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
3504 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3505 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
3506 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
3507 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3508 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3509 
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
3510 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3511 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
3512 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
3513 
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
3514 
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
3515 
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
3516 
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
3517 
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
3518 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
3519 
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
3501 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
3502 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
3503 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
3504 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3505 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
3506 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
3507 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3508 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3509 
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
3510 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3511 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
3512 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
3513 
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
3514 
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
3515 
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
3516 
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
3517 
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
3518 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
3519 
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
3520 3520
3521 3521 
 		if (count($airline_array) == 0)
3522 3522 
 		{
 
@@ -3544,7 +3544,7 @@  discard block
 
 block discarded – undo
3544 3544 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
3545 3545 
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
3546 3546 
                 if (!isset($aircraft_owner)) $aircraft_owner = NULL;
3547 
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, 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,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name)
3547 
+                $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, 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,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name)
3548 3548 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,: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, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
3549 3549
3550 3550 
                 $airline_name = $airline_array[0]['name'];
 
@@ -3554,7 +3554,7 @@  discard block
 
 block discarded – undo
3554 3554 
 		if ($airline_type == '') {
3555 3555 
 			$timeelapsed = microtime(true);
3556 3556 
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
3557 
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
3557 
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
3558 3558 
 		}
3559 3559 
 		if ($airline_type == null) $airline_type = '';
3560 3560 
                 $aircraft_type = $aircraft_array[0]['type'];
 
@@ -3565,7 +3565,7 @@  discard block
 
 block discarded – undo
3565 3565 
                 $arrival_airport_name = $arrival_airport_array[0]['name'];
3566 3566 
                 $arrival_airport_city = $arrival_airport_array[0]['city'];
3567 3567 
                 $arrival_airport_country = $arrival_airport_array[0]['country'];
3568 
-                $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_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, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3568 
+                $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_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, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
3569 3569
3570 3570 
 		try {
3571 3571 
 		        
@@ -3591,13 +3591,13 @@  discard block
 
 block discarded – undo
3591 3591 
 	{
3592 3592 
 		global $globalDBdriver, $globalTimezone;
3593 3593 
 		if ($globalDBdriver == 'mysql') {
3594 
-			$query  = "SELECT spotter_output.ident FROM spotter_output
3594 
+			$query = "SELECT spotter_output.ident FROM spotter_output
3595 3595 
 								WHERE spotter_output.ident = :ident
3596 3596 
 								AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
3597 3597 
 								AND spotter_output.date < UTC_TIMESTAMP()";
3598 3598 
 			$query_data = array(':ident' => $ident);
3599 3599 
 		} else {
3600 
-			$query  = "SELECT spotter_output.ident FROM spotter_output
3600 
+			$query = "SELECT spotter_output.ident FROM spotter_output
3601 3601 
 								WHERE spotter_output.ident = :ident
3602 3602 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
3603 3603 
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -3606,8 +3606,8 @@  discard block
 
 block discarded – undo
3606 3606
3607 3607 
 		$sth = $this->db->prepare($query);
3608 3608 
 		$sth->execute($query_data);
3609 
-    		$ident_result='';
3610 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3609 
+    		$ident_result = '';
3610 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3611 3611 
 		{
3612 3612 
 			$ident_result = $row['ident'];
3613 3613 
 		}
 
@@ -3633,8 +3633,8 @@  discard block
 
 block discarded – undo
3633 3633 
 				return false;
3634 3634 
 			} else {
3635 3635 
 				$q_array = explode(" ", $q);
3636 
-				foreach ($q_array as $q_item){
3637 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
3636 
+				foreach ($q_array as $q_item) {
3637 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
3638 3638 
 					$additional_query .= " AND (";
3639 3639 
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
3640 3640 
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
 
@@ -3649,11 +3649,11 @@  discard block
 
 block discarded – undo
3649 3649 
 			}
3650 3650 
 		}
3651 3651 
 		if ($globalDBdriver == 'mysql') {
3652 
-			$query  = "SELECT spotter_output.* FROM spotter_output
3652 
+			$query = "SELECT spotter_output.* FROM spotter_output
3653 3653 
 				WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
3654 3654 
 				AND spotter_output.date < UTC_TIMESTAMP()";
3655 3655 
 		} else {
3656 
-			$query  = "SELECT spotter_output.* FROM spotter_output
3656 
+			$query = "SELECT spotter_output.* FROM spotter_output
3657 3657 
 				WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
3658 3658 
 				AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
3659 3659 
 		}
 
@@ -3670,11 +3670,11 @@  discard block
 
 block discarded – undo
3670 3670 
 	* @return Array the airline list
3671 3671 
 	*
3672 3672 
 	*/
3673 
-	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3673 
+	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3674 3674 
 	{
3675 3675 
 		global $globalDBdriver;
3676 
-		$filter_query = $this->getFilter($filters,true,true);
3677 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3676 
+		$filter_query = $this->getFilter($filters, true, true);
3677 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3678 3678 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA' ";
3679 3679 
 		if ($olderthanmonths > 0) {
3680 3680 
 			if ($globalDBdriver == 'mysql') {
 
@@ -3698,7 +3698,7 @@  discard block
 
 block discarded – undo
3698 3698
3699 3699 
 		$airline_array = array();
3700 3700 
 		$temp_array = array();
3701 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3701 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3702 3702 
 		{
3703 3703 
 			$temp_array['airline_name'] = $row['airline_name'];
3704 3704 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -3715,11 +3715,11 @@  discard block
 
 block discarded – undo
3715 3715 
 	* @return Array the pilots list
3716 3716 
 	*
3717 3717 
 	*/
3718 
-	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3718 
+	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3719 3719 
 	{
3720 3720 
 		global $globalDBdriver;
3721 
-		$filter_query = $this->getFilter($filters,true,true);
3722 
-		$query  = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3721 
+		$filter_query = $this->getFilter($filters, true, true);
3722 
+		$query = "SELECT DISTINCT spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3723 3723 
 		 			FROM spotter_output".$filter_query." spotter_output.pilot_id <> '' ";
3724 3724 
                 if ($olderthanmonths > 0) {
3725 3725 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3745,7 +3745,7 @@  discard block
 
 block discarded – undo
3745 3745 
 		$airline_array = array();
3746 3746 
 		$temp_array = array();
3747 3747
3748 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3748 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3749 3749 
 		{
3750 3750 
 			$temp_array['pilot_name'] = $row['pilot_name'];
3751 3751 
 			$temp_array['pilot_id'] = $row['pilot_id'];
 
@@ -3765,7 +3765,7 @@  discard block
 
 block discarded – undo
3765 3765 
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
3766 3766 
 	{
3767 3767 
 		global $globalDBdriver;
3768 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3768 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
3769 3769 
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
3770 3770 
                 if ($olderthanmonths > 0) {
3771 3771 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3791,7 +3791,7 @@  discard block
 
 block discarded – undo
3791 3791 
 		$airline_array = array();
3792 3792 
 		$temp_array = array();
3793 3793
3794 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3794 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3795 3795 
 		{
3796 3796 
 			$temp_array['pilot_name'] = $row['pilot_name'];
3797 3797 
 			$temp_array['pilot_id'] = $row['pilot_id'];
 
@@ -3809,11 +3809,11 @@  discard block
 
 block discarded – undo
3809 3809 
 	* @return Array the pilots list
3810 3810 
 	*
3811 3811 
 	*/
3812 
-	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3812 
+	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3813 3813 
 	{
3814 3814 
 		global $globalDBdriver;
3815 
-		$filter_query = $this->getFilter($filters,true,true);
3816 
-		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3815 
+		$filter_query = $this->getFilter($filters, true, true);
3816 
+		$query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3817 3817 
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3818 3818 
                 if ($olderthanmonths > 0) {
3819 3819 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3839,7 +3839,7 @@  discard block
 
 block discarded – undo
3839 3839 
 		$airline_array = array();
3840 3840 
 		$temp_array = array();
3841 3841
3842 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3842 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3843 3843 
 		{
3844 3844 
 			$temp_array['owner_name'] = $row['owner_name'];
3845 3845 
 			$temp_array['owner_count'] = $row['owner_count'];
 
@@ -3854,11 +3854,11 @@  discard block
 
 block discarded – undo
3854 3854 
 	* @return Array the pilots list
3855 3855 
 	*
3856 3856 
 	*/
3857 
-	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
3857 
+	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
3858 3858 
 	{
3859 3859 
 		global $globalDBdriver;
3860 
-		$filter_query = $this->getFilter($filters,true,true);
3861 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3860 
+		$filter_query = $this->getFilter($filters, true, true);
3861 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
3862 3862 
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
3863 3863 
                 if ($olderthanmonths > 0) {
3864 3864 
             		if ($globalDBdriver == 'mysql') {
 
@@ -3884,7 +3884,7 @@  discard block
 
 block discarded – undo
3884 3884 
 		$airline_array = array();
3885 3885 
 		$temp_array = array();
3886 3886
3887 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3887 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3888 3888 
 		{
3889 3889 
 			$temp_array['owner_name'] = $row['owner_name'];
3890 3890 
 			$temp_array['owner_count'] = $row['owner_count'];
 
@@ -3900,11 +3900,11 @@  discard block
 
 block discarded – undo
3900 3900 
 	* @return Array the airline list
3901 3901 
 	*
3902 3902 
 	*/
3903 
-	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
3903 
+	public function countAllAirlinesByAircraft($aircraft_icao, $filters = array())
3904 3904 
 	{
3905 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3906 
-		$filter_query = $this->getFilter($filters,true,true);
3907 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3905 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3906 
+		$filter_query = $this->getFilter($filters, true, true);
3907 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3908 3908 
 		 	    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3909 3909 
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3910 3910 
 			    ORDER BY airline_count DESC";
 
@@ -3916,7 +3916,7 @@  discard block
 
 block discarded – undo
3916 3916 
 		$airline_array = array();
3917 3917 
 		$temp_array = array();
3918 3918
3919 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3919 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3920 3920 
 		{
3921 3921 
 			$temp_array['airline_name'] = $row['airline_name'];
3922 3922 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -3936,11 +3936,11 @@  discard block
 
 block discarded – undo
3936 3936 
 	* @return Array the airline country list
3937 3937 
 	*
3938 3938 
 	*/
3939 
-	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
3939 
+	public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array())
3940 3940 
 	{
3941 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
3942 
-		$filter_query = $this->getFilter($filters,true,true);
3943 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3941 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
3942 
+		$filter_query = $this->getFilter($filters, true, true);
3943 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
3944 3944 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
3945 3945 
                     GROUP BY spotter_output.airline_country
3946 3946 
 					ORDER BY airline_country_count DESC
 
@@ -3953,7 +3953,7 @@  discard block
 
 block discarded – undo
3953 3953 
 		$airline_country_array = array();
3954 3954 
 		$temp_array = array();
3955 3955
3956 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3956 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3957 3957 
 		{
3958 3958 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
3959 3959 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -3972,11 +3972,11 @@  discard block
 
 block discarded – undo
3972 3972 
 	* @return Array the airline list
3973 3973 
 	*
3974 3974 
 	*/
3975 
-	public function countAllAirlinesByAirport($airport_icao,$filters = array())
3975 
+	public function countAllAirlinesByAirport($airport_icao, $filters = array())
3976 3976 
 	{
3977 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
3978 
-		$filter_query = $this->getFilter($filters,true,true);
3979 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3977 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
3978 
+		$filter_query = $this->getFilter($filters, true, true);
3979 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
3980 3980 
 		    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
3981 3981 
                     GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
3982 3982 
 		    ORDER BY airline_count DESC";
 
@@ -3988,7 +3988,7 @@  discard block
 
 block discarded – undo
3988 3988 
 		$airline_array = array();
3989 3989 
 		$temp_array = array();
3990 3990
3991 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
3991 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
3992 3992 
 		{
3993 3993 
 			$temp_array['airline_name'] = $row['airline_name'];
3994 3994 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4007,11 +4007,11 @@  discard block
 
 block discarded – undo
4007 4007 
 	* @return Array the airline country list
4008 4008 
 	*
4009 4009 
 	*/
4010 
-	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
4010 
+	public function countAllAirlineCountriesByAirport($airport_icao, $filters = array())
4011 4011 
 	{
4012 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4013 
-		$filter_query = $this->getFilter($filters,true,true);
4014 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4012 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4013 
+		$filter_query = $this->getFilter($filters, true, true);
4014 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4015 4015 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
4016 4016 
 					GROUP BY spotter_output.airline_country
4017 4017 
 					ORDER BY airline_country_count DESC
 
@@ -4024,7 +4024,7 @@  discard block
 
 block discarded – undo
4024 4024 
 		$airline_country_array = array();
4025 4025 
 		$temp_array = array();
4026 4026
4027 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4027 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4028 4028 
 		{
4029 4029 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4030 4030 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4041,11 +4041,11 @@  discard block
 
 block discarded – undo
4041 4041 
 	* @return Array the airline list
4042 4042 
 	*
4043 4043 
 	*/
4044 
-	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
4044 
+	public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array())
4045 4045 
 	{
4046 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4047 
-		$filter_query = $this->getFilter($filters,true,true);
4048 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4046 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4047 
+		$filter_query = $this->getFilter($filters, true, true);
4048 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4049 4049 
 		 			FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4050 4050 
 					GROUP BY spotter_output.airline_name
4051 4051 
 					ORDER BY airline_count DESC";
 
@@ -4056,7 +4056,7 @@  discard block
 
 block discarded – undo
4056 4056 
 		$airline_array = array();
4057 4057 
 		$temp_array = array();
4058 4058
4059 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4059 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4060 4060 
 		{
4061 4061 
 			$temp_array['airline_name'] = $row['airline_name'];
4062 4062 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4076,11 +4076,11 @@  discard block
 
 block discarded – undo
4076 4076 
 	* @return Array the airline country list
4077 4077 
 	*
4078 4078 
 	*/
4079 
-	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
4079 
+	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array())
4080 4080 
 	{
4081 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4082 
-		$filter_query = $this->getFilter($filters,true,true);
4083 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4081 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4082 
+		$filter_query = $this->getFilter($filters, true, true);
4083 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4084 4084 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4085 4085 
 					GROUP BY spotter_output.airline_country
4086 4086 
 					ORDER BY airline_country_count DESC
 
@@ -4093,7 +4093,7 @@  discard block
 
 block discarded – undo
4093 4093 
 		$airline_country_array = array();
4094 4094 
 		$temp_array = array();
4095 4095
4096 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4096 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4097 4097 
 		{
4098 4098 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4099 4099 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4109,11 +4109,11 @@  discard block
 
 block discarded – undo
4109 4109 
 	* @return Array the airline list
4110 4110 
 	*
4111 4111 
 	*/
4112 
-	public function countAllAirlinesByDate($date,$filters = array())
4112 
+	public function countAllAirlinesByDate($date, $filters = array())
4113 4113 
 	{
4114 4114 
 		global $globalTimezone, $globalDBdriver;
4115 
-		$filter_query = $this->getFilter($filters,true,true);
4116 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4115 
+		$filter_query = $this->getFilter($filters, true, true);
4116 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4117 4117 
 		if ($globalTimezone != '') {
4118 4118 
 			date_default_timezone_set($globalTimezone);
4119 4119 
 			$datetime = new DateTime($date);
 
@@ -4121,12 +4121,12 @@  discard block
 
 block discarded – undo
4121 4121 
 		} else $offset = '+00:00';
4122 4122
4123 4123 
 		if ($globalDBdriver == 'mysql') {
4124 
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4124 
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4125 4125 
 		 			FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4126 4126 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4127 4127 
 					ORDER BY airline_count DESC";
4128 4128 
 		} else {
4129 
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4129 
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4130 4130 
 		 			FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4131 4131 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
4132 4132 
 					ORDER BY airline_count DESC";
 
@@ -4137,7 +4137,7 @@  discard block
 
 block discarded – undo
4137 4137
4138 4138 
 		$airline_array = array();
4139 4139 
 		$temp_array = array();
4140 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4140 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4141 4141 
 		{
4142 4142 
 			$temp_array['airline_name'] = $row['airline_name'];
4143 4143 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4157,11 +4157,11 @@  discard block
 
 block discarded – undo
4157 4157 
 	* @return Array the airline country list
4158 4158 
 	*
4159 4159 
 	*/
4160 
-	public function countAllAirlineCountriesByDate($date,$filters = array())
4160 
+	public function countAllAirlineCountriesByDate($date, $filters = array())
4161 4161 
 	{
4162 4162 
 		global $globalTimezone, $globalDBdriver;
4163 
-		$filter_query = $this->getFilter($filters,true,true);
4164 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4163 
+		$filter_query = $this->getFilter($filters, true, true);
4164 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4165 4165 
 		if ($globalTimezone != '') {
4166 4166 
 			date_default_timezone_set($globalTimezone);
4167 4167 
 			$datetime = new DateTime($date);
 
@@ -4169,13 +4169,13 @@  discard block
 
 block discarded – undo
4169 4169 
 		} else $offset = '+00:00';
4170 4170
4171 4171 
 		if ($globalDBdriver == 'mysql') {
4172 
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4172 
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4173 4173 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4174 4174 
 					GROUP BY spotter_output.airline_country
4175 4175 
 					ORDER BY airline_country_count DESC
4176 4176 
 					LIMIT 10 OFFSET 0";
4177 4177 
 		} else {
4178 
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4178 
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4179 4179 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4180 4180 
 					GROUP BY spotter_output.airline_country
4181 4181 
 					ORDER BY airline_country_count DESC
 
@@ -4187,7 +4187,7 @@  discard block
 
 block discarded – undo
4187 4187
4188 4188 
 		$airline_country_array = array();
4189 4189 
 		$temp_array = array();
4190 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4190 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4191 4191 
 		{
4192 4192 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4193 4193 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4204,11 +4204,11 @@  discard block
 
 block discarded – undo
4204 4204 
 	* @return Array the airline list
4205 4205 
 	*
4206 4206 
 	*/
4207 
-	public function countAllAirlinesByIdent($ident,$filters = array())
4207 
+	public function countAllAirlinesByIdent($ident, $filters = array())
4208 4208 
 	{
4209 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
4210 
-		$filter_query = $this->getFilter($filters,true,true);
4211 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4209 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
4210 
+		$filter_query = $this->getFilter($filters, true, true);
4211 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4212 4212 
 		 		FROM spotter_output".$filter_query." spotter_output.ident = :ident
4213 4213 
 				GROUP BY spotter_output.airline_name
4214 4214 
 				ORDER BY airline_count DESC";
 
@@ -4220,7 +4220,7 @@  discard block
 
 block discarded – undo
4220 4220 
 		$airline_array = array();
4221 4221 
 		$temp_array = array();
4222 4222
4223 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4223 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4224 4224 
 		{
4225 4225 
 			$temp_array['airline_name'] = $row['airline_name'];
4226 4226 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4238,25 +4238,25 @@  discard block
 
 block discarded – undo
4238 4238 
 	* @return Array the airline list
4239 4239 
 	*
4240 4240 
 	*/
4241 
-	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
4241 
+	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4242 4242 
 	{
4243 
-		$filter_query = $this->getFilter($filters,true,true);
4244 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4245 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4243 
+		$filter_query = $this->getFilter($filters, true, true);
4244 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4245 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4246 4246
4247 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4247 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4248 4248 
 		 			FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
4249 4249 
 					GROUP BY spotter_output.airline_name
4250 4250 
 					ORDER BY airline_count DESC";
4251 4251
4252 4252
4253 4253 
 		$sth = $this->db->prepare($query);
4254 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4254 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4255 4255
4256 4256 
 		$airline_array = array();
4257 4257 
 		$temp_array = array();
4258 4258
4259 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4259 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4260 4260 
 		{
4261 4261 
 			$temp_array['airline_name'] = $row['airline_name'];
4262 4262 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4274,13 +4274,13 @@  discard block
 
 block discarded – undo
4274 4274 
 	* @return Array the airline country list
4275 4275 
 	*
4276 4276 
 	*/
4277 
-	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
4277 
+	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
4278 4278 
 	{
4279 
-		$filter_query = $this->getFilter($filters,true,true);
4280 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
4281 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
4279 
+		$filter_query = $this->getFilter($filters, true, true);
4280 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
4281 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
4282 4282
4283 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4283 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4284 4284 
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
4285 4285 
 				GROUP BY spotter_output.airline_country
4286 4286 
 				ORDER BY airline_country_count DESC
 
@@ -4288,11 +4288,11 @@  discard block
 
 block discarded – undo
4288 4288
4289 4289
4290 4290 
 		$sth = $this->db->prepare($query);
4291 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
4291 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
4292 4292
4293 4293 
 		$airline_country_array = array();
4294 4294 
 		$temp_array = array();
4295 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4295 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4296 4296 
 		{
4297 4297 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4298 4298 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4310,11 +4310,11 @@  discard block
 
 block discarded – undo
4310 4310 
 	* @return Array the airline list
4311 4311 
 	*
4312 4312 
 	*/
4313 
-	public function countAllAirlinesByCountry($country,$filters = array())
4313 
+	public function countAllAirlinesByCountry($country, $filters = array())
4314 4314 
 	{
4315 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4316 
-		$filter_query = $this->getFilter($filters,true,true);
4317 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4315 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4316 
+		$filter_query = $this->getFilter($filters, true, true);
4317 
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
4318 4318 
 		 	    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
4319 4319 
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
4320 4320 
 			    ORDER BY airline_count DESC";
 
@@ -4325,7 +4325,7 @@  discard block
 
 block discarded – undo
4325 4325
4326 4326 
 		$airline_array = array();
4327 4327 
 		$temp_array = array();
4328 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4328 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4329 4329 
 		{
4330 4330 
 			$temp_array['airline_name'] = $row['airline_name'];
4331 4331 
 			$temp_array['airline_icao'] = $row['airline_icao'];
 
@@ -4344,11 +4344,11 @@  discard block
 
 block discarded – undo
4344 4344 
 	* @return Array the airline country list
4345 4345 
 	*
4346 4346 
 	*/
4347 
-	public function countAllAirlineCountriesByCountry($country,$filters = array())
4347 
+	public function countAllAirlineCountriesByCountry($country, $filters = array())
4348 4348 
 	{
4349 
-		$filter_query = $this->getFilter($filters,true,true);
4350 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
4351 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4349 
+		$filter_query = $this->getFilter($filters, true, true);
4350 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
4351 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4352 4352 
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
4353 4353 
 				GROUP BY spotter_output.airline_country
4354 4354 
 				ORDER BY airline_country_count DESC
 
@@ -4360,7 +4360,7 @@  discard block
 
 block discarded – undo
4360 4360
4361 4361 
 		$airline_country_array = array();
4362 4362 
 		$temp_array = array();
4363 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4363 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4364 4364 
 		{
4365 4365 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4366 4366 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4379,8 +4379,8 @@  discard block
 
 block discarded – undo
4379 4379 
 	*/
4380 4380 
 	public function countAllAirlineCountries($limit = true, $filters = array())
4381 4381 
 	{
4382 
-		$filter_query = $this->getFilter($filters,true,true);
4383 
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4382 
+		$filter_query = $this->getFilter($filters, true, true);
4383 
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
4384 4384 
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA'
4385 4385 
 					GROUP BY spotter_output.airline_country
4386 4386 
 					ORDER BY airline_country_count DESC";
 
@@ -4391,7 +4391,7 @@  discard block
 
 block discarded – undo
4391 4391
4392 4392 
 		$airline_array = array();
4393 4393 
 		$temp_array = array();
4394 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4394 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4395 4395 
 		{
4396 4396 
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
4397 4397 
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -4407,11 +4407,11 @@  discard block
 
 block discarded – undo
4407 4407 
 	* @return Array the airline country list
4408 4408 
 	*
4409 4409 
 	*/
4410 
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4410 
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4411 4411 
 	{
4412 4412 
 		global $globalDBdriver;
4413 4413 
 		//$filter_query = $this->getFilter($filters,true,true);
4414 
-		$Connection= new Connection($this->db);
4414 
+		$Connection = new Connection($this->db);
4415 4415 
 		if (!$Connection->tableExists('countries')) return array();
4416 4416 
 		/*
4417 4417 
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -4426,7 +4426,7 @@  discard block
 
 block discarded – undo
4426 4426 
 */
4427 4427 
 		require_once('class.SpotterLive.php');
4428 4428 
 		$SpotterLive = new SpotterLive();
4429 
-		$filter_query = $SpotterLive->getFilter($filters,true,true);
4429 
+		$filter_query = $SpotterLive->getFilter($filters, true, true);
4430 4430 
 		$filter_query .= ' over_country IS NOT NULL';
4431 4431 
                 if ($olderthanmonths > 0) {
4432 4432 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4453,7 +4453,7 @@  discard block
 
 block discarded – undo
4453 4453 
 		$flight_array = array();
4454 4454 
 		$temp_array = array();
4455 4455
4456 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4456 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4457 4457 
 		{
4458 4458 
 			$temp_array['flight_count'] = $row['nb'];
4459 4459 
 			$temp_array['flight_country'] = $row['name'];
 
@@ -4471,12 +4471,12 @@  discard block
 
 block discarded – undo
4471 4471 
 	* @return Array the aircraft list
4472 4472 
 	*
4473 4473 
 	*/
4474 
-	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4474 
+	public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4475 4475 
 	{
4476 4476 
 		global $globalDBdriver;
4477 
-		$filter_query = $this->getFilter($filters,true,true);
4477 
+		$filter_query = $this->getFilter($filters, true, true);
4478 4478
4479 
-		$query  = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4479 
+		$query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4480 4480 
 		    FROM spotter_output ".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> ''";
4481 4481 
 		if ($olderthanmonths > 0) {
4482 4482 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4501,7 +4501,7 @@  discard block
 
 block discarded – undo
4501 4501
4502 4502 
 		$aircraft_array = array();
4503 4503 
 		$temp_array = array();
4504 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4504 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4505 4505 
 		{
4506 4506 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4507 4507 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4518,11 +4518,11 @@  discard block
 
 block discarded – undo
4518 4518 
 	* @return Array the aircraft list
4519 4519 
 	*
4520 4520 
 	*/
4521 
-	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4521 
+	public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4522 4522 
 	{
4523 4523 
 		global $globalDBdriver;
4524 
-		$filter_query = $this->getFilter($filters,true,true);
4525 
-		$query  = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4524 
+		$filter_query = $this->getFilter($filters, true, true);
4525 
+		$query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4526 4526 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
4527 4527 
 		if ($olderthanmonths > 0) {
4528 4528 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4547,7 +4547,7 @@  discard block
 
 block discarded – undo
4547 4547
4548 4548 
 		$aircraft_array = array();
4549 4549 
 		$temp_array = array();
4550 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4550 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4551 4551 
 		{
4552 4552 
 			$temp_array['airline_icao'] = $row['airline_icao'];
4553 4553 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -4565,11 +4565,11 @@  discard block
 
 block discarded – undo
4565 4565 
 	* @return Array the aircraft list
4566 4566 
 	*
4567 4567 
 	*/
4568 
-	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
4568 
+	public function countAllAircraftTypesByMonths($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
4569 4569 
 	{
4570 4570 
 		global $globalDBdriver;
4571 
-		$filter_query = $this->getFilter($filters,true,true);
4572 
-		$query  = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4571 
+		$filter_query = $this->getFilter($filters, true, true);
4572 
+		$query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer
4573 4573 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
4574 4574 
 		if ($olderthanmonths > 0) {
4575 4575 
 			if ($globalDBdriver == 'mysql') {
 
@@ -4594,7 +4594,7 @@  discard block
 
 block discarded – undo
4594 4594
4595 4595 
 		$aircraft_array = array();
4596 4596 
 		$temp_array = array();
4597 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4597 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4598 4598 
 		{
4599 4599 
 			//$temp_array['airline_icao'] = $row['airline_icao'];
4600 4600 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 
@@ -4613,13 +4613,13 @@  discard block
 
 block discarded – undo
4613 4613 
 	* @return Array the aircraft list
4614 4614 
 	*
4615 4615 
 	*/
4616 
-	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
4616 
+	public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array())
4617 4617 
 	{
4618 4618 
 		$Image = new Image($this->db);
4619 
-		$filter_query = $this->getFilter($filters,true,true);
4620 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
4619 
+		$filter_query = $this->getFilter($filters, true, true);
4620 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
4621 4621
4622 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4622 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4623 4623 
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao
4624 4624 
 				GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4625 4625 
 				ORDER BY registration_count DESC";
 
@@ -4630,14 +4630,14 @@  discard block
 
 block discarded – undo
4630 4630 
 		$aircraft_array = array();
4631 4631 
 		$temp_array = array();
4632 4632
4633 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4633 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4634 4634 
 		{
4635 4635 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4636 4636 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4637 4637 
 			$temp_array['registration'] = $row['registration'];
4638 4638 
 			$temp_array['airline_name'] = $row['airline_name'];
4639 4639 
 			$temp_array['image_thumbnail'] = "";
4640 
-			if($row['registration'] != "")
4640 
+			if ($row['registration'] != "")
4641 4641 
 			{
4642 4642 
 				$image_array = $Image->getSpotterImage($row['registration']);
4643 4643 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4656,11 +4656,11 @@  discard block
 
 block discarded – undo
4656 4656 
 	* @return Array the aircraft list
4657 4657 
 	*
4658 4658 
 	*/
4659 
-	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
4659 
+	public function countAllAircraftTypesByAirline($airline_icao, $filters = array())
4660 4660 
 	{
4661 
-		$filter_query = $this->getFilter($filters,true,true);
4662 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4663 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4661 
+		$filter_query = $this->getFilter($filters, true, true);
4662 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4663 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4664 4664 
 			    FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao
4665 4665 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4666 4666 
 			    ORDER BY aircraft_icao_count DESC";
 
@@ -4671,7 +4671,7 @@  discard block
 
 block discarded – undo
4671 4671 
 		$aircraft_array = array();
4672 4672 
 		$temp_array = array();
4673 4673
4674 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4674 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4675 4675 
 		{
4676 4676 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4677 4677 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4689,13 +4689,13 @@  discard block
 
 block discarded – undo
4689 4689 
 	* @return Array the aircraft list
4690 4690 
 	*
4691 4691 
 	*/
4692 
-	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
4692 
+	public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array())
4693 4693 
 	{
4694 
-		$filter_query = $this->getFilter($filters,true,true);
4694 
+		$filter_query = $this->getFilter($filters, true, true);
4695 4695 
 		$Image = new Image($this->db);
4696 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4696 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4697 4697
4698 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4698 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4699 4699 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao
4700 4700 
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4701 4701 
 			    ORDER BY registration_count DESC";
 
@@ -4705,14 +4705,14 @@  discard block
 
 block discarded – undo
4705 4705
4706 4706 
 		$aircraft_array = array();
4707 4707 
 		$temp_array = array();
4708 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4708 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4709 4709 
 		{
4710 4710 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4711 4711 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4712 4712 
 			$temp_array['registration'] = $row['registration'];
4713 4713 
 			$temp_array['airline_name'] = $row['airline_name'];
4714 4714 
 			$temp_array['image_thumbnail'] = "";
4715 
-			if($row['registration'] != "")
4715 
+			if ($row['registration'] != "")
4716 4716 
 			{
4717 4717 
 				$image_array = $Image->getSpotterImage($row['registration']);
4718 4718 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4731,11 +4731,11 @@  discard block
 
 block discarded – undo
4731 4731 
 	* @return Array the aircraft list
4732 4732 
 	*
4733 4733 
 	*/
4734 
-	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
4734 
+	public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array())
4735 4735 
 	{
4736 
-		$filter_query = $this->getFilter($filters,true,true);
4737 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
4738 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4736 
+		$filter_query = $this->getFilter($filters, true, true);
4737 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
4738 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4739 4739 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao
4740 4740 
 				GROUP BY spotter_output.aircraft_manufacturer
4741 4741 
 				ORDER BY aircraft_manufacturer_count DESC";
 
@@ -4746,7 +4746,7 @@  discard block
 
 block discarded – undo
4746 4746 
 		$aircraft_array = array();
4747 4747 
 		$temp_array = array();
4748 4748
4749 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4749 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4750 4750 
 		{
4751 4751 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4752 4752 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -4763,12 +4763,12 @@  discard block
 
 block discarded – undo
4763 4763 
 	* @return Array the aircraft list
4764 4764 
 	*
4765 4765 
 	*/
4766 
-	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
4766 
+	public function countAllAircraftTypesByAirport($airport_icao, $filters = array())
4767 4767 
 	{
4768 
-		$filter_query = $this->getFilter($filters,true,true);
4769 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4768 
+		$filter_query = $this->getFilter($filters, true, true);
4769 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4770 4770
4771 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4771 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4772 4772 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4773 4773 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4774 4774 
 				ORDER BY aircraft_icao_count DESC";
 
@@ -4778,7 +4778,7 @@  discard block
 
 block discarded – undo
4778 4778
4779 4779 
 		$aircraft_array = array();
4780 4780 
 		$temp_array = array();
4781 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4781 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4782 4782 
 		{
4783 4783 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4784 4784 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4796,13 +4796,13 @@  discard block
 
 block discarded – undo
4796 4796 
 	* @return Array the aircraft list
4797 4797 
 	*
4798 4798 
 	*/
4799 
-	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
4799 
+	public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array())
4800 4800 
 	{
4801 
-		$filter_query = $this->getFilter($filters,true,true);
4801 
+		$filter_query = $this->getFilter($filters, true, true);
4802 4802 
 		$Image = new Image($this->db);
4803 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4803 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4804 4804
4805 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4805 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4806 4806 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4807 4807 
                     GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
4808 4808 
 		    ORDER BY registration_count DESC";
 
@@ -4812,14 +4812,14 @@  discard block
 
 block discarded – undo
4812 4812
4813 4813 
 		$aircraft_array = array();
4814 4814 
 		$temp_array = array();
4815 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4815 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4816 4816 
 		{
4817 4817 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4818 4818 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4819 4819 
 			$temp_array['registration'] = $row['registration'];
4820 4820 
 			$temp_array['airline_name'] = $row['airline_name'];
4821 4821 
 			$temp_array['image_thumbnail'] = "";
4822 
-			if($row['registration'] != "")
4822 
+			if ($row['registration'] != "")
4823 4823 
 			{
4824 4824 
 				$image_array = $Image->getSpotterImage($row['registration']);
4825 4825 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4837,11 +4837,11 @@  discard block
 
 block discarded – undo
4837 4837 
 	* @return Array the aircraft list
4838 4838 
 	*
4839 4839 
 	*/
4840 
-	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
4840 
+	public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array())
4841 4841 
 	{
4842 
-		$filter_query = $this->getFilter($filters,true,true);
4843 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
4844 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4842 
+		$filter_query = $this->getFilter($filters, true, true);
4843 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
4844 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
4845 4845 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
4846 4846 
                     GROUP BY spotter_output.aircraft_manufacturer
4847 4847 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -4852,7 +4852,7 @@  discard block
 
 block discarded – undo
4852 4852
4853 4853 
 		$aircraft_array = array();
4854 4854 
 		$temp_array = array();
4855 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4855 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4856 4856 
 		{
4857 4857 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
4858 4858 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -4867,12 +4867,12 @@  discard block
 
 block discarded – undo
4867 4867 
 	* @return Array the aircraft list
4868 4868 
 	*
4869 4869 
 	*/
4870 
-	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
4870 
+	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array())
4871 4871 
 	{
4872 
-		$filter_query = $this->getFilter($filters,true,true);
4873 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4872 
+		$filter_query = $this->getFilter($filters, true, true);
4873 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4874 4874
4875 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4875 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4876 4876 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4877 4877 
                     GROUP BY spotter_output.aircraft_name
4878 4878 
 					ORDER BY aircraft_icao_count DESC";
 
@@ -4881,7 +4881,7 @@  discard block
 
 block discarded – undo
4881 4881 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4882 4882 
 		$aircraft_array = array();
4883 4883 
 		$temp_array = array();
4884 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4884 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4885 4885 
 		{
4886 4886 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4887 4887 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4900,11 +4900,11 @@  discard block
 
 block discarded – undo
4900 4900 
 	*/
4901 4901 
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
4902 4902 
 	{
4903 
-		$filter_query = $this->getFilter($filters,true,true);
4903 
+		$filter_query = $this->getFilter($filters, true, true);
4904 4904 
 		$Image = new Image($this->db);
4905 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
4905 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
4906 4906
4907 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4907 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
4908 4908 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
4909 4909 
                     GROUP BY spotter_output.registration
4910 4910 
 					ORDER BY registration_count DESC";
 
@@ -4914,14 +4914,14 @@  discard block
 
 block discarded – undo
4914 4914 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
4915 4915 
 		$aircraft_array = array();
4916 4916 
 		$temp_array = array();
4917 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4917 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4918 4918 
 		{
4919 4919 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4920 4920 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
4921 4921 
 			$temp_array['registration'] = $row['registration'];
4922 4922 
 			$temp_array['airline_name'] = $row['airline_name'];
4923 4923 
 			$temp_array['image_thumbnail'] = "";
4924 
-			if($row['registration'] != "")
4924 
+			if ($row['registration'] != "")
4925 4925 
 			{
4926 4926 
 				$image_array = $Image->getSpotterImage($row['registration']);
4927 4927 
 				$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -4938,11 +4938,11 @@  discard block
 
 block discarded – undo
4938 4938 
 	* @return Array the aircraft list
4939 4939 
 	*
4940 4940 
 	*/
4941 
-	public function countAllAircraftTypesByDate($date,$filters = array())
4941 
+	public function countAllAircraftTypesByDate($date, $filters = array())
4942 4942 
 	{
4943 4943 
 		global $globalTimezone, $globalDBdriver;
4944 
-		$filter_query = $this->getFilter($filters,true,true);
4945 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4944 
+		$filter_query = $this->getFilter($filters, true, true);
4945 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4946 4946 
 		if ($globalTimezone != '') {
4947 4947 
 			date_default_timezone_set($globalTimezone);
4948 4948 
 			$datetime = new DateTime($date);
 
@@ -4950,12 +4950,12 @@  discard block
 
 block discarded – undo
4950 4950 
 		} else $offset = '+00:00';
4951 4951
4952 4952 
 		if ($globalDBdriver == 'mysql') {
4953 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4953 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4954 4954 
 					FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
4955 4955 
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4956 4956 
 					ORDER BY aircraft_icao_count DESC";
4957 4957 
 		} else {
4958 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4958 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
4959 4959 
 					FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
4960 4960 
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
4961 4961 
 					ORDER BY aircraft_icao_count DESC";
 
@@ -4966,7 +4966,7 @@  discard block
 
 block discarded – undo
4966 4966
4967 4967 
 		$aircraft_array = array();
4968 4968 
 		$temp_array = array();
4969 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
4969 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
4970 4970 
 		{
4971 4971 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
4972 4972 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -4984,12 +4984,12 @@  discard block
 
 block discarded – undo
4984 4984 
 	* @return Array the aircraft list
4985 4985 
 	*
4986 4986 
 	*/
4987 
-	public function countAllAircraftRegistrationByDate($date,$filters = array())
4987 
+	public function countAllAircraftRegistrationByDate($date, $filters = array())
4988 4988 
 	{
4989 4989 
 		global $globalTimezone, $globalDBdriver;
4990 
-		$filter_query = $this->getFilter($filters,true,true);
4990 
+		$filter_query = $this->getFilter($filters, true, true);
4991 4991 
 		$Image = new Image($this->db);
4992 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
4992 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
4993 4993 
 		if ($globalTimezone != '') {
4994 4994 
 			date_default_timezone_set($globalTimezone);
4995 4995 
 			$datetime = new DateTime($date);
 
@@ -4997,12 +4997,12 @@  discard block
 
 block discarded – undo
4997 4997 
 		} else $offset = '+00:00';
4998 4998
4999 4999 
 		if ($globalDBdriver == 'mysql') {
5000 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5000 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5001 5001 
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
5002 5002 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5003 5003 
 					ORDER BY registration_count DESC";
5004 5004 
 		} else {
5005 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5005 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5006 5006 
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
5007 5007 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5008 5008 
 					ORDER BY registration_count DESC";
 
@@ -5013,14 +5013,14 @@  discard block
 
 block discarded – undo
5013 5013
5014 5014 
 		$aircraft_array = array();
5015 5015 
 		$temp_array = array();
5016 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5016 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5017 5017 
 		{
5018 5018 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5019 5019 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5020 5020 
 			$temp_array['registration'] = $row['registration'];
5021 5021 
 			$temp_array['airline_name'] = $row['airline_name'];
5022 5022 
 			$temp_array['image_thumbnail'] = "";
5023 
-			if($row['registration'] != "")
5023 
+			if ($row['registration'] != "")
5024 5024 
 			{
5025 5025 
 				$image_array = $Image->getSpotterImage($row['registration']);
5026 5026 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5039,11 +5039,11 @@  discard block
 
 block discarded – undo
5039 5039 
 	* @return Array the aircraft manufacturer list
5040 5040 
 	*
5041 5041 
 	*/
5042 
-	public function countAllAircraftManufacturerByDate($date,$filters = array())
5042 
+	public function countAllAircraftManufacturerByDate($date, $filters = array())
5043 5043 
 	{
5044 5044 
 		global $globalTimezone, $globalDBdriver;
5045 
-		$filter_query = $this->getFilter($filters,true,true);
5046 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
5045 
+		$filter_query = $this->getFilter($filters, true, true);
5046 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
5047 5047 
 		if ($globalTimezone != '') {
5048 5048 
 			date_default_timezone_set($globalTimezone);
5049 5049 
 			$datetime = new DateTime($date);
 
@@ -5051,12 +5051,12 @@  discard block
 
 block discarded – undo
5051 5051 
 		} else $offset = '+00:00';
5052 5052
5053 5053 
 		if ($globalDBdriver == 'mysql') {
5054 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5054 
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5055 5055 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
5056 5056 
 				GROUP BY spotter_output.aircraft_manufacturer
5057 5057 
 				ORDER BY aircraft_manufacturer_count DESC";
5058 5058 
 		} else {
5059 
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5059 
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5060 5060 
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
5061 5061 
 				GROUP BY spotter_output.aircraft_manufacturer
5062 5062 
 				ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5068,7 +5068,7 @@  discard block
 
 block discarded – undo
5068 5068 
 		$aircraft_array = array();
5069 5069 
 		$temp_array = array();
5070 5070
5071 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5071 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5072 5072 
 		{
5073 5073 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5074 5074 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5085,11 +5085,11 @@  discard block
 
 block discarded – undo
5085 5085 
 	* @return Array the aircraft list
5086 5086 
 	*
5087 5087 
 	*/
5088 
-	public function countAllAircraftTypesByIdent($ident,$filters = array())
5088 
+	public function countAllAircraftTypesByIdent($ident, $filters = array())
5089 5089 
 	{
5090 
-		$filter_query = $this->getFilter($filters,true,true);
5091 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5092 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5090 
+		$filter_query = $this->getFilter($filters, true, true);
5091 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5092 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5093 5093 
 				FROM spotter_output".$filter_query." spotter_output.ident = :ident
5094 5094 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
5095 5095 
 				ORDER BY aircraft_icao_count DESC";
 
@@ -5100,7 +5100,7 @@  discard block
 
 block discarded – undo
5100 5100 
 		$aircraft_array = array();
5101 5101 
 		$temp_array = array();
5102 5102
5103 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5103 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5104 5104 
 		{
5105 5105 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5106 5106 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5118,13 +5118,13 @@  discard block
 
 block discarded – undo
5118 5118 
 	* @return Array the aircraft list
5119 5119 
 	*
5120 5120 
 	*/
5121 
-	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
5121 
+	public function countAllAircraftRegistrationByIdent($ident, $filters = array())
5122 5122 
 	{
5123 
-		$filter_query = $this->getFilter($filters,true,true);
5123 
+		$filter_query = $this->getFilter($filters, true, true);
5124 5124 
 		$Image = new Image($this->db);
5125 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5125 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5126 5126
5127 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5127 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5128 5128 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident
5129 5129 
                     GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5130 5130 
 		    ORDER BY registration_count DESC";
 
@@ -5136,14 +5136,14 @@  discard block
 
 block discarded – undo
5136 5136 
 		$aircraft_array = array();
5137 5137 
 		$temp_array = array();
5138 5138
5139 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5139 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5140 5140 
 		{
5141 5141 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5142 5142 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5143 5143 
 			$temp_array['registration'] = $row['registration'];
5144 5144 
 			$temp_array['airline_name'] = $row['airline_name'];
5145 5145 
 			$temp_array['image_thumbnail'] = "";
5146 
-			if($row['registration'] != "")
5146 
+			if ($row['registration'] != "")
5147 5147 
 			{
5148 5148 
 				$image_array = $Image->getSpotterImage($row['registration']);
5149 5149 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5162,11 +5162,11 @@  discard block
 
 block discarded – undo
5162 5162 
 	* @return Array the aircraft manufacturer list
5163 5163 
 	*
5164 5164 
 	*/
5165 
-	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
5165 
+	public function countAllAircraftManufacturerByIdent($ident, $filters = array())
5166 5166 
 	{
5167 
-		$filter_query = $this->getFilter($filters,true,true);
5168 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
5169 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5167 
+		$filter_query = $this->getFilter($filters, true, true);
5168 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
5169 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5170 5170 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident
5171 5171 
                     GROUP BY spotter_output.aircraft_manufacturer
5172 5172 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5176,7 +5176,7 @@  discard block
 
 block discarded – undo
5176 5176 
 		$sth->execute(array(':ident' => $ident));
5177 5177 
 		$aircraft_array = array();
5178 5178 
 		$temp_array = array();
5179 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5179 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5180 5180 
 		{
5181 5181 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5182 5182 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5192,24 +5192,24 @@  discard block
 
 block discarded – undo
5192 5192 
 	* @return Array the aircraft list
5193 5193 
 	*
5194 5194 
 	*/
5195 
-	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5195 
+	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5196 5196 
 	{
5197 
-		$filter_query = $this->getFilter($filters,true,true);
5198 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5199 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5197 
+		$filter_query = $this->getFilter($filters, true, true);
5198 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5199 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5200 5200
5201 5201
5202 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5202 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5203 5203 
                     FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5204 5204 
                     GROUP BY spotter_output.aircraft_name
5205 5205 
 					ORDER BY aircraft_icao_count DESC";
5206 5206
5207 5207
5208 5208 
 		$sth = $this->db->prepare($query);
5209 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5209 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5210 5210 
 		$aircraft_array = array();
5211 5211 
 		$temp_array = array();
5212 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5212 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5213 5213 
 		{
5214 5214 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5215 5215 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5225,33 +5225,33 @@  discard block
 
 block discarded – undo
5225 5225 
 	* @return Array the aircraft list
5226 5226 
 	*
5227 5227 
 	*/
5228 
-	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5228 
+	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5229 5229 
 	{
5230 
-		$filter_query = $this->getFilter($filters,true,true);
5230 
+		$filter_query = $this->getFilter($filters, true, true);
5231 5231 
 		$Image = new Image($this->db);
5232 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5233 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5232 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5233 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5234 5234
5235 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5235 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5236 5236 
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5237 5237 
                     GROUP BY spotter_output.registration
5238 5238 
 					ORDER BY registration_count DESC";
5239 5239
5240 5240
5241 5241 
 		$sth = $this->db->prepare($query);
5242 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5242 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5243 5243
5244 5244 
 		$aircraft_array = array();
5245 5245 
 		$temp_array = array();
5246 5246
5247 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5247 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5248 5248 
 		{
5249 5249 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5250 5250 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5251 5251 
 			$temp_array['registration'] = $row['registration'];
5252 5252 
 			$temp_array['airline_name'] = $row['airline_name'];
5253 5253 
 			$temp_array['image_thumbnail'] = "";
5254 
-			if($row['registration'] != "")
5254 
+			if ($row['registration'] != "")
5255 5255 
 			{
5256 5256 
 				$image_array = $Image->getSpotterImage($row['registration']);
5257 5257 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5271,25 +5271,25 @@  discard block
 
 block discarded – undo
5271 5271 
 	* @return Array the aircraft manufacturer list
5272 5272 
 	*
5273 5273 
 	*/
5274 
-	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
5274 
+	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
5275 5275 
 	{
5276 
-		$filter_query = $this->getFilter($filters,true,true);
5277 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
5278 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
5276 
+		$filter_query = $this->getFilter($filters, true, true);
5277 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
5278 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
5279 5279
5280 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5280 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5281 5281 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
5282 5282 
                     GROUP BY spotter_output.aircraft_manufacturer
5283 5283 
 					ORDER BY aircraft_manufacturer_count DESC";
5284 5284
5285 5285
5286 5286 
 		$sth = $this->db->prepare($query);
5287 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
5287 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
5288 5288
5289 5289 
 		$aircraft_array = array();
5290 5290 
 		$temp_array = array();
5291 5291
5292 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5292 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5293 5293 
 		{
5294 5294 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5295 5295 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5309,11 +5309,11 @@  discard block
 
 block discarded – undo
5309 5309 
 	* @return Array the aircraft list
5310 5310 
 	*
5311 5311 
 	*/
5312 
-	public function countAllAircraftTypesByCountry($country,$filters = array())
5312 
+	public function countAllAircraftTypesByCountry($country, $filters = array())
5313 5313 
 	{
5314 
-		$filter_query = $this->getFilter($filters,true,true);
5315 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5316 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5314 
+		$filter_query = $this->getFilter($filters, true, true);
5315 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5316 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name
5317 5317 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
5318 5318 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
5319 5319 
 			    ORDER BY aircraft_icao_count DESC";
 
@@ -5325,7 +5325,7 @@  discard block
 
 block discarded – undo
5325 5325 
 		$aircraft_array = array();
5326 5326 
 		$temp_array = array();
5327 5327
5328 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5328 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5329 5329 
 		{
5330 5330 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5331 5331 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 
@@ -5344,12 +5344,12 @@  discard block
 
 block discarded – undo
5344 5344 
 	* @return Array the aircraft list
5345 5345 
 	*
5346 5346 
 	*/
5347 
-	public function countAllAircraftRegistrationByCountry($country,$filters = array())
5347 
+	public function countAllAircraftRegistrationByCountry($country, $filters = array())
5348 5348 
 	{
5349 
-		$filter_query = $this->getFilter($filters,true,true);
5349 
+		$filter_query = $this->getFilter($filters, true, true);
5350 5350 
 		$Image = new Image($this->db);
5351 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5352 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5351 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5352 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name
5353 5353 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)
5354 5354 
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
5355 5355 
 			    ORDER BY registration_count DESC";
 
@@ -5361,14 +5361,14 @@  discard block
 
 block discarded – undo
5361 5361 
 		$aircraft_array = array();
5362 5362 
 		$temp_array = array();
5363 5363
5364 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5364 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5365 5365 
 		{
5366 5366 
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
5367 5367 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5368 5368 
 			$temp_array['registration'] = $row['registration'];
5369 5369 
 			$temp_array['airline_name'] = $row['airline_name'];
5370 5370 
 			$temp_array['image_thumbnail'] = "";
5371 
-			if($row['registration'] != "")
5371 
+			if ($row['registration'] != "")
5372 5372 
 			{
5373 5373 
 				$image_array = $Image->getSpotterImage($row['registration']);
5374 5374 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5388,11 +5388,11 @@  discard block
 
 block discarded – undo
5388 5388 
 	* @return Array the aircraft manufacturer list
5389 5389 
 	*
5390 5390 
 	*/
5391 
-	public function countAllAircraftManufacturerByCountry($country,$filters = array())
5391 
+	public function countAllAircraftManufacturerByCountry($country, $filters = array())
5392 5392 
 	{
5393 
-		$filter_query = $this->getFilter($filters,true,true);
5394 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
5395 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5393 
+		$filter_query = $this->getFilter($filters, true, true);
5394 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
5395 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5396 5396 
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)
5397 5397 
                     GROUP BY spotter_output.aircraft_manufacturer
5398 5398 
 					ORDER BY aircraft_manufacturer_count DESC";
 
@@ -5404,7 +5404,7 @@  discard block
 
 block discarded – undo
5404 5404 
 		$aircraft_array = array();
5405 5405 
 		$temp_array = array();
5406 5406
5407 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5407 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5408 5408 
 		{
5409 5409 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5410 5410 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5425,8 +5425,8 @@  discard block
 
 block discarded – undo
5425 5425 
 	*/
5426 5426 
 	public function countAllAircraftManufacturers($filters = array())
5427 5427 
 	{
5428 
-		$filter_query = $this->getFilter($filters,true,true);
5429 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5428 
+		$filter_query = $this->getFilter($filters, true, true);
5429 
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count
5430 5430 
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
5431 5431 
                 $query .= " GROUP BY spotter_output.aircraft_manufacturer
5432 5432 
 					ORDER BY aircraft_manufacturer_count DESC
 
@@ -5439,7 +5439,7 @@  discard block
 
 block discarded – undo
5439 5439 
 		$manufacturer_array = array();
5440 5440 
 		$temp_array = array();
5441 5441
5442 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5442 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5443 5443 
 		{
5444 5444 
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
5445 5445 
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
 
@@ -5458,12 +5458,12 @@  discard block
 
 block discarded – undo
5458 5458 
 	* @return Array the aircraft list
5459 5459 
 	*
5460 5460 
 	*/
5461 
-	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5461 
+	public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5462 5462 
 	{
5463 5463 
 		global $globalDBdriver;
5464 5464 
 		$Image = new Image($this->db);
5465 
-		$filter_query = $this->getFilter($filters,true,true);
5466 
-		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5465 
+		$filter_query = $this->getFilter($filters, true, true);
5466 
+		$query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5467 5467 
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
5468 5468 
                 if ($olderthanmonths > 0) {
5469 5469 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5491,7 +5491,7 @@  discard block
 
 block discarded – undo
5491 5491 
 		$aircraft_array = array();
5492 5492 
 		$temp_array = array();
5493 5493
5494 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5494 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5495 5495 
 		{
5496 5496 
 			$temp_array['registration'] = $row['registration'];
5497 5497 
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
 
@@ -5499,7 +5499,7 @@  discard block
 
 block discarded – undo
5499 5499 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5500 5500 
 			$temp_array['airline_name'] = $row['airline_name'];
5501 5501 
 			$temp_array['image_thumbnail'] = "";
5502 
-			if($row['registration'] != "")
5502 
+			if ($row['registration'] != "")
5503 5503 
 			{
5504 5504 
 				$image_array = $Image->getSpotterImage($row['registration']);
5505 5505 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5518,12 +5518,12 @@  discard block
 
 block discarded – undo
5518 5518 
 	* @return Array the aircraft list
5519 5519 
 	*
5520 5520 
 	*/
5521 
-	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
5521 
+	public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5522 5522 
 	{
5523 5523 
 		global $globalDBdriver;
5524 
-		$filter_query = $this->getFilter($filters,true,true);
5524 
+		$filter_query = $this->getFilter($filters, true, true);
5525 5525 
 		$Image = new Image($this->db);
5526 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5526 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name
5527 5527 
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
5528 5528 
                 if ($olderthanmonths > 0) {
5529 5529 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5551,7 +5551,7 @@  discard block
 
 block discarded – undo
5551 5551 
 		$aircraft_array = array();
5552 5552 
 		$temp_array = array();
5553 5553
5554 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5554 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5555 5555 
 		{
5556 5556 
 			$temp_array['registration'] = $row['registration'];
5557 5557 
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
 
@@ -5560,7 +5560,7 @@  discard block
 
 block discarded – undo
5560 5560 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
5561 5561 
 			$temp_array['airline_name'] = $row['airline_name'];
5562 5562 
 			$temp_array['image_thumbnail'] = "";
5563 
-			if($row['registration'] != "")
5563 
+			if ($row['registration'] != "")
5564 5564 
 			{
5565 5565 
 				$image_array = $Image->getSpotterImage($row['registration']);
5566 5566 
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
 
@@ -5579,11 +5579,11 @@  discard block
 
 block discarded – undo
5579 5579 
 	* @return Array the airport list
5580 5580 
 	*
5581 5581 
 	*/
5582 
-	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5582 
+	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5583 5583 
 	{
5584 5584 
 		global $globalDBdriver;
5585 
-		$filter_query = $this->getFilter($filters,true,true);
5586 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5585 
+		$filter_query = $this->getFilter($filters, true, true);
5586 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5587 5587 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
5588 5588 
                 if ($olderthanmonths > 0) {
5589 5589 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5612,7 +5612,7 @@  discard block
 
 block discarded – undo
5612 5612 
 		$airport_array = array();
5613 5613 
 		$temp_array = array();
5614 5614
5615 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5615 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5616 5616 
 		{
5617 5617 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5618 5618 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5631,11 +5631,11 @@  discard block
 
 block discarded – undo
5631 5631 
 	* @return Array the airport list
5632 5632 
 	*
5633 5633 
 	*/
5634 
-	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5634 
+	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5635 5635 
 	{
5636 5636 
 		global $globalDBdriver;
5637 
-		$filter_query = $this->getFilter($filters,true,true);
5638 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5637 
+		$filter_query = $this->getFilter($filters, true, true);
5638 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5639 5639 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' ";
5640 5640 
                 if ($olderthanmonths > 0) {
5641 5641 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5664,7 +5664,7 @@  discard block
 
 block discarded – undo
5664 5664 
 		$airport_array = array();
5665 5665 
 		$temp_array = array();
5666 5666
5667 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5667 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5668 5668 
 		{
5669 5669 
 			$temp_array['airline_icao'] = $row['airline_icao'];
5670 5670 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -5684,11 +5684,11 @@  discard block
 
 block discarded – undo
5684 5684 
 	* @return Array the airport list
5685 5685 
 	*
5686 5686 
 	*/
5687 
-	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5687 
+	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5688 5688 
 	{
5689 5689 
 		global $globalDBdriver;
5690 
-		$filter_query = $this->getFilter($filters,true,true);
5691 
-		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5690 
+		$filter_query = $this->getFilter($filters, true, true);
5691 
+		$query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5692 5692 
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
5693 5693 
                 if ($olderthanmonths > 0) {
5694 5694 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5716,7 +5716,7 @@  discard block
 
 block discarded – undo
5716 5716 
 		$airport_array = array();
5717 5717 
 		$temp_array = array();
5718 5718
5719 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5719 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5720 5720 
 		{
5721 5721 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5722 5722 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5735,11 +5735,11 @@  discard block
 
 block discarded – undo
5735 5735 
 	* @return Array the airport list
5736 5736 
 	*
5737 5737 
 	*/
5738 
-	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
5738 
+	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
5739 5739 
 	{
5740 5740 
 		global $globalDBdriver;
5741 
-		$filter_query = $this->getFilter($filters,true,true);
5742 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5741 
+		$filter_query = $this->getFilter($filters, true, true);
5742 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
5743 5743 
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
5744 5744 
                 if ($olderthanmonths > 0) {
5745 5745 
             		if ($globalDBdriver == 'mysql') {
 
@@ -5768,7 +5768,7 @@  discard block
 
 block discarded – undo
5768 5768 
 		$airport_array = array();
5769 5769 
 		$temp_array = array();
5770 5770
5771 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5771 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5772 5772 
 		{
5773 5773 
 			$temp_array['airline_icao'] = $row['airline_icao'];
5774 5774 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -5788,11 +5788,11 @@  discard block
 
 block discarded – undo
5788 5788 
 	* @return Array the airport list
5789 5789 
 	*
5790 5790 
 	*/
5791 
-	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
5791 
+	public function countAllDepartureAirportsByAirline($airline_icao, $filters = array())
5792 5792 
 	{
5793 
-		$filter_query = $this->getFilter($filters,true,true);
5794 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5795 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5793 
+		$filter_query = $this->getFilter($filters, true, true);
5794 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5795 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5796 5796 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao AND spotter_output.departure_airport_icao <> ''
5797 5797 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5798 5798 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -5804,7 +5804,7 @@  discard block
 
 block discarded – undo
5804 5804 
 		$airport_array = array();
5805 5805 
 		$temp_array = array();
5806 5806
5807 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5807 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5808 5808 
 		{
5809 5809 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5810 5810 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5826,11 +5826,11 @@  discard block
 
 block discarded – undo
5826 5826 
 	* @return Array the airport list
5827 5827 
 	*
5828 5828 
 	*/
5829 
-	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
5829 
+	public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array())
5830 5830 
 	{
5831 
-		$filter_query = $this->getFilter($filters,true,true);
5832 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
5833 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5831 
+		$filter_query = $this->getFilter($filters, true, true);
5832 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
5833 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5834 5834 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao
5835 5835 
                     GROUP BY spotter_output.departure_airport_country
5836 5836 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5842,7 +5842,7 @@  discard block
 
 block discarded – undo
5842 5842 
 		$airport_array = array();
5843 5843 
 		$temp_array = array();
5844 5844
5845 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5845 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5846 5846 
 		{
5847 5847 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5848 5848 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -5861,11 +5861,11 @@  discard block
 
 block discarded – undo
5861 5861 
 	* @return Array the airport list
5862 5862 
 	*
5863 5863 
 	*/
5864 
-	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
5864 
+	public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array())
5865 5865 
 	{
5866 
-		$filter_query = $this->getFilter($filters,true,true);
5867 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5868 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5866 
+		$filter_query = $this->getFilter($filters, true, true);
5867 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5868 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5869 5869 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao AND spotter_output.departure_airport_icao <> ''
5870 5870 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5871 5871 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -5877,7 +5877,7 @@  discard block
 
 block discarded – undo
5877 5877 
 		$airport_array = array();
5878 5878 
 		$temp_array = array();
5879 5879
5880 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5880 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5881 5881 
 		{
5882 5882 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5883 5883 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5898,11 +5898,11 @@  discard block
 
 block discarded – undo
5898 5898 
 	* @return Array the airport list
5899 5899 
 	*
5900 5900 
 	*/
5901 
-	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
5901 
+	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array())
5902 5902 
 	{
5903 
-		$filter_query = $this->getFilter($filters,true,true);
5904 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
5905 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5903 
+		$filter_query = $this->getFilter($filters, true, true);
5904 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
5905 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5906 5906 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
5907 5907 
                     GROUP BY spotter_output.departure_airport_country
5908 5908 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5914,7 +5914,7 @@  discard block
 
 block discarded – undo
5914 5914 
 		$airport_array = array();
5915 5915 
 		$temp_array = array();
5916 5916
5917 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5917 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5918 5918 
 		{
5919 5919 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5920 5920 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -5932,11 +5932,11 @@  discard block
 
 block discarded – undo
5932 5932 
 	* @return Array the airport list
5933 5933 
 	*
5934 5934 
 	*/
5935 
-	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
5935 
+	public function countAllDepartureAirportsByRegistration($registration, $filters = array())
5936 5936 
 	{
5937 
-		$filter_query = $this->getFilter($filters,true,true);
5938 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5939 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5937 
+		$filter_query = $this->getFilter($filters, true, true);
5938 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5939 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
5940 5940 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration AND spotter_output.departure_airport_icao <> ''
5941 5941 
                     GROUP BY spotter_output.departure_airport_icao
5942 5942 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -5948,7 +5948,7 @@  discard block
 
 block discarded – undo
5948 5948 
 		$airport_array = array();
5949 5949 
 		$temp_array = array();
5950 5950
5951 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5951 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5952 5952 
 		{
5953 5953 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
5954 5954 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -5969,11 +5969,11 @@  discard block
 
 block discarded – undo
5969 5969 
 	* @return Array the airport list
5970 5970 
 	*
5971 5971 
 	*/
5972 
-	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
5972 
+	public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array())
5973 5973 
 	{
5974 
-		$filter_query = $this->getFilter($filters,true,true);
5975 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
5976 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5974 
+		$filter_query = $this->getFilter($filters, true, true);
5975 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
5976 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
5977 5977 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration
5978 5978 
                     GROUP BY spotter_output.departure_airport_country
5979 5979 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -5985,7 +5985,7 @@  discard block
 
 block discarded – undo
5985 5985 
 		$airport_array = array();
5986 5986 
 		$temp_array = array();
5987 5987
5988 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
5988 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
5989 5989 
 		{
5990 5990 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
5991 5991 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6003,11 +6003,11 @@  discard block
 
 block discarded – undo
6003 6003 
 	* @return Array the airport list
6004 6004 
 	*
6005 6005 
 	*/
6006 
-	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
6006 
+	public function countAllDepartureAirportsByAirport($airport_icao, $filters = array())
6007 6007 
 	{
6008 
-		$filter_query = $this->getFilter($filters,true,true);
6009 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6010 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6008 
+		$filter_query = $this->getFilter($filters, true, true);
6009 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6010 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6011 6011 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao AND spotter_output.departure_airport_icao <> ''
6012 6012 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6013 6013 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -6019,7 +6019,7 @@  discard block
 
 block discarded – undo
6019 6019 
 		$airport_array = array();
6020 6020 
 		$temp_array = array();
6021 6021
6022 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6022 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6023 6023 
 		{
6024 6024 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6025 6025 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6040,11 +6040,11 @@  discard block
 
 block discarded – undo
6040 6040 
 	* @return Array the airport list
6041 6041 
 	*
6042 6042 
 	*/
6043 
-	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
6043 
+	public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array())
6044 6044 
 	{
6045 
-		$filter_query = $this->getFilter($filters,true,true);
6046 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6047 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6045 
+		$filter_query = $this->getFilter($filters, true, true);
6046 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6047 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6048 6048 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao
6049 6049 
                     GROUP BY spotter_output.departure_airport_country
6050 6050 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6056,7 +6056,7 @@  discard block
 
 block discarded – undo
6056 6056 
 		$airport_array = array();
6057 6057 
 		$temp_array = array();
6058 6058
6059 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6059 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6060 6060 
 		{
6061 6061 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6062 6062 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6075,11 +6075,11 @@  discard block
 
 block discarded – undo
6075 6075 
 	* @return Array the airport list
6076 6076 
 	*
6077 6077 
 	*/
6078 
-	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6078 
+	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6079 6079 
 	{
6080 
-		$filter_query = $this->getFilter($filters,true,true);
6081 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6082 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6080 
+		$filter_query = $this->getFilter($filters, true, true);
6081 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6082 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6083 6083 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer AND spotter_output.departure_airport_icao <> ''
6084 6084 
                     GROUP BY spotter_output.departure_airport_icao
6085 6085 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -6091,7 +6091,7 @@  discard block
 
 block discarded – undo
6091 6091 
 		$airport_array = array();
6092 6092 
 		$temp_array = array();
6093 6093
6094 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6094 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6095 6095 
 		{
6096 6096 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6097 6097 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6112,11 +6112,11 @@  discard block
 
 block discarded – undo
6112 6112 
 	* @return Array the airport list
6113 6113 
 	*
6114 6114 
 	*/
6115 
-	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6115 
+	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6116 6116 
 	{
6117 
-		$filter_query = $this->getFilter($filters,true,true);
6118 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6119 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6117 
+		$filter_query = $this->getFilter($filters, true, true);
6118 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6119 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6120 6120 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6121 6121 
                     GROUP BY spotter_output.departure_airport_country
6122 6122 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6128,7 +6128,7 @@  discard block
 
 block discarded – undo
6128 6128 
 		$airport_array = array();
6129 6129 
 		$temp_array = array();
6130 6130
6131 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6131 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6132 6132 
 		{
6133 6133 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6134 6134 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6146,11 +6146,11 @@  discard block
 
 block discarded – undo
6146 6146 
 	* @return Array the airport list
6147 6147 
 	*
6148 6148 
 	*/
6149 
-	public function countAllDepartureAirportsByDate($date,$filters = array())
6149 
+	public function countAllDepartureAirportsByDate($date, $filters = array())
6150 6150 
 	{
6151 6151 
 		global $globalTimezone, $globalDBdriver;
6152 
-		$filter_query = $this->getFilter($filters,true,true);
6153 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6152 
+		$filter_query = $this->getFilter($filters, true, true);
6153 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6154 6154 
 		if ($globalTimezone != '') {
6155 6155 
 			date_default_timezone_set($globalTimezone);
6156 6156 
 			$datetime = new DateTime($date);
 
@@ -6158,12 +6158,12 @@  discard block
 
 block discarded – undo
6158 6158 
 		} else $offset = '+00:00';
6159 6159
6160 6160 
 		if ($globalDBdriver == 'mysql') {
6161 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6161 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6162 6162 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6163 6163 
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6164 6164 
 					ORDER BY airport_departure_icao_count DESC";
6165 6165 
 		} else {
6166 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6166 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6167 6167 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6168 6168 
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6169 6169 
 					ORDER BY airport_departure_icao_count DESC";
 
@@ -6175,7 +6175,7 @@  discard block
 
 block discarded – undo
6175 6175 
 		$airport_array = array();
6176 6176 
 		$temp_array = array();
6177 6177
6178 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6178 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6179 6179 
 		{
6180 6180 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6181 6181 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6196,11 +6196,11 @@  discard block
 
 block discarded – undo
6196 6196 
 	* @return Array the airport list
6197 6197 
 	*
6198 6198 
 	*/
6199 
-	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
6199 
+	public function countAllDepartureAirportCountriesByDate($date, $filters = array())
6200 6200 
 	{
6201 6201 
 		global $globalTimezone, $globalDBdriver;
6202 
-		$filter_query = $this->getFilter($filters,true,true);
6203 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6202 
+		$filter_query = $this->getFilter($filters, true, true);
6203 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6204 6204 
 		if ($globalTimezone != '') {
6205 6205 
 			date_default_timezone_set($globalTimezone);
6206 6206 
 			$datetime = new DateTime($date);
 
@@ -6208,12 +6208,12 @@  discard block
 
 block discarded – undo
6208 6208 
 		} else $offset = '+00:00';
6209 6209
6210 6210 
 		if ($globalDBdriver == 'mysql') {
6211 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6211 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6212 6212 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
6213 6213 
 					GROUP BY spotter_output.departure_airport_country
6214 6214 
 					ORDER BY airport_departure_country_count DESC";
6215 6215 
 		} else {
6216 
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6216 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6217 6217 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
6218 6218 
 					GROUP BY spotter_output.departure_airport_country
6219 6219 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6225,7 +6225,7 @@  discard block
 
 block discarded – undo
6225 6225 
 		$airport_array = array();
6226 6226 
 		$temp_array = array();
6227 6227
6228 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6228 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6229 6229 
 		{
6230 6230 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6231 6231 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6243,11 +6243,11 @@  discard block
 
 block discarded – undo
6243 6243 
 	* @return Array the airport list
6244 6244 
 	*
6245 6245 
 	*/
6246 
-	public function countAllDepartureAirportsByIdent($ident,$filters = array())
6246 
+	public function countAllDepartureAirportsByIdent($ident, $filters = array())
6247 6247 
 	{
6248 
-		$filter_query = $this->getFilter($filters,true,true);
6249 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6250 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6248 
+		$filter_query = $this->getFilter($filters, true, true);
6249 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6250 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6251 6251 
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.ident = :ident
6252 6252 
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6253 6253 
 		    ORDER BY airport_departure_icao_count DESC";
 
@@ -6259,7 +6259,7 @@  discard block
 
 block discarded – undo
6259 6259 
 		$airport_array = array();
6260 6260 
 		$temp_array = array();
6261 6261
6262 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6262 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6263 6263 
 		{
6264 6264 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6265 6265 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6281,11 +6281,11 @@  discard block
 
 block discarded – undo
6281 6281 
 	* @return Array the airport list
6282 6282 
 	*
6283 6283 
 	*/
6284 
-	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
6284 
+	public function countAllDepartureAirportCountriesByIdent($ident, $filters = array())
6285 6285 
 	{
6286 
-		$filter_query = $this->getFilter($filters,true,true);
6287 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
6288 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6286 
+		$filter_query = $this->getFilter($filters, true, true);
6287 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
6288 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6289 6289 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident
6290 6290 
                     GROUP BY spotter_output.departure_airport_country
6291 6291 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6297,7 +6297,7 @@  discard block
 
 block discarded – undo
6297 6297 
 		$airport_array = array();
6298 6298 
 		$temp_array = array();
6299 6299
6300 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6300 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6301 6301 
 		{
6302 6302 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6303 6303 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6316,12 +6316,12 @@  discard block
 
 block discarded – undo
6316 6316 
 	* @return Array the airport list
6317 6317 
 	*
6318 6318 
 	*/
6319 
-	public function countAllDepartureAirportsByCountry($country,$filters = array())
6319 
+	public function countAllDepartureAirportsByCountry($country, $filters = array())
6320 6320 
 	{
6321 
-		$filter_query = $this->getFilter($filters,true,true);
6322 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6321 
+		$filter_query = $this->getFilter($filters, true, true);
6322 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6323 6323
6324 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6324 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6325 6325 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6326 6326 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
6327 6327 
 			    ORDER BY airport_departure_icao_count DESC";
 
@@ -6333,7 +6333,7 @@  discard block
 
 block discarded – undo
6333 6333 
 		$airport_array = array();
6334 6334 
 		$temp_array = array();
6335 6335
6336 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6336 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6337 6337 
 		{
6338 6338 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
6339 6339 
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
 
@@ -6354,11 +6354,11 @@  discard block
 
 block discarded – undo
6354 6354 
 	* @return Array the airport list
6355 6355 
 	*
6356 6356 
 	*/
6357 
-	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
6357 
+	public function countAllDepartureAirportCountriesByCountry($country, $filters = array())
6358 6358 
 	{
6359 
-		$filter_query = $this->getFilter($filters,true,true);
6360 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
6361 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6359 
+		$filter_query = $this->getFilter($filters, true, true);
6360 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
6361 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
6362 6362 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
6363 6363 
                     GROUP BY spotter_output.departure_airport_country
6364 6364 
 					ORDER BY airport_departure_country_count DESC";
 
@@ -6370,7 +6370,7 @@  discard block
 
 block discarded – undo
6370 6370 
 		$airport_array = array();
6371 6371 
 		$temp_array = array();
6372 6372
6373 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6373 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6374 6374 
 		{
6375 6375 
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
6376 6376 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 
@@ -6393,11 +6393,11 @@  discard block
 
 block discarded – undo
6393 6393 
 	* @return Array the airport list
6394 6394 
 	*
6395 6395 
 	*/
6396 
-	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6396 
+	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6397 6397 
 	{
6398 6398 
 		global $globalDBdriver;
6399 
-		$filter_query = $this->getFilter($filters,true,true);
6400 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6399 
+		$filter_query = $this->getFilter($filters, true, true);
6400 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6401 6401 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
6402 6402 
                 if ($olderthanmonths > 0) {
6403 6403 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6427,7 +6427,7 @@  discard block
 
 block discarded – undo
6427 6427 
 		$airport_array = array();
6428 6428 
 		$temp_array = array();
6429 6429
6430 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6430 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6431 6431 
 		{
6432 6432 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6433 6433 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6450,11 +6450,11 @@  discard block
 
 block discarded – undo
6450 6450 
 	* @return Array the airport list
6451 6451 
 	*
6452 6452 
 	*/
6453 
-	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
6453 
+	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6454 6454 
 	{
6455 6455 
 		global $globalDBdriver;
6456 
-		$filter_query = $this->getFilter($filters,true,true);
6457 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6456 
+		$filter_query = $this->getFilter($filters, true, true);
6457 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6458 6458 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
6459 6459 
                 if ($olderthanmonths > 0) {
6460 6460 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6484,7 +6484,7 @@  discard block
 
 block discarded – undo
6484 6484 
 		$airport_array = array();
6485 6485 
 		$temp_array = array();
6486 6486
6487 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6487 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6488 6488 
 		{
6489 6489 
 			$temp_array['airline_icao'] = $row['airline_icao'];
6490 6490 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
 
@@ -6509,11 +6509,11 @@  discard block
 
 block discarded – undo
6509 6509 
 	* @return Array the airport list
6510 6510 
 	*
6511 6511 
 	*/
6512 
-	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6512 
+	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6513 6513 
 	{
6514 6514 
 		global $globalDBdriver;
6515 
-		$filter_query = $this->getFilter($filters,true,true);
6516 
-		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6515 
+		$filter_query = $this->getFilter($filters, true, true);
6516 
+		$query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6517 6517 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
6518 6518 
                 if ($olderthanmonths > 0) {
6519 6519 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6542,7 +6542,7 @@  discard block
 
 block discarded – undo
6542 6542 
 		$airport_array = array();
6543 6543 
 		$temp_array = array();
6544 6544
6545 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6545 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6546 6546 
 		{
6547 6547 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6548 6548 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6565,11 +6565,11 @@  discard block
 
 block discarded – undo
6565 6565 
 	* @return Array the airport list
6566 6566 
 	*
6567 6567 
 	*/
6568 
-	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
6568 
+	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
6569 6569 
 	{
6570 6570 
 		global $globalDBdriver;
6571 
-		$filter_query = $this->getFilter($filters,true,true);
6572 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6571 
+		$filter_query = $this->getFilter($filters, true, true);
6572 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country
6573 6573 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
6574 6574 
                 if ($olderthanmonths > 0) {
6575 6575 
             		if ($globalDBdriver == 'mysql') {
 
@@ -6599,7 +6599,7 @@  discard block
 
 block discarded – undo
6599 6599 
 		$airport_array = array();
6600 6600 
 		$temp_array = array();
6601 6601
6602 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6602 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6603 6603 
 		{
6604 6604 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6605 6605 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6625,9 +6625,9 @@  discard block
 
 block discarded – undo
6625 6625 
 	*/
6626 6626 
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
6627 6627 
 	{
6628 
-		$filter_query = $this->getFilter($filters,true,true);
6629 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6630 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6628 
+		$filter_query = $this->getFilter($filters, true, true);
6629 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6630 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6631 6631 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.airline_icao = :airline_icao
6632 6632 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6633 6633 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6638,7 +6638,7 @@  discard block
 
 block discarded – undo
6638 6638 
 		$airport_array = array();
6639 6639 
 		$temp_array = array();
6640 6640
6641 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6641 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6642 6642 
 		{
6643 6643 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6644 6644 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6659,12 +6659,12 @@  discard block
 
 block discarded – undo
6659 6659 
 	* @return Array the airport list
6660 6660 
 	*
6661 6661 
 	*/
6662 
-	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
6662 
+	public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array())
6663 6663 
 	{
6664 
-		$filter_query = $this->getFilter($filters,true,true);
6665 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
6664 
+		$filter_query = $this->getFilter($filters, true, true);
6665 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
6666 6666
6667 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6667 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6668 6668 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao
6669 6669 
                     GROUP BY spotter_output.arrival_airport_country
6670 6670 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6676,7 +6676,7 @@  discard block
 
 block discarded – undo
6676 6676 
 		$airport_array = array();
6677 6677 
 		$temp_array = array();
6678 6678
6679 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6679 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6680 6680 
 		{
6681 6681 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6682 6682 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6694,11 +6694,11 @@  discard block
 
 block discarded – undo
6694 6694 
 	* @return Array the airport list
6695 6695 
 	*
6696 6696 
 	*/
6697 
-	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
6697 
+	public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array())
6698 6698 
 	{
6699 
-		$filter_query = $this->getFilter($filters,true,true);
6700 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6701 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6699 
+		$filter_query = $this->getFilter($filters, true, true);
6700 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6701 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6702 6702 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_icao = :aircraft_icao
6703 6703 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6704 6704 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6710,7 +6710,7 @@  discard block
 
 block discarded – undo
6710 6710 
 		$airport_array = array();
6711 6711 
 		$temp_array = array();
6712 6712
6713 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6713 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6714 6714 
 		{
6715 6715 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6716 6716 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6732,11 +6732,11 @@  discard block
 
 block discarded – undo
6732 6732 
 	* @return Array the airport list
6733 6733 
 	*
6734 6734 
 	*/
6735 
-	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
6735 
+	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array())
6736 6736 
 	{
6737 
-		$filter_query = $this->getFilter($filters,true,true);
6738 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
6739 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6737 
+		$filter_query = $this->getFilter($filters, true, true);
6738 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
6739 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6740 6740 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
6741 6741 
                     GROUP BY spotter_output.arrival_airport_country
6742 6742 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6748,7 +6748,7 @@  discard block
 
 block discarded – undo
6748 6748 
 		$airport_array = array();
6749 6749 
 		$temp_array = array();
6750 6750
6751 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6751 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6752 6752 
 		{
6753 6753 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6754 6754 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6766,12 +6766,12 @@  discard block
 
 block discarded – undo
6766 6766 
 	* @return Array the airport list
6767 6767 
 	*
6768 6768 
 	*/
6769 
-	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
6769 
+	public function countAllArrivalAirportsByRegistration($registration, $filters = array())
6770 6770 
 	{
6771 
-		$filter_query = $this->getFilter($filters,true,true);
6772 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6771 
+		$filter_query = $this->getFilter($filters, true, true);
6772 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6773 6773
6774 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6774 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6775 6775 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.registration = :registration
6776 6776 
                     GROUP BY spotter_output.arrival_airport_icao
6777 6777 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -6783,7 +6783,7 @@  discard block
 
 block discarded – undo
6783 6783 
 		$airport_array = array();
6784 6784 
 		$temp_array = array();
6785 6785
6786 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6786 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6787 6787 
 		{
6788 6788 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6789 6789 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6804,11 +6804,11 @@  discard block
 
 block discarded – undo
6804 6804 
 	* @return Array the airport list
6805 6805 
 	*
6806 6806 
 	*/
6807 
-	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
6807 
+	public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array())
6808 6808 
 	{
6809 
-		$filter_query = $this->getFilter($filters,true,true);
6810 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
6811 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6809 
+		$filter_query = $this->getFilter($filters, true, true);
6810 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
6811 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6812 6812 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration
6813 6813 
                     GROUP BY spotter_output.arrival_airport_country
6814 6814 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6820,7 +6820,7 @@  discard block
 
 block discarded – undo
6820 6820 
 		$airport_array = array();
6821 6821 
 		$temp_array = array();
6822 6822
6823 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6823 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6824 6824 
 		{
6825 6825 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6826 6826 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6839,11 +6839,11 @@  discard block
 
 block discarded – undo
6839 6839 
 	* @return Array the airport list
6840 6840 
 	*
6841 6841 
 	*/
6842 
-	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
6842 
+	public function countAllArrivalAirportsByAirport($airport_icao, $filters = array())
6843 6843 
 	{
6844 
-		$filter_query = $this->getFilter($filters,true,true);
6845 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6846 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6844 
+		$filter_query = $this->getFilter($filters, true, true);
6845 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6846 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6847 6847 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.departure_airport_icao = :airport_icao
6848 6848 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6849 6849 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -6855,7 +6855,7 @@  discard block
 
 block discarded – undo
6855 6855 
 		$airport_array = array();
6856 6856 
 		$temp_array = array();
6857 6857
6858 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6858 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6859 6859 
 		{
6860 6860 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6861 6861 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6876,11 +6876,11 @@  discard block
 
 block discarded – undo
6876 6876 
 	* @return Array the airport list
6877 6877 
 	*
6878 6878 
 	*/
6879 
-	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
6879 
+	public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array())
6880 6880 
 	{
6881 
-		$filter_query = $this->getFilter($filters,true,true);
6882 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
6883 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6881 
+		$filter_query = $this->getFilter($filters, true, true);
6882 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
6883 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6884 6884 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao
6885 6885 
                     GROUP BY spotter_output.arrival_airport_country
6886 6886 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6892,7 +6892,7 @@  discard block
 
 block discarded – undo
6892 6892 
 		$airport_array = array();
6893 6893 
 		$temp_array = array();
6894 6894
6895 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6895 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6896 6896 
 		{
6897 6897 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6898 6898 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6910,11 +6910,11 @@  discard block
 
 block discarded – undo
6910 6910 
 	* @return Array the airport list
6911 6911 
 	*
6912 6912 
 	*/
6913 
-	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
6913 
+	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array())
6914 6914 
 	{
6915 
-		$filter_query = $this->getFilter($filters,true,true);
6916 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6917 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6915 
+		$filter_query = $this->getFilter($filters, true, true);
6916 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6917 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6918 6918 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6919 6919 
                     GROUP BY spotter_output.arrival_airport_icao
6920 6920 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -6926,7 +6926,7 @@  discard block
 
 block discarded – undo
6926 6926 
 		$airport_array = array();
6927 6927 
 		$temp_array = array();
6928 6928
6929 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6929 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6930 6930 
 		{
6931 6931 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
6932 6932 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -6948,11 +6948,11 @@  discard block
 
 block discarded – undo
6948 6948 
 	* @return Array the airport list
6949 6949 
 	*
6950 6950 
 	*/
6951 
-	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
6951 
+	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
6952 6952 
 	{
6953 
-		$filter_query = $this->getFilter($filters,true,true);
6954 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
6955 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6953 
+		$filter_query = $this->getFilter($filters, true, true);
6954 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
6955 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
6956 6956 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
6957 6957 
                     GROUP BY spotter_output.arrival_airport_country
6958 6958 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -6964,7 +6964,7 @@  discard block
 
 block discarded – undo
6964 6964 
 		$airport_array = array();
6965 6965 
 		$temp_array = array();
6966 6966
6967 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
6967 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
6968 6968 
 		{
6969 6969 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
6970 6970 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -6983,11 +6983,11 @@  discard block
 
 block discarded – undo
6983 6983 
 	* @return Array the airport list
6984 6984 
 	*
6985 6985 
 	*/
6986 
-	public function countAllArrivalAirportsByDate($date,$filters = array())
6986 
+	public function countAllArrivalAirportsByDate($date, $filters = array())
6987 6987 
 	{
6988 6988 
 		global $globalTimezone, $globalDBdriver;
6989 
-		$filter_query = $this->getFilter($filters,true,true);
6990 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
6989 
+		$filter_query = $this->getFilter($filters, true, true);
6990 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
6991 6991 
 		if ($globalTimezone != '') {
6992 6992 
 			date_default_timezone_set($globalTimezone);
6993 6993 
 			$datetime = new DateTime($date);
 
@@ -6995,12 +6995,12 @@  discard block
 
 block discarded – undo
6995 6995 
 		} else $offset = '+00:00';
6996 6996
6997 6997 
 		if ($globalDBdriver == 'mysql') {
6998 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6998 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
6999 6999 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
7000 7000 
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7001 7001 
 					ORDER BY airport_arrival_icao_count DESC";
7002 7002 
 		} else {
7003 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7003 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7004 7004 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
7005 7005 
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7006 7006 
 					ORDER BY airport_arrival_icao_count DESC";
 
@@ -7012,7 +7012,7 @@  discard block
 
 block discarded – undo
7012 7012 
 		$airport_array = array();
7013 7013 
 		$temp_array = array();
7014 7014
7015 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7015 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7016 7016 
 		{
7017 7017 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7018 7018 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7036,8 +7036,8 @@  discard block
 
 block discarded – undo
7036 7036 
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
7037 7037 
 	{
7038 7038 
 		global $globalTimezone, $globalDBdriver;
7039 
-		$filter_query = $this->getFilter($filters,true,true);
7040 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7039 
+		$filter_query = $this->getFilter($filters, true, true);
7040 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7041 7041 
 		if ($globalTimezone != '') {
7042 7042 
 			date_default_timezone_set($globalTimezone);
7043 7043 
 			$datetime = new DateTime($date);
 
@@ -7045,12 +7045,12 @@  discard block
 
 block discarded – undo
7045 7045 
 		} else $offset = '+00:00';
7046 7046
7047 7047 
 		if ($globalDBdriver == 'mysql') {
7048 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7048 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7049 7049 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
7050 7050 
 					GROUP BY spotter_output.arrival_airport_country
7051 7051 
 					ORDER BY airport_arrival_country_count DESC";
7052 7052 
 		} else {
7053 
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7053 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7054 7054 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
7055 7055 
 					GROUP BY spotter_output.arrival_airport_country
7056 7056 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7062,7 +7062,7 @@  discard block
 
 block discarded – undo
7062 7062 
 		$airport_array = array();
7063 7063 
 		$temp_array = array();
7064 7064
7065 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7065 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7066 7066 
 		{
7067 7067 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7068 7068 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7080,11 +7080,11 @@  discard block
 
 block discarded – undo
7080 7080 
 	* @return Array the airport list
7081 7081 
 	*
7082 7082 
 	*/
7083 
-	public function countAllArrivalAirportsByIdent($ident,$filters = array())
7083 
+	public function countAllArrivalAirportsByIdent($ident, $filters = array())
7084 7084 
 	{
7085 
-		$filter_query = $this->getFilter($filters,true,true);
7086 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7087 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7085 
+		$filter_query = $this->getFilter($filters, true, true);
7086 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7087 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7088 7088 
 		    FROM spotter_output".$filter_query." WHERE spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.ident = :ident
7089 7089 
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7090 7090 
 		    ORDER BY airport_arrival_icao_count DESC";
 
@@ -7096,7 +7096,7 @@  discard block
 
 block discarded – undo
7096 7096 
 		$airport_array = array();
7097 7097 
 		$temp_array = array();
7098 7098
7099 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7099 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7100 7100 
 		{
7101 7101 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7102 7102 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7119,9 +7119,9 @@  discard block
 
 block discarded – undo
7119 7119 
 	*/
7120 7120 
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
7121 7121 
 	{
7122 
-		$filter_query = $this->getFilter($filters,true,true);
7123 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7124 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7122 
+		$filter_query = $this->getFilter($filters, true, true);
7123 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7124 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7125 7125 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident
7126 7126 
                     GROUP BY spotter_output.arrival_airport_country
7127 7127 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7133,7 +7133,7 @@  discard block
 
 block discarded – undo
7133 7133 
 		$airport_array = array();
7134 7134 
 		$temp_array = array();
7135 7135
7136 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7136 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7137 7137 
 		{
7138 7138 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7139 7139 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7152,11 +7152,11 @@  discard block
 
 block discarded – undo
7152 7152 
 	* @return Array the airport list
7153 7153 
 	*
7154 7154 
 	*/
7155 
-	public function countAllArrivalAirportsByCountry($country,$filters = array())
7155 
+	public function countAllArrivalAirportsByCountry($country, $filters = array())
7156 7156 
 	{
7157 
-		$filter_query = $this->getFilter($filters,true,true);
7158 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7159 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7157 
+		$filter_query = $this->getFilter($filters, true, true);
7158 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7159 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7160 7160 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7161 7161 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7162 7162 
 			    ORDER BY airport_arrival_icao_count DESC";
 
@@ -7168,7 +7168,7 @@  discard block
 
 block discarded – undo
7168 7168 
 		$airport_array = array();
7169 7169 
 		$temp_array = array();
7170 7170
7171 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7171 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7172 7172 
 		{
7173 7173 
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
7174 7174 
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
 
@@ -7189,11 +7189,11 @@  discard block
 
 block discarded – undo
7189 7189 
 	* @return Array the airport list
7190 7190 
 	*
7191 7191 
 	*/
7192 
-	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
7192 
+	public function countAllArrivalAirportCountriesByCountry($country, $filters = array())
7193 7193 
 	{
7194 
-		$filter_query = $this->getFilter($filters,true,true);
7195 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7196 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7194 
+		$filter_query = $this->getFilter($filters, true, true);
7195 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7196 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7197 7197 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7198 7198 
                     GROUP BY spotter_output.arrival_airport_country
7199 7199 
 					ORDER BY airport_arrival_country_count DESC";
 
@@ -7205,7 +7205,7 @@  discard block
 
 block discarded – undo
7205 7205 
 		$airport_array = array();
7206 7206 
 		$temp_array = array();
7207 7207
7208 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7208 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7209 7209 
 		{
7210 7210 
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
7211 7211 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 
@@ -7226,7 +7226,7 @@  discard block
 
 block discarded – undo
7226 7226 
 	*/
7227 7227 
 	public function countAllDepartureCountries($filters = array())
7228 7228 
 	{
7229 
-		$filter_query = $this->getFilter($filters,true,true);
7229 
+		$filter_query = $this->getFilter($filters, true, true);
7230 7230 
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count
7231 7231 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
7232 7232 
 		$query .= " GROUP BY spotter_output.departure_airport_country
 
@@ -7240,7 +7240,7 @@  discard block
 
 block discarded – undo
7240 7240 
 		$airport_array = array();
7241 7241 
 		$temp_array = array();
7242 7242
7243 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7243 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7244 7244 
 		{
7245 7245 
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
7246 7246 
 			$temp_array['airport_departure_country'] = $row['departure_airport_country'];
 
@@ -7258,9 +7258,9 @@  discard block
 
 block discarded – undo
7258 7258 
 	* @return Array the airport arrival list
7259 7259 
 	*
7260 7260 
 	*/
7261 
-	public function countAllArrivalCountries($limit = true,$filters = array())
7261 
+	public function countAllArrivalCountries($limit = true, $filters = array())
7262 7262 
 	{
7263 
-		$filter_query = $this->getFilter($filters,true,true);
7263 
+		$filter_query = $this->getFilter($filters, true, true);
7264 7264 
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count
7265 7265 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
7266 7266 
 		$query .= " GROUP BY spotter_output.arrival_airport_country
 
@@ -7274,7 +7274,7 @@  discard block
 
 block discarded – undo
7274 7274 
 		$airport_array = array();
7275 7275 
 		$temp_array = array();
7276 7276
7277 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7277 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7278 7278 
 		{
7279 7279 
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
7280 7280 
 			$temp_array['airport_arrival_country'] = $row['arrival_airport_country'];
 
@@ -7297,8 +7297,8 @@  discard block
 
 block discarded – undo
7297 7297 
 	*/
7298 7298 
 	public function countAllRoutes($filters = array())
7299 7299 
 	{
7300 
-		$filter_query = $this->getFilter($filters,true,true);
7301 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7300 
+		$filter_query = $this->getFilter($filters, true, true);
7301 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7302 7302 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''
7303 7303 
                     GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
7304 7304 
                     ORDER BY route_count DESC
 
@@ -7311,7 +7311,7 @@  discard block
 
 block discarded – undo
7311 7311 
 		$routes_array = array();
7312 7312 
 		$temp_array = array();
7313 7313
7314 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7314 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7315 7315 
 		{
7316 7316 
 			$temp_array['route_count'] = $row['route_count'];
7317 7317 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7338,11 +7338,11 @@  discard block
 
 block discarded – undo
7338 7338 
 	* @return Array the route list
7339 7339 
 	*
7340 7340 
 	*/
7341 
-	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
7341 
+	public function countAllRoutesByAircraft($aircraft_icao, $filters = array())
7342 7342 
 	{
7343 
-		$filter_query = $this->getFilter($filters,true,true);
7344 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
7345 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7343 
+		$filter_query = $this->getFilter($filters, true, true);
7344 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
7345 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7346 7346 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao
7347 7347 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7348 7348 
 			    ORDER BY route_count DESC";
 
@@ -7353,7 +7353,7 @@  discard block
 
 block discarded – undo
7353 7353 
 		$routes_array = array();
7354 7354 
 		$temp_array = array();
7355 7355
7356 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7356 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7357 7357 
 		{
7358 7358 
 			$temp_array['route_count'] = $row['route_count'];
7359 7359 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7380,9 +7380,9 @@  discard block
 
 block discarded – undo
7380 7380 
 	*/
7381 7381 
 	public function countAllRoutesByRegistration($registration, $filters = array())
7382 7382 
 	{
7383 
-		$filter_query = $this->getFilter($filters,true,true);
7383 
+		$filter_query = $this->getFilter($filters, true, true);
7384 7384 
 		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
7385 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7385 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7386 7386 
 			FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration
7387 7387 
                     GROUP BY route
7388 7388 
                     ORDER BY route_count DESC";
 
@@ -7394,7 +7394,7 @@  discard block
 
 block discarded – undo
7394 7394 
 		$routes_array = array();
7395 7395 
 		$temp_array = array();
7396 7396
7397 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7397 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7398 7398 
 		{
7399 7399 
 			$temp_array['route_count'] = $row['route_count'];
7400 7400 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7422,9 +7422,9 @@  discard block
 
 block discarded – undo
7422 7422 
 	*/
7423 7423 
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
7424 7424 
 	{
7425 
-		$filter_query = $this->getFilter($filters,true,true);
7426 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
7427 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7425 
+		$filter_query = $this->getFilter($filters, true, true);
7426 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
7427 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7428 7428 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao
7429 7429 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7430 7430 
 			    ORDER BY route_count DESC";
 
@@ -7436,7 +7436,7 @@  discard block
 
 block discarded – undo
7436 7436 
 		$routes_array = array();
7437 7437 
 		$temp_array = array();
7438 7438
7439 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7439 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7440 7440 
 		{
7441 7441 
 			$temp_array['route_count'] = $row['route_count'];
7442 7442 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7464,9 +7464,9 @@  discard block
 
 block discarded – undo
7464 7464 
 	*/
7465 7465 
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
7466 7466 
 	{
7467 
-		$filter_query = $this->getFilter($filters,true,true);
7468 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
7469 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7467 
+		$filter_query = $this->getFilter($filters, true, true);
7468 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
7469 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7470 7470 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
7471 7471 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7472 7472 
 			    ORDER BY route_count DESC";
 
@@ -7477,7 +7477,7 @@  discard block
 
 block discarded – undo
7477 7477 
 		$routes_array = array();
7478 7478 
 		$temp_array = array();
7479 7479
7480 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7480 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7481 7481 
 		{
7482 7482 
 			$temp_array['route_count'] = $row['route_count'];
7483 7483 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7505,9 +7505,9 @@  discard block
 
 block discarded – undo
7505 7505 
 	*/
7506 7506 
 	public function countAllRoutesByCountry($country, $filters = array())
7507 7507 
 	{
7508 
-		$filter_query = $this->getFilter($filters,true,true);
7509 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
7510 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7508 
+		$filter_query = $this->getFilter($filters, true, true);
7509 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
7510 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7511 7511 
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
7512 7512 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7513 7513 
 			    ORDER BY route_count DESC";
 
@@ -7518,7 +7518,7 @@  discard block
 
 block discarded – undo
7518 7518 
 		$routes_array = array();
7519 7519 
 		$temp_array = array();
7520 7520
7521 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7521 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7522 7522 
 		{
7523 7523 
 			$temp_array['route_count'] = $row['route_count'];
7524 7524 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7546,8 +7546,8 @@  discard block
 
 block discarded – undo
7546 7546 
 	public function countAllRoutesByDate($date, $filters = array())
7547 7547 
 	{
7548 7548 
 		global $globalTimezone, $globalDBdriver;
7549 
-		$filter_query = $this->getFilter($filters,true,true);
7550 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
7549 
+		$filter_query = $this->getFilter($filters, true, true);
7550 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
7551 7551 
 		if ($globalTimezone != '') {
7552 7552 
 			date_default_timezone_set($globalTimezone);
7553 7553 
 			$datetime = new DateTime($date);
 
@@ -7555,12 +7555,12 @@  discard block
 
 block discarded – undo
7555 7555 
 		} else $offset = '+00:00';
7556 7556
7557 7557 
 		if ($globalDBdriver == 'mysql') {
7558 
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7558 
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7559 7559 
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
7560 7560 
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7561 7561 
 				    ORDER BY route_count DESC";
7562 7562 
 		} else {
7563 
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7563 
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7564 7564 
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
7565 7565 
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7566 7566 
 				    ORDER BY route_count DESC";
 
@@ -7572,7 +7572,7 @@  discard block
 
 block discarded – undo
7572 7572 
 		$routes_array = array();
7573 7573 
 		$temp_array = array();
7574 7574
7575 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7575 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7576 7576 
 		{
7577 7577 
 			$temp_array['route_count'] = $row['route_count'];
7578 7578 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7599,9 +7599,9 @@  discard block
 
 block discarded – undo
7599 7599 
 	*/
7600 7600 
 	public function countAllRoutesByIdent($ident, $filters = array())
7601 7601 
 	{
7602 
-		$filter_query = $this->getFilter($filters,true,true);
7603 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
7604 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7602 
+		$filter_query = $this->getFilter($filters, true, true);
7603 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
7604 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7605 7605 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident
7606 7606 
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7607 7607 
                     ORDER BY route_count DESC";
 
@@ -7613,7 +7613,7 @@  discard block
 
 block discarded – undo
7613 7613 
 		$routes_array = array();
7614 7614 
 		$temp_array = array();
7615 7615
7616 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7616 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7617 7617 
 		{
7618 7618 
 			$temp_array['route_count'] = $row['route_count'];
7619 7619 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7640,9 +7640,9 @@  discard block
 
 block discarded – undo
7640 7640 
 	*/
7641 7641 
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
7642 7642 
 	{
7643 
-		$filter_query = $this->getFilter($filters,true,true);
7644 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
7645 
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7643 
+		$filter_query = $this->getFilter($filters, true, true);
7644 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
7645 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7646 7646 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer
7647 7647 
                     GROUP BY route
7648 7648 
                     ORDER BY route_count DESC";
 
@@ -7654,7 +7654,7 @@  discard block
 
 block discarded – undo
7654 7654 
 		$routes_array = array();
7655 7655 
 		$temp_array = array();
7656 7656
7657 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7657 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7658 7658 
 		{
7659 7659 
 			$temp_array['route_count'] = $row['route_count'];
7660 7660 
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 
@@ -7682,8 +7682,8 @@  discard block
 
 block discarded – undo
7682 7682 
 	*/
7683 7683 
 	public function countAllRoutesWithWaypoints($filters = array())
7684 7684 
 	{
7685 
-		$filter_query = $this->getFilter($filters,true,true);
7686 
-		$query  = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7685 
+		$filter_query = $this->getFilter($filters, true, true);
7686 
+		$query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
7687 7687 
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> ''
7688 7688 
                     GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
7689 7689 
                     ORDER BY route_count DESC
 
@@ -7696,7 +7696,7 @@  discard block
 
 block discarded – undo
7696 7696 
 		$routes_array = array();
7697 7697 
 		$temp_array = array();
7698 7698
7699 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7699 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7700 7700 
 		{
7701 7701 
 			$temp_array['spotter_id'] = $row['spotter_id'];
7702 7702 
 			$temp_array['route_count'] = $row['route_count'];
 
@@ -7721,11 +7721,11 @@  discard block
 
 block discarded – undo
7721 7721 
 	* @return Array the callsign list
7722 7722 
 	*
7723 7723 
 	*/
7724 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
7724 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7725 7725 
 	{
7726 7726 
 		global $globalDBdriver;
7727 
-		$filter_query = $this->getFilter($filters,true,true);
7728 
-		$query  = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao
7727 
+		$filter_query = $this->getFilter($filters, true, true);
7728 
+		$query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao
7729 7729 
                     FROM spotter_output".$filter_query." spotter_output.ident <> '' ";
7730 7730 
 		 if ($olderthanmonths > 0) {
7731 7731 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -7744,7 +7744,7 @@  discard block
 
 block discarded – undo
7744 7744 
 		$callsign_array = array();
7745 7745 
 		$temp_array = array();
7746 7746
7747 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7747 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7748 7748 
 		{
7749 7749 
 			$temp_array['callsign_icao'] = $row['ident'];
7750 7750 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -7766,8 +7766,8 @@  discard block
 
 block discarded – undo
7766 7766 
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
7767 7767 
 	{
7768 7768 
 		global $globalDBdriver;
7769 
-		$filter_query = $this->getFilter($filters,true,true);
7770 
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name
7769 
+		$filter_query = $this->getFilter($filters, true, true);
7770 
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name
7771 7771 
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
7772 7772 
 		 if ($olderthanmonths > 0) {
7773 7773 
 			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 
@@ -7786,7 +7786,7 @@  discard block
 
 block discarded – undo
7786 7786 
 		$callsign_array = array();
7787 7787 
 		$temp_array = array();
7788 7788
7789 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7789 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7790 7790 
 		{
7791 7791 
 			$temp_array['callsign_icao'] = $row['ident'];
7792 7792 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -7840,7 +7840,7 @@  discard block
 
 block discarded – undo
7840 7840 
 		$date_array = array();
7841 7841 
 		$temp_array = array();
7842 7842
7843 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7843 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7844 7844 
 		{
7845 7845 
 			$temp_array['date_name'] = $row['date_name'];
7846 7846 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7865,15 +7865,15 @@  discard block
 
 block discarded – undo
7865 7865 
 			$datetime = new DateTime();
7866 7866 
 			$offset = $datetime->format('P');
7867 7867 
 		} else $offset = '+00:00';
7868 
-		$filter_query = $this->getFilter($filters,true,true);
7868 
+		$filter_query = $this->getFilter($filters, true, true);
7869 7869 
 		if ($globalDBdriver == 'mysql') {
7870 
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7870 
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7871 7871 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
7872 7872 
 								GROUP BY spotter_output.airline_icao, date_name
7873 7873 
 								ORDER BY date_count DESC
7874 7874 
 								LIMIT 10 OFFSET 0";
7875 7875 
 		} else {
7876 
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7876 
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
7877 7877 
 								FROM spotter_output
7878 7878 
 								WHERE spotter_output.airline_icao <> ''
7879 7879 
 								GROUP BY spotter_output.airline_icao, date_name 
@@ -7888,7 +7888,7 @@  discard block
 
 block discarded – undo
7888 7888 
 		$date_array = array();
7889 7889 
 		$temp_array = array();
7890 7890
7891 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7891 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7892 7892 
 		{
7893 7893 
 			$temp_array['date_name'] = $row['date_name'];
7894 7894 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7914,7 +7914,7 @@  discard block
 
 block discarded – undo
7914 7914 
 			$datetime = new DateTime();
7915 7915 
 			$offset = $datetime->format('P');
7916 7916 
 		} else $offset = '+00:00';
7917 
-		$filter_query = $this->getFilter($filters,true,true);
7917 
+		$filter_query = $this->getFilter($filters, true, true);
7918 7918 
 		if ($globalDBdriver == 'mysql') {
7919 7919 
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7920 7920 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -7935,7 +7935,7 @@  discard block
 
 block discarded – undo
7935 7935 
 		$date_array = array();
7936 7936 
 		$temp_array = array();
7937 7937
7938 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7938 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7939 7939 
 		{
7940 7940 
 			$temp_array['date_name'] = $row['date_name'];
7941 7941 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -7960,7 +7960,7 @@  discard block
 
 block discarded – undo
7960 7960 
 			$datetime = new DateTime();
7961 7961 
 			$offset = $datetime->format('P');
7962 7962 
 		} else $offset = '+00:00';
7963 
-		$filter_query = $this->getFilter($filters,true,true);
7963 
+		$filter_query = $this->getFilter($filters, true, true);
7964 7964 
 		if ($globalDBdriver == 'mysql') {
7965 7965 
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
7966 7966 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -7981,7 +7981,7 @@  discard block
 
 block discarded – undo
7981 7981 
 		$date_array = array();
7982 7982 
 		$temp_array = array();
7983 7983
7984 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
7984 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
7985 7985 
 		{
7986 7986 
 			$temp_array['date_name'] = $row['date_name'];
7987 7987 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -8002,7 +8002,7 @@  discard block
 
 block discarded – undo
8002 8002 
 	public function countAllDatesLastMonthByAirlines($filters = array())
8003 8003 
 	{
8004 8004 
 		global $globalTimezone, $globalDBdriver;
8005 
-		$filter_query = $this->getFilter($filters,true,true);
8005 
+		$filter_query = $this->getFilter($filters, true, true);
8006 8006 
 		if ($globalTimezone != '') {
8007 8007 
 			date_default_timezone_set($globalTimezone);
8008 8008 
 			$datetime = new DateTime();
 
@@ -8010,13 +8010,13 @@  discard block
 
 block discarded – undo
8010 8010 
 		} else $offset = '+00:00';
8011 8011
8012 8012 
 		if ($globalDBdriver == 'mysql') {
8013 
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
8013 
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
8014 8014 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)
8015 8015 
 								GROUP BY spotter_output.airline_icao, date_name
8016 8016 
 								ORDER BY spotter_output.date ASC";
8017 8017 
 			$query_data = array(':offset' => $offset);
8018 8018 
 		} else {
8019 
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
8019 
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
8020 8020 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS'
8021 8021 
 								GROUP BY spotter_output.airline_icao, date_name
8022 8022 
 								ORDER BY date_name ASC";
 
@@ -8029,7 +8029,7 @@  discard block
 
 block discarded – undo
8029 8029 
 		$date_array = array();
8030 8030 
 		$temp_array = array();
8031 8031
8032 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8032 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8033 8033 
 		{
8034 8034 
 			$temp_array['date_name'] = $row['date_name'];
8035 8035 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -8076,7 +8076,7 @@  discard block
 
 block discarded – undo
8076 8076 
 		$date_array = array();
8077 8077 
 		$temp_array = array();
8078 8078
8079 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8079 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8080 8080 
 		{
8081 8081 
 			$temp_array['month_name'] = $row['month_name'];
8082 8082 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8097,7 +8097,7 @@  discard block
 
 block discarded – undo
8097 8097 
 	public function countAllMonthsByAirlines($filters = array())
8098 8098 
 	{
8099 8099 
 		global $globalTimezone, $globalDBdriver;
8100 
-		$filter_query = $this->getFilter($filters,true,true);
8100 
+		$filter_query = $this->getFilter($filters, true, true);
8101 8101 
 		if ($globalTimezone != '') {
8102 8102 
 			date_default_timezone_set($globalTimezone);
8103 8103 
 			$datetime = new DateTime();
 
@@ -8105,12 +8105,12 @@  discard block
 
 block discarded – undo
8105 8105 
 		} else $offset = '+00:00';
8106 8106
8107 8107 
 		if ($globalDBdriver == 'mysql') {
8108 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8108 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8109 8109 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8110 8110 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8111 8111 
 								ORDER BY date_count DESC";
8112 8112 
 		} else {
8113 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8113 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8114 8114 
 								FROM spotter_output
8115 8115 
 								WHERE spotter_output.airline_icao <> ''
8116 8116 
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
@@ -8124,7 +8124,7 @@  discard block
 
 block discarded – undo
8124 8124 
 		$date_array = array();
8125 8125 
 		$temp_array = array();
8126 8126
8127 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8127 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8128 8128 
 		{
8129 8129 
 			$temp_array['month_name'] = $row['month_name'];
8130 8130 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8151,14 +8151,14 @@  discard block
 
 block discarded – undo
8151 8151 
 			$datetime = new DateTime();
8152 8152 
 			$offset = $datetime->format('P');
8153 8153 
 		} else $offset = '+00:00';
8154 
-		$filter_query = $this->getFilter($filters,true,true);
8154 
+		$filter_query = $this->getFilter($filters, true, true);
8155 8155 
 		if ($globalDBdriver == 'mysql') {
8156 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8156 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
8157 8157 
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8158 8158 
 								GROUP BY year_name, month_name
8159 8159 
 								ORDER BY date_count DESC";
8160 8160 
 		} else {
8161 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8161 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
8162 8162 
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
8163 8163 
 								GROUP BY year_name, month_name
8164 8164 
 								ORDER BY date_count DESC";
 
@@ -8170,7 +8170,7 @@  discard block
 
 block discarded – undo
8170 8170 
 		$date_array = array();
8171 8171 
 		$temp_array = array();
8172 8172
8173 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8173 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8174 8174 
 		{
8175 8175 
 			$temp_array['month_name'] = $row['month_name'];
8176 8176 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8196,15 +8196,15 @@  discard block
 
 block discarded – undo
8196 8196 
 			$datetime = new DateTime();
8197 8197 
 			$offset = $datetime->format('P');
8198 8198 
 		} else $offset = '+00:00';
8199 
-		$filter_query = $this->getFilter($filters,true,true);
8199 
+		$filter_query = $this->getFilter($filters, true, true);
8200 8200
8201 8201 
 		if ($globalDBdriver == 'mysql') {
8202 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8202 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8203 8203 
 								FROM spotter_output".$filter_query." owner_name <> ''
8204 8204 
 								GROUP BY year_name, month_name
8205 8205 
 								ORDER BY date_count DESC";
8206 8206 
 		} else {
8207 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8207 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8208 8208 
 								FROM spotter_output".$filter_query." owner_name <> ''
8209 8209 
 								GROUP BY year_name, month_name
8210 8210 
 								ORDER BY date_count DESC";
 
@@ -8216,7 +8216,7 @@  discard block
 
 block discarded – undo
8216 8216 
 		$date_array = array();
8217 8217 
 		$temp_array = array();
8218 8218
8219 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8219 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8220 8220 
 		{
8221 8221 
 			$temp_array['month_name'] = $row['month_name'];
8222 8222 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8237,7 +8237,7 @@  discard block
 
 block discarded – undo
8237 8237 
 	public function countAllMonthsOwnersByAirlines($filters = array())
8238 8238 
 	{
8239 8239 
 		global $globalTimezone, $globalDBdriver;
8240 
-		$filter_query = $this->getFilter($filters,true,true);
8240 
+		$filter_query = $this->getFilter($filters, true, true);
8241 8241 
 		if ($globalTimezone != '') {
8242 8242 
 			date_default_timezone_set($globalTimezone);
8243 8243 
 			$datetime = new DateTime();
 
@@ -8245,12 +8245,12 @@  discard block
 
 block discarded – undo
8245 8245 
 		} else $offset = '+00:00';
8246 8246
8247 8247 
 		if ($globalDBdriver == 'mysql') {
8248 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8248 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
8249 8249 
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> ''
8250 8250 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8251 8251 
 								ORDER BY date_count DESC";
8252 8252 
 		} else {
8253 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8253 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
8254 8254 
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> ''
8255 8255 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8256 8256 
 								ORDER BY date_count DESC";
 
@@ -8262,7 +8262,7 @@  discard block
 
 block discarded – undo
8262 8262 
 		$date_array = array();
8263 8263 
 		$temp_array = array();
8264 8264
8265 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8265 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8266 8266 
 		{
8267 8267 
 			$temp_array['month_name'] = $row['month_name'];
8268 8268 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8289,15 +8289,15 @@  discard block
 
 block discarded – undo
8289 8289 
 			$datetime = new DateTime();
8290 8290 
 			$offset = $datetime->format('P');
8291 8291 
 		} else $offset = '+00:00';
8292 
-		$filter_query = $this->getFilter($filters,true,true);
8292 
+		$filter_query = $this->getFilter($filters, true, true);
8293 8293
8294 8294 
 		if ($globalDBdriver == 'mysql') {
8295 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8295 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8296 8296 
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8297 8297 
 								GROUP BY year_name, month_name
8298 8298 
 								ORDER BY date_count DESC";
8299 8299 
 		} else {
8300 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8300 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8301 8301 
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
8302 8302 
 								GROUP BY year_name, month_name
8303 8303 
 								ORDER BY date_count DESC";
 
@@ -8309,7 +8309,7 @@  discard block
 
 block discarded – undo
8309 8309 
 		$date_array = array();
8310 8310 
 		$temp_array = array();
8311 8311
8312 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8312 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8313 8313 
 		{
8314 8314 
 			$temp_array['month_name'] = $row['month_name'];
8315 8315 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8330,7 +8330,7 @@  discard block
 
 block discarded – undo
8330 8330 
 	public function countAllMonthsPilotsByAirlines($filters = array())
8331 8331 
 	{
8332 8332 
 		global $globalTimezone, $globalDBdriver;
8333 
-		$filter_query = $this->getFilter($filters,true,true);
8333 
+		$filter_query = $this->getFilter($filters, true, true);
8334 8334 
 		if ($globalTimezone != '') {
8335 8335 
 			date_default_timezone_set($globalTimezone);
8336 8336 
 			$datetime = new DateTime();
 
@@ -8338,12 +8338,12 @@  discard block
 
 block discarded – undo
8338 8338 
 		} else $offset = '+00:00';
8339 8339
8340 8340 
 		if ($globalDBdriver == 'mysql') {
8341 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8341 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
8342 8342 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8343 8343 
 								GROUP BY spotter_output.airline_icao,year_name, month_name
8344 8344 
 								ORDER BY date_count DESC";
8345 8345 
 		} else {
8346 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8346 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
8347 8347 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
8348 8348 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8349 8349 
 								ORDER BY date_count DESC";
 
@@ -8355,7 +8355,7 @@  discard block
 
 block discarded – undo
8355 8355 
 		$date_array = array();
8356 8356 
 		$temp_array = array();
8357 8357
8358 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8358 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8359 8359 
 		{
8360 8360 
 			$temp_array['month_name'] = $row['month_name'];
8361 8361 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8377,7 +8377,7 @@  discard block
 
 block discarded – undo
8377 8377 
 	public function countAllMonthsAirlines($filters = array())
8378 8378 
 	{
8379 8379 
 		global $globalTimezone, $globalDBdriver;
8380 
-		$filter_query = $this->getFilter($filters,true,true);
8380 
+		$filter_query = $this->getFilter($filters, true, true);
8381 8381 
 		if ($globalTimezone != '') {
8382 8382 
 			date_default_timezone_set($globalTimezone);
8383 8383 
 			$datetime = new DateTime();
 
@@ -8385,12 +8385,12 @@  discard block
 
 block discarded – undo
8385 8385 
 		} else $offset = '+00:00';
8386 8386
8387 8387 
 		if ($globalDBdriver == 'mysql') {
8388 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8388 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
8389 8389 
 								FROM spotter_output".$filter_query." airline_icao <> ''
8390 8390 
 								GROUP BY year_name, month_name
8391 8391 
 								ORDER BY date_count DESC";
8392 8392 
 		} else {
8393 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8393 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
8394 8394 
 								FROM spotter_output".$filter_query." airline_icao <> ''
8395 8395 
 								GROUP BY year_name, month_name
8396 8396 
 								ORDER BY date_count DESC";
 
@@ -8402,7 +8402,7 @@  discard block
 
 block discarded – undo
8402 8402 
 		$date_array = array();
8403 8403 
 		$temp_array = array();
8404 8404
8405 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8405 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8406 8406 
 		{
8407 8407 
 			$temp_array['month_name'] = $row['month_name'];
8408 8408 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8428,15 +8428,15 @@  discard block
 
 block discarded – undo
8428 8428 
 			$datetime = new DateTime();
8429 8429 
 			$offset = $datetime->format('P');
8430 8430 
 		} else $offset = '+00:00';
8431 
-		$filter_query = $this->getFilter($filters,true,true);
8431 
+		$filter_query = $this->getFilter($filters, true, true);
8432 8432
8433 8433 
 		if ($globalDBdriver == 'mysql') {
8434 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8434 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8435 8435 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''
8436 8436 
 								GROUP BY year_name, month_name
8437 8437 
 								ORDER BY date_count DESC";
8438 8438 
 		} else {
8439 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8439 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8440 8440 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''
8441 8441 
 								GROUP BY year_name, month_name
8442 8442 
 								ORDER BY date_count DESC";
 
@@ -8448,7 +8448,7 @@  discard block
 
 block discarded – undo
8448 8448 
 		$date_array = array();
8449 8449 
 		$temp_array = array();
8450 8450
8451 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8451 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8452 8452 
 		{
8453 8453 
 			$temp_array['month_name'] = $row['month_name'];
8454 8454 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8470,7 +8470,7 @@  discard block
 
 block discarded – undo
8470 8470 
 	public function countAllMonthsAircraftsByAirlines($filters = array())
8471 8471 
 	{
8472 8472 
 		global $globalTimezone, $globalDBdriver;
8473 
-		$filter_query = $this->getFilter($filters,true,true);
8473 
+		$filter_query = $this->getFilter($filters, true, true);
8474 8474 
 		if ($globalTimezone != '') {
8475 8475 
 			date_default_timezone_set($globalTimezone);
8476 8476 
 			$datetime = new DateTime();
 
@@ -8478,12 +8478,12 @@  discard block
 
 block discarded – undo
8478 8478 
 		} else $offset = '+00:00';
8479 8479
8480 8480 
 		if ($globalDBdriver == 'mysql') {
8481 
-			$query  = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8481 
+			$query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
8482 8482 
 								FROM spotter_output".$filter_query." aircraft_icao <> ''  AND spotter_output.airline_icao <> ''
8483 8483 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8484 8484 
 								ORDER BY date_count DESC";
8485 8485 
 		} else {
8486 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8486 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
8487 8487 
 								FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> ''
8488 8488 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8489 8489 
 								ORDER BY date_count DESC";
 
@@ -8495,7 +8495,7 @@  discard block
 
 block discarded – undo
8495 8495 
 		$date_array = array();
8496 8496 
 		$temp_array = array();
8497 8497
8498 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8498 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8499 8499 
 		{
8500 8500 
 			$temp_array['month_name'] = $row['month_name'];
8501 8501 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8522,15 +8522,15 @@  discard block
 
 block discarded – undo
8522 8522 
 			$datetime = new DateTime();
8523 8523 
 			$offset = $datetime->format('P');
8524 8524 
 		} else $offset = '+00:00';
8525 
-		$filter_query = $this->getFilter($filters,true,true);
8525 
+		$filter_query = $this->getFilter($filters, true, true);
8526 8526
8527 8527 
 		if ($globalDBdriver == 'mysql') {
8528 
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8528 
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8529 8529 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> ''
8530 8530 
 								GROUP BY year_name, month_name
8531 8531 
 								ORDER BY date_count DESC";
8532 8532 
 		} else {
8533 
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8533 
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8534 8534 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> ''
8535 8535 
 								GROUP BY year_name, month_name
8536 8536 
 								ORDER BY date_count DESC";
 
@@ -8542,7 +8542,7 @@  discard block
 
 block discarded – undo
8542 8542 
 		$date_array = array();
8543 8543 
 		$temp_array = array();
8544 8544
8545 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8545 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8546 8546 
 		{
8547 8547 
 			$temp_array['month_name'] = $row['month_name'];
8548 8548 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8564,7 +8564,7 @@  discard block
 
 block discarded – undo
8564 8564 
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
8565 8565 
 	{
8566 8566 
 		global $globalTimezone, $globalDBdriver;
8567 
-		$filter_query = $this->getFilter($filters,true,true);
8567 
+		$filter_query = $this->getFilter($filters, true, true);
8568 8568 
 		if ($globalTimezone != '') {
8569 8569 
 			date_default_timezone_set($globalTimezone);
8570 8570 
 			$datetime = new DateTime();
 
@@ -8572,12 +8572,12 @@  discard block
 
 block discarded – undo
8572 8572 
 		} else $offset = '+00:00';
8573 8573
8574 8574 
 		if ($globalDBdriver == 'mysql') {
8575 
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8575 
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
8576 8576 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> ''
8577 8577 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8578 8578 
 								ORDER BY date_count DESC";
8579 8579 
 		} else {
8580 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8580 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
8581 8581 
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> ''
8582 8582 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
8583 8583 
 								ORDER BY date_count DESC";
 
@@ -8589,7 +8589,7 @@  discard block
 
 block discarded – undo
8589 8589 
 		$date_array = array();
8590 8590 
 		$temp_array = array();
8591 8591
8592 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8592 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8593 8593 
 		{
8594 8594 
 			$temp_array['month_name'] = $row['month_name'];
8595 8595 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -8617,7 +8617,7 @@  discard block
 
 block discarded – undo
8617 8617 
 			$datetime = new DateTime();
8618 8618 
 			$offset = $datetime->format('P');
8619 8619 
 		} else $offset = '+00:00';
8620 
-		$filter_query = $this->getFilter($filters,true,true);
8620 
+		$filter_query = $this->getFilter($filters, true, true);
8621 8621 
 		if ($globalDBdriver == 'mysql') {
8622 8622 
 			$query  = "SELECT MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
8623 8623 
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -8638,7 +8638,7 @@  discard block
 
 block discarded – undo
8638 8638 
 		$date_array = array();
8639 8639 
 		$temp_array = array();
8640 8640
8641 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8641 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8642 8642 
 		{
8643 8643 
 			$temp_array['year_name'] = $row['year_name'];
8644 8644 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -8658,7 +8658,7 @@  discard block
 
 block discarded – undo
8658 8658 
 	* @return Array the hour list
8659 8659 
 	*
8660 8660 
 	*/
8661 
-	public function countAllHours($orderby,$filters = array())
8661 
+	public function countAllHours($orderby, $filters = array())
8662 8662 
 	{
8663 8663 
 		global $globalTimezone, $globalDBdriver;
8664 8664 
 		if ($globalTimezone != '') {
 
@@ -8706,7 +8706,7 @@  discard block
 
 block discarded – undo
8706 8706 
 		$hour_array = array();
8707 8707 
 		$temp_array = array();
8708 8708
8709 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8709 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8710 8710 
 		{
8711 8711 
 			$temp_array['hour_name'] = $row['hour_name'];
8712 8712 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8726,7 +8726,7 @@  discard block
 
 block discarded – undo
8726 8726 
 	public function countAllHoursByAirlines($orderby, $filters = array())
8727 8727 
 	{
8728 8728 
 		global $globalTimezone, $globalDBdriver;
8729 
-		$filter_query = $this->getFilter($filters,true,true);
8729 
+		$filter_query = $this->getFilter($filters, true, true);
8730 8730 
 		if ($globalTimezone != '') {
8731 8731 
 			date_default_timezone_set($globalTimezone);
8732 8732 
 			$datetime = new DateTime();
 
@@ -8744,7 +8744,7 @@  discard block
 
 block discarded – undo
8744 8744 
 		}
8745 8745
8746 8746 
 		if ($globalDBdriver == 'mysql') {
8747 
-			$query  = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8747 
+			$query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8748 8748 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8749 8749 
 								GROUP BY spotter_output.airline_icao, hour_name
8750 8750 
 								".$orderby_sql;
 
@@ -8757,7 +8757,7 @@  discard block
 
 block discarded – undo
8757 8757 
   */
8758 8758 
 		$query_data = array(':offset' => $offset);
8759 8759 
 		} else {
8760 
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8760 
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8761 8761 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> ''
8762 8762 
 								GROUP BY spotter_output.airline_icao, hour_name
8763 8763 
 								".$orderby_sql;
 
@@ -8770,7 +8770,7 @@  discard block
 
 block discarded – undo
8770 8770 
 		$hour_array = array();
8771 8771 
 		$temp_array = array();
8772 8772
8773 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8773 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8774 8774 
 		{
8775 8775 
 			$temp_array['hour_name'] = $row['hour_name'];
8776 8776 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8793,34 +8793,34 @@  discard block
 
 block discarded – undo
8793 8793 
 	public function countAllHoursByAirline($airline_icao, $filters = array())
8794 8794 
 	{
8795 8795 
 		global $globalTimezone, $globalDBdriver;
8796 
-		$filter_query = $this->getFilter($filters,true,true);
8796 
+		$filter_query = $this->getFilter($filters, true, true);
8797 8797 
 		if ($globalTimezone != '') {
8798 8798 
 			date_default_timezone_set($globalTimezone);
8799 8799 
 			$datetime = new DateTime();
8800 8800 
 			$offset = $datetime->format('P');
8801 8801 
 		} else $offset = '+00:00';
8802 8802
8803 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
8803 
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
8804 8804
8805 8805 
 		if ($globalDBdriver == 'mysql') {
8806 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8806 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8807 8807 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8808 8808 
 								GROUP BY hour_name
8809 8809 
 								ORDER BY hour_name ASC";
8810 8810 
 		} else {
8811 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8811 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8812 8812 
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
8813 8813 
 								GROUP BY hour_name
8814 8814 
 								ORDER BY hour_name ASC";
8815 8815 
 		}
8816 8816
8817 8817 
 		$sth = $this->db->prepare($query);
8818 
-		$sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset));
8818 
+		$sth->execute(array(':airline_icao' => $airline_icao, ':offset' => $offset));
8819 8819
8820 8820 
 		$hour_array = array();
8821 8821 
 		$temp_array = array();
8822 8822
8823 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8823 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8824 8824 
 		{
8825 8825 
 			$temp_array['hour_name'] = $row['hour_name'];
8826 8826 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8843,8 +8843,8 @@  discard block
 
 block discarded – undo
8843 8843 
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
8844 8844 
 	{
8845 8845 
 		global $globalTimezone, $globalDBdriver;
8846 
-		$filter_query = $this->getFilter($filters,true,true);
8847 
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
8846 
+		$filter_query = $this->getFilter($filters, true, true);
8847 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
8848 8848 
 		if ($globalTimezone != '') {
8849 8849 
 			date_default_timezone_set($globalTimezone);
8850 8850 
 			$datetime = new DateTime();
 
@@ -8852,24 +8852,24 @@  discard block
 
 block discarded – undo
8852 8852 
 		} else $offset = '+00:00';
8853 8853
8854 8854 
 		if ($globalDBdriver == 'mysql') {
8855 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8855 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8856 8856 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8857 8857 
 								GROUP BY hour_name
8858 8858 
 								ORDER BY hour_name ASC";
8859 8859 
 		} else {
8860 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8860 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8861 8861 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
8862 8862 
 								GROUP BY hour_name
8863 8863 
 								ORDER BY hour_name ASC";
8864 8864 
 		}
8865 8865
8866 8866 
 		$sth = $this->db->prepare($query);
8867 
-		$sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset));
8867 
+		$sth->execute(array(':aircraft_icao' => $aircraft_icao, ':offset' => $offset));
8868 8868
8869 8869 
 		$hour_array = array();
8870 8870 
 		$temp_array = array();
8871 8871
8872 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8872 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8873 8873 
 		{
8874 8874 
 			$temp_array['hour_name'] = $row['hour_name'];
8875 8875 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8890,8 +8890,8 @@  discard block
 
 block discarded – undo
8890 8890 
 	public function countAllHoursByRegistration($registration, $filters = array())
8891 8891 
 	{
8892 8892 
 		global $globalTimezone, $globalDBdriver;
8893 
-		$filter_query = $this->getFilter($filters,true,true);
8894 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
8893 
+		$filter_query = $this->getFilter($filters, true, true);
8894 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
8895 8895 
 		if ($globalTimezone != '') {
8896 8896 
 			date_default_timezone_set($globalTimezone);
8897 8897 
 			$datetime = new DateTime();
 
@@ -8899,24 +8899,24 @@  discard block
 
 block discarded – undo
8899 8899 
 		} else $offset = '+00:00';
8900 8900
8901 8901 
 		if ($globalDBdriver == 'mysql') {
8902 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8902 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8903 8903 
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8904 8904 
 								GROUP BY hour_name
8905 8905 
 								ORDER BY hour_name ASC";
8906 8906 
 		} else {
8907 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8907 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8908 8908 
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
8909 8909 
 								GROUP BY hour_name
8910 8910 
 								ORDER BY hour_name ASC";
8911 8911 
 		}
8912 8912
8913 8913 
 		$sth = $this->db->prepare($query);
8914 
-		$sth->execute(array(':registration' => $registration,':offset' => $offset));
8914 
+		$sth->execute(array(':registration' => $registration, ':offset' => $offset));
8915 8915
8916 8916 
 		$hour_array = array();
8917 8917 
 		$temp_array = array();
8918 8918
8919 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8919 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8920 8920 
 		{
8921 8921 
 			$temp_array['hour_name'] = $row['hour_name'];
8922 8922 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8937,8 +8937,8 @@  discard block
 
 block discarded – undo
8937 8937 
 	public function countAllHoursByAirport($airport_icao, $filters = array())
8938 8938 
 	{
8939 8939 
 		global $globalTimezone, $globalDBdriver;
8940 
-		$filter_query = $this->getFilter($filters,true,true);
8941 
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
8940 
+		$filter_query = $this->getFilter($filters, true, true);
8941 
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
8942 8942 
 		if ($globalTimezone != '') {
8943 8943 
 			date_default_timezone_set($globalTimezone);
8944 8944 
 			$datetime = new DateTime();
 
@@ -8946,24 +8946,24 @@  discard block
 
 block discarded – undo
8946 8946 
 		} else $offset = '+00:00';
8947 8947
8948 8948 
 		if ($globalDBdriver == 'mysql') {
8949 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8949 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8950 8950 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8951 8951 
 								GROUP BY hour_name
8952 8952 
 								ORDER BY hour_name ASC";
8953 8953 
 		} else {
8954 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8954 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
8955 8955 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
8956 8956 
 								GROUP BY hour_name
8957 8957 
 								ORDER BY hour_name ASC";
8958 8958 
 		}
8959 8959
8960 8960 
 		$sth = $this->db->prepare($query);
8961 
-		$sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset));
8961 
+		$sth->execute(array(':airport_icao' => $airport_icao, ':offset' => $offset));
8962 8962
8963 8963 
 		$hour_array = array();
8964 8964 
 		$temp_array = array();
8965 8965
8966 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
8966 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
8967 8967 
 		{
8968 8968 
 			$temp_array['hour_name'] = $row['hour_name'];
8969 8969 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -8982,11 +8982,11 @@  discard block
 
 block discarded – undo
8982 8982 
 	* @return Array the hour list
8983 8983 
 	*
8984 8984 
 	*/
8985 
-	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
8985 
+	public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array())
8986 8986 
 	{
8987 8987 
 		global $globalTimezone, $globalDBdriver;
8988 
-		$filter_query = $this->getFilter($filters,true,true);
8989 
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
8988 
+		$filter_query = $this->getFilter($filters, true, true);
8989 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
8990 8990 
 		if ($globalTimezone != '') {
8991 8991 
 			date_default_timezone_set($globalTimezone);
8992 8992 
 			$datetime = new DateTime();
 
@@ -8994,24 +8994,24 @@  discard block
 
 block discarded – undo
8994 8994 
 		} else $offset = '+00:00';
8995 8995
8996 8996 
 		if ($globalDBdriver == 'mysql') {
8997 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8997 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
8998 8998 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
8999 8999 
 								GROUP BY hour_name
9000 9000 
 								ORDER BY hour_name ASC";
9001 9001 
 		} else {
9002 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9002 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9003 9003 
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
9004 9004 
 								GROUP BY hour_name
9005 9005 
 								ORDER BY hour_name ASC";
9006 9006 
 		}
9007 9007
9008 9008 
 		$sth = $this->db->prepare($query);
9009 
-		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset));
9009 
+		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':offset' => $offset));
9010 9010
9011 9011 
 		$hour_array = array();
9012 9012 
 		$temp_array = array();
9013 9013
9014 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9014 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9015 9015 
 		{
9016 9016 
 			$temp_array['hour_name'] = $row['hour_name'];
9017 9017 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9033,8 +9033,8 @@  discard block
 
 block discarded – undo
9033 9033 
 	public function countAllHoursByDate($date, $filters = array())
9034 9034 
 	{
9035 9035 
 		global $globalTimezone, $globalDBdriver;
9036 
-		$filter_query = $this->getFilter($filters,true,true);
9037 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
9036 
+		$filter_query = $this->getFilter($filters, true, true);
9037 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
9038 9038 
 		if ($globalTimezone != '') {
9039 9039 
 			date_default_timezone_set($globalTimezone);
9040 9040 
 			$datetime = new DateTime($date);
 
@@ -9042,12 +9042,12 @@  discard block
 
 block discarded – undo
9042 9042 
 		} else $offset = '+00:00';
9043 9043
9044 9044 
 		if ($globalDBdriver == 'mysql') {
9045 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9045 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9046 9046 
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
9047 9047 
 								GROUP BY hour_name
9048 9048 
 								ORDER BY hour_name ASC";
9049 9049 
 		} else {
9050 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9050 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9051 9051 
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
9052 9052 
 								GROUP BY hour_name
9053 9053 
 								ORDER BY hour_name ASC";
 
@@ -9059,7 +9059,7 @@  discard block
 
 block discarded – undo
9059 9059 
 		$hour_array = array();
9060 9060 
 		$temp_array = array();
9061 9061
9062 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9062 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9063 9063 
 		{
9064 9064 
 			$temp_array['hour_name'] = $row['hour_name'];
9065 9065 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9081,8 +9081,8 @@  discard block
 
 block discarded – undo
9081 9081 
 	public function countAllHoursByIdent($ident, $filters = array())
9082 9082 
 	{
9083 9083 
 		global $globalTimezone, $globalDBdriver;
9084 
-		$filter_query = $this->getFilter($filters,true,true);
9085 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
9084 
+		$filter_query = $this->getFilter($filters, true, true);
9085 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
9086 9086 
 		if ($globalTimezone != '') {
9087 9087 
 			date_default_timezone_set($globalTimezone);
9088 9088 
 			$datetime = new DateTime();
 
@@ -9090,12 +9090,12 @@  discard block
 
 block discarded – undo
9090 9090 
 		} else $offset = '+00:00';
9091 9091
9092 9092 
 		if ($globalDBdriver == 'mysql') {
9093 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9093 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9094 9094 
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident
9095 9095 
 								GROUP BY hour_name
9096 9096 
 								ORDER BY hour_name ASC";
9097 9097 
 		} else {
9098 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9098 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9099 9099 
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident
9100 9100 
 								GROUP BY hour_name
9101 9101 
 								ORDER BY hour_name ASC";
 
@@ -9103,12 +9103,12 @@  discard block
 
 block discarded – undo
9103 9103
9104 9104
9105 9105 
 		$sth = $this->db->prepare($query);
9106 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
9106 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
9107 9107
9108 9108 
 		$hour_array = array();
9109 9109 
 		$temp_array = array();
9110 9110
9111 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9111 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9112 9112 
 		{
9113 9113 
 			$temp_array['hour_name'] = $row['hour_name'];
9114 9114 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9127,12 +9127,12 @@  discard block
 
 block discarded – undo
9127 9127 
 	* @return Array the hour list
9128 9128 
 	*
9129 9129 
 	*/
9130 
-	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
9130 
+	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
9131 9131 
 	{
9132 9132 
 		global $globalTimezone, $globalDBdriver;
9133 
-		$filter_query = $this->getFilter($filters,true,true);
9134 
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
9135 
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
9133 
+		$filter_query = $this->getFilter($filters, true, true);
9134 
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
9135 
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
9136 9136 
 		if ($globalTimezone != '') {
9137 9137 
 			date_default_timezone_set($globalTimezone);
9138 9138 
 			$datetime = new DateTime();
 
@@ -9140,24 +9140,24 @@  discard block
 
 block discarded – undo
9140 9140 
 		} else $offset = '+00:00';
9141 9141
9142 9142 
 		if ($globalDBdriver == 'mysql') {
9143 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9143 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9144 9144 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9145 9145 
 								GROUP BY hour_name
9146 9146 
 								ORDER BY hour_name ASC";
9147 9147 
 		} else {
9148 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9148 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9149 9149 
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
9150 9150 
 								GROUP BY hour_name
9151 9151 
 								ORDER BY hour_name ASC";
9152 9152 
 		}
9153 9153
9154 9154 
 		$sth = $this->db->prepare($query);
9155 
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset));
9155 
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':offset' => $offset));
9156 9156
9157 9157 
 		$hour_array = array();
9158 9158 
 		$temp_array = array();
9159 9159
9160 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9160 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9161 9161 
 		{
9162 9162 
 			$temp_array['hour_name'] = $row['hour_name'];
9163 9163 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9178,8 +9178,8 @@  discard block
 
 block discarded – undo
9178 9178 
 	public function countAllHoursByCountry($country, $filters = array())
9179 9179 
 	{
9180 9180 
 		global $globalTimezone, $globalDBdriver;
9181 
-		$filter_query = $this->getFilter($filters,true,true);
9182 
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
9181 
+		$filter_query = $this->getFilter($filters, true, true);
9182 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
9183 9183 
 		if ($globalTimezone != '') {
9184 9184 
 			date_default_timezone_set($globalTimezone);
9185 9185 
 			$datetime = new DateTime();
 
@@ -9187,24 +9187,24 @@  discard block
 
 block discarded – undo
9187 9187 
 		} else $offset = '+00:00';
9188 9188
9189 9189 
 		if ($globalDBdriver == 'mysql') {
9190 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9190 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9191 9191 
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9192 9192 
 								GROUP BY hour_name
9193 9193 
 								ORDER BY hour_name ASC";
9194 9194 
 		} else {
9195 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9195 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9196 9196 
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
9197 9197 
 								GROUP BY hour_name
9198 9198 
 								ORDER BY hour_name ASC";
9199 9199 
 		}
9200 9200
9201 9201 
 		$sth = $this->db->prepare($query);
9202 
-		$sth->execute(array(':country' => $country,':offset' => $offset));
9202 
+		$sth->execute(array(':country' => $country, ':offset' => $offset));
9203 9203
9204 9204 
 		$hour_array = array();
9205 9205 
 		$temp_array = array();
9206 9206
9207 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9207 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9208 9208 
 		{
9209 9209 
 			$temp_array['hour_name'] = $row['hour_name'];
9210 9210 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9226,8 +9226,8 @@  discard block
 
 block discarded – undo
9226 9226 
 	*/
9227 9227 
 	public function countOverallAircrafts($filters = array())
9228 9228 
 	{
9229 
-		$filter_query = $this->getFilter($filters,true,true);
9230 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count
9229 
+		$filter_query = $this->getFilter($filters, true, true);
9230 
+		$query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count
9231 9231 
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
9232 9232 
 		$sth = $this->db->prepare($query);
9233 9233 
 		$sth->execute();
 
@@ -9242,8 +9242,8 @@  discard block
 
 block discarded – undo
9242 9242 
 	*/
9243 9243 
 	public function countOverallArrival($filters = array())
9244 9244 
 	{
9245 
-		$filter_query = $this->getFilter($filters,true,true);
9246 
-		$query  = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count
9245 
+		$filter_query = $this->getFilter($filters, true, true);
9246 
+		$query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count
9247 9247 
                     FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''";
9248 9248
9249 9249 
 		$sth = $this->db->prepare($query);
 
@@ -9259,8 +9259,8 @@  discard block
 
 block discarded – undo
9259 9259 
 	*/
9260 9260 
 	public function countOverallPilots($filters = array())
9261 9261 
 	{
9262 
-		$filter_query = $this->getFilter($filters,true,true);
9263 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count
9262 
+		$filter_query = $this->getFilter($filters, true, true);
9263 
+		$query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count
9264 9264 
                     FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''";
9265 9265 
 		$sth = $this->db->prepare($query);
9266 9266 
 		$sth->execute();
 
@@ -9275,8 +9275,8 @@  discard block
 
 block discarded – undo
9275 9275 
 	*/
9276 9276 
 	public function countOverallOwners($filters = array())
9277 9277 
 	{
9278 
-		$filter_query = $this->getFilter($filters,true,true);
9279 
-		$query  = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count
9278 
+		$filter_query = $this->getFilter($filters, true, true);
9279 
+		$query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count
9280 9280 
                     FROM spotter_output".$filter_query." spotter_output.owner_name <> ''";
9281 9281 
 		$sth = $this->db->prepare($query);
9282 9282 
 		$sth->execute();
 
@@ -9309,8 +9309,8 @@  discard block
 
 block discarded – undo
9309 9309 
 	*/
9310 9310 
 	public function countOverallMilitaryFlights($filters = array())
9311 9311 
 	{
9312 
-		$filter_query = $this->getFilter($filters,true,true);
9313 
-		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count
9312 
+		$filter_query = $this->getFilter($filters, true, true);
9313 
+		$query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count
9314 9314 
                     FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'";
9315 9315
9316 9316 
 		$sth = $this->db->prepare($query);
 
@@ -9347,7 +9347,7 @@  discard block
 
 block discarded – undo
9347 9347 
 	public function countAllHoursFromToday($filters = array())
9348 9348 
 	{
9349 9349 
 		global $globalTimezone, $globalDBdriver;
9350 
-		$filter_query = $this->getFilter($filters,true,true);
9350 
+		$filter_query = $this->getFilter($filters, true, true);
9351 9351 
 		if ($globalTimezone != '') {
9352 9352 
 			date_default_timezone_set($globalTimezone);
9353 9353 
 			$datetime = new DateTime();
 
@@ -9355,12 +9355,12 @@  discard block
 
 block discarded – undo
9355 9355 
 		} else $offset = '+00:00';
9356 9356
9357 9357 
 		if ($globalDBdriver == 'mysql') {
9358 
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9358 
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
9359 9359 
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE()
9360 9360 
 								GROUP BY hour_name
9361 9361 
 								ORDER BY hour_name ASC";
9362 9362 
 		} else {
9363 
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9363 
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
9364 9364 
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
9365 9365 
 								GROUP BY hour_name
9366 9366 
 								ORDER BY hour_name ASC";
 
@@ -9372,7 +9372,7 @@  discard block
 
 block discarded – undo
9372 9372 
 		$hour_array = array();
9373 9373 
 		$temp_array = array();
9374 9374
9375 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9375 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9376 9376 
 		{
9377 9377 
 			$temp_array['hour_name'] = $row['hour_name'];
9378 9378 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -9391,14 +9391,14 @@  discard block
 
 block discarded – undo
9391 9391 
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
9392 9392 
 	{
9393 9393 
 		global $global_query, $globalDBdriver, $globalTimezone;
9394 
-		$filter_query = $this->getFilter($filters,true,true);
9394 
+		$filter_query = $this->getFilter($filters, true, true);
9395 9395 
 		date_default_timezone_set('UTC');
9396 9396 
 		$limit_query = '';
9397 9397 
 		if ($limit != "")
9398 9398 
 		{
9399 9399 
 			$limit_array = explode(",", $limit);
9400 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
9401 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
9400 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
9401 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
9402 9402 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
9403 9403 
 			{
9404 9404 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 
@@ -9451,7 +9451,7 @@  discard block
 
 block discarded – undo
9451 9451 
 			    GROUP BY spotter_output.ident,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time, to_char(spotter_output.date,'HH')
9452 9452 
 			    HAVING count(spotter_output.ident) > 5$orderby_query";
9453 9453 
 			//echo $query;
9454 
-			$spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone));
9454 
+			$spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone));
9455 9455 
 			/*
9456 9456 
 			$sth = $this->db->prepare($query);
9457 9457 
 			$sth->execute(array(':timezone' => $globalTimezone));
 
@@ -9470,9 +9470,9 @@  discard block
 
 block discarded – undo
9470 9470 
 	*/
9471 9471 
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
9472 9472 
 	{
9473 
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
9473 
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
9474 9474
9475 
-		$query  = "SELECT spotter_output.spotter_id
9475 
+		$query = "SELECT spotter_output.spotter_id
9476 9476 
 								FROM spotter_output
9477 9477 
 								WHERE spotter_output.flightaware_id = '".$flightaware_id."'";
9478 9478 
         
@@ -9480,7 +9480,7 @@  discard block
 
 block discarded – undo
9480 9480 
 		$sth = $this->db->prepare($query);
9481 9481 
 		$sth->execute();
9482 9482
9483 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9483 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9484 9484 
 		{
9485 9485 
 			return $row['spotter_id'];
9486 9486 
 		}
 
@@ -9505,23 +9505,23 @@  discard block
 
 block discarded – undo
9505 9505 
 		}
9506 9506
9507 9507 
 		$current_date = date("Y-m-d H:i:s");
9508 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
9508 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
9509 9509
9510 9510 
 		$diff = abs(strtotime($current_date) - strtotime($date));
9511 9511
9512 
-		$time_array['years'] = floor($diff / (365*60*60*24));
9512 
+		$time_array['years'] = floor($diff/(365*60*60*24));
9513 9513 
 		$years = $time_array['years'];
9514 9514
9515 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
9515 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
9516 9516 
 		$months = $time_array['months'];
9517 9517
9518 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
9518 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
9519 9519 
 		$days = $time_array['days'];
9520 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
9520 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
9521 9521 
 		$hours = $time_array['hours'];
9522 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
9522 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
9523 9523 
 		$minutes = $time_array['minutes'];
9524 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
9524 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
9525 9525
9526 9526 
 		return $time_array;
9527 9527 
 	}	
@@ -9547,63 +9547,63 @@  discard block
 
 block discarded – undo
9547 9547 
 			$temp_array['direction_degree'] = $direction;
9548 9548 
 			$temp_array['direction_shortname'] = "N";
9549 9549 
 			$temp_array['direction_fullname'] = "North";
9550 
-		} elseif ($direction >= 22.5 && $direction < 45){
9550 
+		} elseif ($direction >= 22.5 && $direction < 45) {
9551 9551 
 			$temp_array['direction_degree'] = $direction;
9552 9552 
 			$temp_array['direction_shortname'] = "NNE";
9553 9553 
 			$temp_array['direction_fullname'] = "North-Northeast";
9554 
-		} elseif ($direction >= 45 && $direction < 67.5){
9554 
+		} elseif ($direction >= 45 && $direction < 67.5) {
9555 9555 
 			$temp_array['direction_degree'] = $direction;
9556 9556 
 			$temp_array['direction_shortname'] = "NE";
9557 9557 
 			$temp_array['direction_fullname'] = "Northeast";
9558 
-		} elseif ($direction >= 67.5 && $direction < 90){
9558 
+		} elseif ($direction >= 67.5 && $direction < 90) {
9559 9559 
 			$temp_array['direction_degree'] = $direction;
9560 9560 
 			$temp_array['direction_shortname'] = "ENE";
9561 9561 
 			$temp_array['direction_fullname'] = "East-Northeast";
9562 
-		} elseif ($direction >= 90 && $direction < 112.5){
9562 
+		} elseif ($direction >= 90 && $direction < 112.5) {
9563 9563 
 			$temp_array['direction_degree'] = $direction;
9564 9564 
 			$temp_array['direction_shortname'] = "E";
9565 9565 
 			$temp_array['direction_fullname'] = "East";
9566 
-		} elseif ($direction >= 112.5 && $direction < 135){
9566 
+		} elseif ($direction >= 112.5 && $direction < 135) {
9567 9567 
 			$temp_array['direction_degree'] = $direction;
9568 9568 
 			$temp_array['direction_shortname'] = "ESE";
9569 9569 
 			$temp_array['direction_fullname'] = "East-Southeast";
9570 
-		} elseif ($direction >= 135 && $direction < 157.5){
9570 
+		} elseif ($direction >= 135 && $direction < 157.5) {
9571 9571 
 			$temp_array['direction_degree'] = $direction;
9572 9572 
 			$temp_array['direction_shortname'] = "SE";
9573 9573 
 			$temp_array['direction_fullname'] = "Southeast";
9574 
-		} elseif ($direction >= 157.5 && $direction < 180){
9574 
+		} elseif ($direction >= 157.5 && $direction < 180) {
9575 9575 
 			$temp_array['direction_degree'] = $direction;
9576 9576 
 			$temp_array['direction_shortname'] = "SSE";
9577 9577 
 			$temp_array['direction_fullname'] = "South-Southeast";
9578 
-		} elseif ($direction >= 180 && $direction < 202.5){
9578 
+		} elseif ($direction >= 180 && $direction < 202.5) {
9579 9579 
 			$temp_array['direction_degree'] = $direction;
9580 9580 
 			$temp_array['direction_shortname'] = "S";
9581 9581 
 			$temp_array['direction_fullname'] = "South";
9582 
-		} elseif ($direction >= 202.5 && $direction < 225){
9582 
+		} elseif ($direction >= 202.5 && $direction < 225) {
9583 9583 
 			$temp_array['direction_degree'] = $direction;
9584 9584 
 			$temp_array['direction_shortname'] = "SSW";
9585 9585 
 			$temp_array['direction_fullname'] = "South-Southwest";
9586 
-		} elseif ($direction >= 225 && $direction < 247.5){
9586 
+		} elseif ($direction >= 225 && $direction < 247.5) {
9587 9587 
 			$temp_array['direction_degree'] = $direction;
9588 9588 
 			$temp_array['direction_shortname'] = "SW";
9589 9589 
 			$temp_array['direction_fullname'] = "Southwest";
9590 
-		} elseif ($direction >= 247.5 && $direction < 270){
9590 
+		} elseif ($direction >= 247.5 && $direction < 270) {
9591 9591 
 			$temp_array['direction_degree'] = $direction;
9592 9592 
 			$temp_array['direction_shortname'] = "WSW";
9593 9593 
 			$temp_array['direction_fullname'] = "West-Southwest";
9594 
-		} elseif ($direction >= 270 && $direction < 292.5){
9594 
+		} elseif ($direction >= 270 && $direction < 292.5) {
9595 9595 
 			$temp_array['direction_degree'] = $direction;
9596 9596 
 			$temp_array['direction_shortname'] = "W";
9597 9597 
 			$temp_array['direction_fullname'] = "West";
9598 
-		} elseif ($direction >= 292.5 && $direction < 315){
9598 
+		} elseif ($direction >= 292.5 && $direction < 315) {
9599 9599 
 			$temp_array['direction_degree'] = $direction;
9600 9600 
 			$temp_array['direction_shortname'] = "WNW";
9601 9601 
 			$temp_array['direction_fullname'] = "West-Northwest";
9602 
-		} elseif ($direction >= 315 && $direction < 337.5){
9602 
+		} elseif ($direction >= 315 && $direction < 337.5) {
9603 9603 
 			$temp_array['direction_degree'] = $direction;
9604 9604 
 			$temp_array['direction_shortname'] = "NW";
9605 9605 
 			$temp_array['direction_fullname'] = "Northwest";
9606 
-		} elseif ($direction >= 337.5 && $direction < 360){
9606 
+		} elseif ($direction >= 337.5 && $direction < 360) {
9607 9607 
 			$temp_array['direction_degree'] = $direction;
9608 9608 
 			$temp_array['direction_shortname'] = "NNW";
9609 9609 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -9656,9 +9656,9 @@  discard block
 
 block discarded – undo
9656 9656 
 	*/
9657 9657 
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
9658 9658 
 	{
9659 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9659 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9660 9660
9661 
-		$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9661 
+		$query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9662 9662
9663 9663 
 		$sth = $this->db->prepare($query);
9664 9664 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -9681,9 +9681,9 @@  discard block
 
 block discarded – undo
9681 9681 
 	*/
9682 9682 
 	public function getAircraftTypeBymodeS($aircraft_modes)
9683 9683 
 	{
9684 
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
9684 
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
9685 9685
9686 
-		$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9686 
+		$query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
9687 9687
9688 9688 
 		$sth = $this->db->prepare($query);
9689 9689 
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
 
@@ -9704,11 +9704,11 @@  discard block
 
 block discarded – undo
9704 9704 
 	* @param Float $longitude longitute of the flight
9705 9705 
 	* @return String the countrie
9706 9706 
 	*/
9707 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
9707 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
9708 9708 
 	{
9709 9709 
 		global $globalDBdriver, $globalDebug;
9710 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9711 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
9710 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9711 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
9712 9712
9713 9713 
 		$Connection = new Connection($this->db);
9714 9714 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -9748,7 +9748,7 @@  discard block
 
 block discarded – undo
9748 9748 
 	public function getCountryFromISO2($iso2)
9749 9749 
 	{
9750 9750 
 		global $globalDBdriver, $globalDebug;
9751 
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
9751 
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
9752 9752
9753 9753 
 		$Connection = new Connection($this->db);
9754 9754 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -9780,19 +9780,19 @@  discard block
 
 block discarded – undo
9780 9780 
 	*/
9781 9781 
 	public function convertAircraftRegistration($registration)
9782 9782 
 	{
9783 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9783 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9784 9784 
 		$registration_prefix = '';
9785 9785 
 		$registration_1 = substr($registration, 0, 1);
9786 9786 
 		$registration_2 = substr($registration, 0, 2);
9787 9787
9788 9788 
 		//first get the prefix based on two characters
9789 
-		$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9789 
+		$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
9790 9790
9791 9791
9792 9792 
 		$sth = $this->db->prepare($query);
9793 9793 
 		$sth->execute(array(':registration_2' => $registration_2));
9794 9794
9795 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9795 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9796 9796 
 		{
9797 9797 
 			$registration_prefix = $row['registration_prefix'];
9798 9798 
 		}
 
@@ -9800,11 +9800,11 @@  discard block
 
 block discarded – undo
9800 9800 
 		//if we didn't find a two chracter prefix lets just search the one with one character
9801 9801 
 		if ($registration_prefix == '')
9802 9802 
 		{
9803 
-			$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9803 
+			$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
9804 9804 
 			$sth = $this->db->prepare($query);
9805 9805 
 			$sth->execute(array(':registration_1' => $registration_1));
9806 9806
9807 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9807 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9808 9808 
 			{
9809 9809 
 				$registration_prefix = $row['registration_prefix'];
9810 9810 
 			}
 
@@ -9818,7 +9818,7 @@  discard block
 
 block discarded – undo
9818 9818 
 			} else {
9819 9819 
 				$registration = preg_replace("/^(.{1})/", "$1-", $registration);
9820 9820 
 			}
9821 
-		} else if(strlen($registration_prefix) == 2){
9821 
+		} else if (strlen($registration_prefix) == 2) {
9822 9822 
 			if (0 === strpos($registration, 'N')) {
9823 9823 
 				$registration = preg_replace("/^(.{2})/", "$1", $registration);
9824 9824 
 			} else {
 
@@ -9837,17 +9837,17 @@  discard block
 
 block discarded – undo
9837 9837 
 	*/
9838 9838 
 	public function countryFromAircraftRegistration($registration)
9839 9839 
 	{
9840 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9840 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9841 9841
9842 9842 
 		$registration_prefix = '';
9843 
-		$registration_test = explode('-',$registration);
9843 
+		$registration_test = explode('-', $registration);
9844 9844 
 		$country = '';
9845 9845 
 		if ($registration_test[0] != $registration) {
9846 9846 
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9847 9847
9848 9848 
 			$sth = $this->db->prepare($query);
9849 9849 
 			$sth->execute(array(':registration_1' => $registration_test[0]));
9850 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9850 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9851 9851 
 			{
9852 9852 
 				//$registration_prefix = $row['registration_prefix'];
9853 9853 
 				$country = $row['country'];
 
@@ -9858,13 +9858,13 @@  discard block
 
 block discarded – undo
9858 9858
9859 9859 
 			$country = '';
9860 9860 
 			//first get the prefix based on two characters
9861 
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9861 
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
9862 9862
9863 9863
9864 9864 
 			$sth = $this->db->prepare($query);
9865 9865 
 			$sth->execute(array(':registration_2' => $registration_2));
9866 9866
9867 
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
9867 
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9868 9868 
 			{
9869 9869 
 				$registration_prefix = $row['registration_prefix'];
9870 9870 
 				$country = $row['country'];
 
@@ -9873,12 +9873,12 @@  discard block
 
 block discarded – undo
9873 9873 
 			//if we didn't find a two chracter prefix lets just search the one with one character
9874 9874 
 			if ($registration_prefix == "")
9875 9875 
 			{
9876 
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9876 
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
9877 9877
9878 9878 
 				$sth = $this->db->prepare($query);
9879 9879 
 				$sth->execute(array(':registration_1' => $registration_1));
9880 9880
9881 
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
9881 
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9882 9882 
 				{
9883 9883 
 					//$registration_prefix = $row['registration_prefix'];
9884 9884 
 					$country = $row['country'];
 
@@ -9898,13 +9898,13 @@  discard block
 
 block discarded – undo
9898 9898 
 	*/
9899 9899 
 	public function countryFromAircraftRegistrationCode($registration)
9900 9900 
 	{
9901 
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
9901 
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
9902 9902
9903 9903 
 		$country = '';
9904 
-		$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
9904 
+		$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
9905 9905 
 		$sth = $this->db->prepare($query);
9906 9906 
 		$sth->execute(array(':registration' => $registration));
9907 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
9907 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
9908 9908 
 		{
9909 9909 
 			$country = $row['country'];
9910 9910 
 		}
 
@@ -9917,9 +9917,9 @@  discard block
 
 block discarded – undo
9917 9917 
 	* @param String $flightaware_id flightaware_id from spotter_output table
9918 9918 
 	* @param String $highlight New highlight value
9919 9919 
 	*/
9920 
-	public function setHighlightFlight($flightaware_id,$highlight) {
9920 
+	public function setHighlightFlight($flightaware_id, $highlight) {
9921 9921
9922 
-		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9922 
+		$query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
9923 9923 
 		$sth = $this->db->prepare($query);
9924 9924 
 		$sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight));
9925 9925 
 	}
 
@@ -9948,7 +9948,7 @@  discard block
 
 block discarded – undo
9948 9948
9949 9949 
 		$bitly_data = json_decode($bitly_data);
9950 9950 
 		$bitly_url = '';
9951 
-		if ($bitly_data->status_txt = "OK"){
9951 
+		if ($bitly_data->status_txt = "OK") {
9952 9952 
 			$bitly_url = $bitly_data->data->url;
9953 9953 
 		}
9954 9954 
 
@@ -9958,7 +9958,7 @@  discard block
 
 block discarded – undo
9958 9958
9959 9959 
 	public function getOrderBy()
9960 9960 
 	{
9961 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
9961 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
9962 9962
9963 9963 
 		return $orderby;
9964 9964 
 		
@@ -10092,14 +10092,14 @@  discard block
 
 block discarded – undo
10092 10092 
 		}
10093 10093 
 		$sth = $this->db->prepare($query);
10094 10094 
 		$sth->execute();
10095 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10095 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10096 10096 
 		{
10097 10097 
 			$departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']);
10098 10098 
 			$arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']);
10099 10099 
 			if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) {
10100 
-				$update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
10100 
+				$update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
10101 10101 
 				$sthu = $this->db->prepare($update_query);
10102 
-				$sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country']));
10102 
+				$sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country']));
10103 10103 
 			}
10104 10104 
 		}
10105 10105 
 		
@@ -10112,7 +10112,7 @@  discard block
 
 block discarded – undo
10112 10112 
 		}
10113 10113 
 		$sth = $this->db->prepare($query);
10114 10114 
 		$sth->execute();
10115 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10115 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10116 10116 
 		{
10117 10117 
 			if (is_numeric(substr($row['ident'], -1, 1)))
10118 10118 
 			{
 
@@ -10121,11 +10121,11 @@  discard block
 
 block discarded – undo
10121 10121 
 				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
10122 10122 
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
10123 10123 
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
10124 
-				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
10124 
+				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
10125 10125 
 				if (isset($airline_array[0]['name'])) {
10126 
-					$update_query  = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
10126 
+					$update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
10127 10127 
 					$sthu = $this->db->prepare($update_query);
10128 
-					$sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
10128 
+					$sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
10129 10129 
 				}
10130 10130 
 			}
10131 10131 
 		}
 
@@ -10145,18 +10145,18 @@  discard block
 
 block discarded – undo
10145 10145 
 		}
10146 10146 
 		$sth = $this->db->prepare($query);
10147 10147 
 		$sth->execute();
10148 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10148 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10149 10149 
 		{
10150 10150 
 			if ($row['aircraft_icao'] != '') {
10151 10151 
 				$aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']);
10152 
-				if ($row['registration'] != ""){
10152 
+				if ($row['registration'] != "") {
10153 10153 
 					$image_array = $Image->getSpotterImage($row['registration']);
10154 10154 
 					if (!isset($image_array[0]['registration'])) {
10155 10155 
 						$Image->addSpotterImage($row['registration']);
10156 10156 
 					}
10157 10157 
 				}
10158 10158 
 				if (count($aircraft_name) > 0) {
10159 
-					$update_query  = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
10159 
+					$update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
10160 10160 
 					$sthu = $this->db->prepare($update_query);
10161 10161 
 					$sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id']));
10162 10162 
 				}
 
@@ -10171,10 +10171,10 @@  discard block
 
 block discarded – undo
10171 10171 
 		$query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output";
10172 10172 
 		$sth = $this->db->prepare($query);
10173 10173 
 		$sth->execute();
10174 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
10174 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
10175 10175 
 		{
10176 10176 
 			if ($row['last_latitude'] != '' && $row['last_longitude'] != '') {
10177 
-				$closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist);
10177 
+				$closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist);
10178 10178 
 				$airport_icao = '';
10179 10179 
 				 if (isset($closestAirports[0])) {
10180 10180 
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
 
@@ -10188,7 +10188,7 @@  discard block
 
 block discarded – undo
10188 10188 
 								break;
10189 10189 
 							}
10190 10190 
 						}
10191 
-					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
10191 
+					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) {
10192 10192 
 						$airport_icao = $closestAirports[0]['icao'];
10193 10193 
 						if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
10194 10194 
 					} else {
 
@@ -10199,28 +10199,28 @@  discard block
 
 block discarded – undo
10199 10199 
 				}
10200 10200 
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
10201 10201 
 					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
10202 
-					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10202 
+					$update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
10203 10203 
 					$sthu = $this->db->prepare($update_query);
10204 
-					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
10204 
+					$sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id']));
10205 10205 
 				}
10206 10206 
 			}
10207 10207 
 		}
10208 10208 
 	}
10209 10209
10210 
-	public function closestAirports($origLat,$origLon,$dist = 10) {
10210 
+	public function closestAirports($origLat, $origLon, $dist = 10) {
10211 10211 
 		global $globalDBdriver;
10212 
-		$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
10212 
+		$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
10213 10213 
 /*
10214 10214 
 		$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10215 10215 
                       FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
10216 10216 
                       having distance < $dist ORDER BY distance limit 100;";
10217 10217 
 */
10218 10218 
 		if ($globalDBdriver == 'mysql') {
10219 
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10219 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance
10220 10220 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
10221 10221 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10222 10222 
                 } else {
10223 
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance
10223 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance
10224 10224 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
10225 10225 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
10226 10226 
     		}
Please login to merge, or discard this patch.