View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( e3e251...0f25e6 )
by Yannick
31:30
created
Status
Category
Toggle Patches
require/class.Stats.php 1 patch
Spacing   +548 added lines, -548 removed lines patch added patch discarded remove patch 
@@ -19,14 +19,14 @@  discard block
 
 block discarded – undo
19 19 
 		if ($this->db === null) die('Error: No DB connection.');
20 20 
 	}
21 21
22 
-	public function addLastStatsUpdate($type,$stats_date) {
22 
+	public function addLastStatsUpdate($type, $stats_date) {
23 23 
 		$query = "DELETE FROM config WHERE name = :type;
24 24 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
25 
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
25 
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
26 26 
 		try {
27 27 
 			$sth = $this->db->prepare($query);
28 28 
 			$sth->execute($query_values);
29 
-		} catch(PDOException $e) {
29 
+		} catch (PDOException $e) {
30 30 
 			return "error : ".$e->getMessage();
31 31 
 		}
32 32 
 	}
 
@@ -36,7 +36,7 @@  discard block
 
 block discarded – undo
36 36 
 		try {
37 37 
 			$sth = $this->db->prepare($query);
38 38 
 			$sth->execute(array(':type' => $type));
39 
-		} catch(PDOException $e) {
39 
+		} catch (PDOException $e) {
40 40 
 			echo "error : ".$e->getMessage();
41 41 
 		}
42 42 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -57,7 +57,7 @@  discard block
 
 block discarded – undo
57 57 
 		try {
58 58 
 			$sth = $this->db->prepare($query);
59 59 
 			$sth->execute(array(':filter_name' => $filter_name));
60 
-		} catch(PDOException $e) {
60 
+		} catch (PDOException $e) {
61 61 
 			return "error : ".$e->getMessage();
62 62 
 		}
63 63 
 	}
 
@@ -70,14 +70,14 @@  discard block
 
 block discarded – undo
70 70 
 		try {
71 71 
 			$sth = $this->db->prepare($query);
72 72 
 			$sth->execute();
73 
-		} catch(PDOException $e) {
73 
+		} catch (PDOException $e) {
74 74 
 			return "error : ".$e->getMessage();
75 75 
 		}
76 76 
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
77 77 
 		try {
78 78 
 			$sth = $this->db->prepare($query);
79 79 
 			$sth->execute(array(':filter_name' => $filter_name));
80 
-		} catch(PDOException $e) {
80 
+		} catch (PDOException $e) {
81 81 
 			return "error : ".$e->getMessage();
82 82 
 		}
83 83 
 	}
 
@@ -89,77 +89,77 @@  discard block
 
 block discarded – undo
89 89 
 		 try {
90 90 
 			$sth = $this->db->prepare($query);
91 91 
 			$sth->execute(array(':filter_name' => $filter_name));
92 
-		} catch(PDOException $e) {
92 
+		} catch (PDOException $e) {
93 93 
 			echo "error : ".$e->getMessage();
94 94 
 		}
95 95 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
96 96 
 		if (empty($all)) {
97 97 
 			$filters = array();
98 98 
 			if ($filter_name != '') {
99 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
99 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
100 100 
 			}
101 101 
 			$Spotter = new Spotter($this->db);
102 
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
102 
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
103 103 
 		}
104 104 
 		return $all;
105 105 
 	}
106 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
106 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
107 107 
 		if ($filter_name == '') $filter_name = $this->filter_name;
108 108 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 109 
 		try {
110 110 
 			$sth = $this->db->prepare($query);
111 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
112 
-		} catch(PDOException $e) {
111 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
112 
+		} catch (PDOException $e) {
113 113 
 			echo "error : ".$e->getMessage();
114 114 
 		}
115 115 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
116 116 
 		return $all;
117 117 
 	}
118 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
118 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
119 119 
 		if ($filter_name == '') $filter_name = $this->filter_name;
120 120 
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
121 121 
 		try {
122 122 
 			$sth = $this->db->prepare($query);
123 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
124 
-		} catch(PDOException $e) {
123 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
124 
+		} catch (PDOException $e) {
125 125 
 			echo "error : ".$e->getMessage();
126 126 
 		}
127 127 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
128 128 
 		return $all;
129 129 
 	}
130 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
130 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
131 131 
 		if ($filter_name == '') $filter_name = $this->filter_name;
132 132 
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
133 133 
 		try {
134 134 
 			$sth = $this->db->prepare($query);
135 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
136 
-		} catch(PDOException $e) {
135 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
136 
+		} catch (PDOException $e) {
137 137 
 			echo "error : ".$e->getMessage();
138 138 
 		}
139 139 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
140 140 
 		return $all;
141 141 
 	}
142 142
143 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
143 
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
144 144 
 		if ($filter_name == '') $filter_name = $this->filter_name;
145 145 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 146 
 		try {
147 147 
 			$sth = $this->db->prepare($query);
148 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
149 
-		} catch(PDOException $e) {
148 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
149 
+		} catch (PDOException $e) {
150 150 
 			echo "error : ".$e->getMessage();
151 151 
 		}
152 152 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
153 153 
 		return $all;
154 154 
 	}
155 155
156 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
156 
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
157 157 
 		if ($filter_name == '') $filter_name = $this->filter_name;
158 158 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 159 
 		try {
160 160 
 			$sth = $this->db->prepare($query);
161 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
162 
-		} catch(PDOException $e) {
161 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
162 
+		} catch (PDOException $e) {
163 163 
 			echo "error : ".$e->getMessage();
164 164 
 		}
165 165 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -167,23 +167,23 @@  discard block
 
 block discarded – undo
167 167 
 	}
168 168
169 169
170 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
170 
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
171 171 
 		global $globalStatsFilters;
172 172 
 		if ($filter_name == '') $filter_name = $this->filter_name;
173 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
173 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
174 174 
 			$Spotter = new Spotter($this->db);
175 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
175 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
176 176 
 			$alliance_airlines = array();
177 177 
 			foreach ($airlines as $airline) {
178 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
178 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
179 179 
 			}
180 180 
 			if ($year == '' && $month == '') {
181 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
181 
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182 
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 183 
 				try {
184 184 
 					$sth = $this->db->prepare($query);
185 185 
 					$sth->execute(array(':filter_name' => $filter_name));
186 
-				} catch(PDOException $e) {
186 
+				} catch (PDOException $e) {
187 187 
 					echo "error : ".$e->getMessage();
188 188 
 				}
189 189 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -194,29 +194,29 @@  discard block
 
 block discarded – undo
194 194 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
195 195 
 				try {
196 196 
 					$sth = $this->db->prepare($query);
197 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
198 
-				} catch(PDOException $e) {
197 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
198 
+				} catch (PDOException $e) {
199 199 
 					echo "error : ".$e->getMessage();
200 200 
 				}
201 201 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 202 
 			} else $all = array();
203 203 
 		}
204 204 
 		if (empty($all)) {
205 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
206 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
205 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
206 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
207 207 
 			} else {
208 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
208 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
209 209 
 			}
210 210 
 			if ($filter_name != '') {
211 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212 
 			}
213 213 
 			$Spotter = new Spotter($this->db);
214 214 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
215 
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
215 
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
216 216 
 		}
217 217 
 		return $all;
218 218 
 	}
219 
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
219 
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
220 220 
 		global $globalStatsFilters;
221 221 
 		if ($filter_name == '') $filter_name = $this->filter_name;
222 222 
 		if ($year == '' && $month == '') {
 
@@ -225,7 +225,7 @@  discard block
 
 block discarded – undo
225 225 
 			try {
226 226 
 				$sth = $this->db->prepare($query);
227 227 
 				$sth->execute(array(':filter_name' => $filter_name));
228 
-			} catch(PDOException $e) {
228 
+			} catch (PDOException $e) {
229 229 
 				echo "error : ".$e->getMessage();
230 230 
 			}
231 231 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -233,32 +233,32 @@  discard block
 
 block discarded – undo
233 233 
 		if (empty($all)) {
234 234 
 			$Spotter = new Spotter($this->db);
235 235 
 			$filters = array();
236 
-			$filters = array('year' => $year,'month' => $month);
236 
+			$filters = array('year' => $year, 'month' => $month);
237 237 
 			if ($filter_name != '') {
238 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
238 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
239 239 
 			}
240 240 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
241 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
241 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
242 242 
 		}
243 243 
 		return $all;
244 244 
 	}
245 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
245 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
246 246 
 		global $globalStatsFilters;
247 247 
 		if ($filter_name == '') $filter_name = $this->filter_name;
248 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
248 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
249 249 
 			$Spotter = new Spotter($this->db);
250 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
250 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
251 251 
 			$alliance_airlines = array();
252 252 
 			foreach ($airlines as $airline) {
253 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
253 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
254 254 
 			}
255 255 
 			if ($year == '' && $month == '') {
256 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
256 
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257 
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 258 
 				try {
259 259 
 					$sth = $this->db->prepare($query);
260 260 
 					$sth->execute(array(':filter_name' => $filter_name));
261 
-				} catch(PDOException $e) {
261 
+				} catch (PDOException $e) {
262 262 
 					echo "error : ".$e->getMessage();
263 263 
 				}
264 264 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -269,21 +269,21 @@  discard block
 
 block discarded – undo
269 269 
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
270 270 
 				try {
271 271 
 					$sth = $this->db->prepare($query);
272 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
273 
-				} catch(PDOException $e) {
272 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
273 
+				} catch (PDOException $e) {
274 274 
 					echo "error : ".$e->getMessage();
275 275 
 				}
276 276 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 277 
 			} else $all = array();
278 278 
 		}
279 279 
 		if (empty($all)) {
280 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
281 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
280 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
281 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
282 282 
 			} else {
283 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
283 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
284 284 
 			}
285 285 
 			if ($filter_name != '') {
286 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
286 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
287 287 
 			}
288 288 
 			$Spotter = new Spotter($this->db);
289 289 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -292,23 +292,23 @@  discard block
 
 block discarded – undo
292 292 
 		return $all;
293 293 
 	}
294 294
295 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
295 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
296 296 
 		global $globalStatsFilters;
297 297 
 		if ($filter_name == '') $filter_name = $this->filter_name;
298 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
298 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
299 299 
 			$Spotter = new Spotter($this->db);
300 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
300 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
301 301 
 			$alliance_airlines = array();
302 302 
 			foreach ($airlines as $airline) {
303 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
303 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
304 304 
 			}
305 305 
 			if ($year == '' && $month == '') {
306 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
306 
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307 
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 308 
 				try {
309 309 
 					$sth = $this->db->prepare($query);
310 310 
 					$sth->execute(array(':filter_name' => $filter_name));
311 
-				} catch(PDOException $e) {
311 
+				} catch (PDOException $e) {
312 312 
 					echo "error : ".$e->getMessage();
313 313 
 				}
314 314 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -319,61 +319,61 @@  discard block
 
 block discarded – undo
319 319 
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
320 320 
 				try {
321 321 
 					$sth = $this->db->prepare($query);
322 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
323 
-				} catch(PDOException $e) {
322 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
323 
+				} catch (PDOException $e) {
324 324 
 					echo "error : ".$e->getMessage();
325 325 
 				}
326 326 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 327 
 			} else $all = array();
328 328 
 		}
329 329 
 		if (empty($all)) {
330 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
331 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
330 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
331 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
332 332 
 			} else {
333 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
333 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
334 334 
 			}
335 335 
 			if ($filter_name != '') {
336 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
336 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
337 337 
 			}
338 338 
 			$Spotter = new Spotter($this->db);
339 339 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
340 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
340 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
341 341 
 		}
342 342 
 		return $all;
343 343 
 	}
344 344 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 345 
 		global $globalStatsFilters;
346 346 
 		if ($filter_name == '') $filter_name = $this->filter_name;
347 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
347 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
348 348 
 			$Spotter = new Spotter($this->db);
349 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
349 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
350 350 
 			$alliance_airlines = array();
351 351 
 			foreach ($airlines as $airline) {
352 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
352 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
353 353 
 			}
354 
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
354 
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355 
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 356 
 			$query_values = array(':filter_name' => $filter_name);
357 357 
 		} else {
358 358 
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
359 359 
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
360 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
360 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
361 361 
 		}
362 362 
 		try {
363 363 
 			$sth = $this->db->prepare($query);
364 364 
 			$sth->execute($query_values);
365 
-		} catch(PDOException $e) {
365 
+		} catch (PDOException $e) {
366 366 
 			echo "error : ".$e->getMessage();
367 367 
 		}
368 368 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
369 369 
 		if (empty($all)) {
370 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
371 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
370 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
371 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
372 372 
 			} else {
373 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
373 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
374 374 
 			}
375 375 
 			if ($filter_name != '') {
376 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
376 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
377 377 
 			}
378 378 
 			$Spotter = new Spotter($this->db);
379 379 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -382,7 +382,7 @@  discard block
 
 block discarded – undo
382 382 
 		return $all;
383 383 
 	}
384 384
385 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
385 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
386 386 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 387 
 		if ($filter_name == '') $filter_name = $this->filter_name;
388 388 
 		if ($year == '' && $month == '') {
 
@@ -391,7 +391,7 @@  discard block
 
 block discarded – undo
391 391 
 			if (isset($forsource)) {
392 392 
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 393 
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
394 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
394 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
395 395 
 			} else {
396 396 
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 397 
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
 
@@ -400,7 +400,7 @@  discard block
 
 block discarded – undo
400 400 
 			try {
401 401 
 				$sth = $this->db->prepare($query);
402 402 
 				$sth->execute($query_values);
403 
-			} catch(PDOException $e) {
403 
+			} catch (PDOException $e) {
404 404 
 				echo "error : ".$e->getMessage();
405 405 
 			}
406 406 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -408,32 +408,32 @@  discard block
 
 block discarded – undo
408 408 
                 if (empty($all)) {
409 409 
 	                $Spotter = new Spotter($this->db);
410 410 
             		$filters = array();
411 
-			$filters = array('year' => $year,'month' => $month);
411 
+			$filters = array('year' => $year, 'month' => $month);
412 412 
             		if ($filter_name != '') {
413 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414 
 			}
415 415 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
416 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
417 417 
                 }
418 418 
                 return $all;
419 419 
 	}
420 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
420 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
421 421 
 		global $globalStatsFilters;
422 422 
 		if ($filter_name == '') $filter_name = $this->filter_name;
423 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
423 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
424 424 
 			$Spotter = new Spotter($this->db);
425 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
425 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
426 426 
 			$alliance_airlines = array();
427 427 
 			foreach ($airlines as $airline) {
428 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
428 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
429 429 
 			}
430 430 
 			if ($year == '' && $month == '') {
431 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
431 
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432 
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 433 
 				try {
434 434 
 					$sth = $this->db->prepare($query);
435 435 
 					$sth->execute(array(':filter_name' => $filter_name));
436 
-				} catch(PDOException $e) {
436 
+				} catch (PDOException $e) {
437 437 
 					echo "error : ".$e->getMessage();
438 438 
 				}
439 439 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -444,45 +444,45 @@  discard block
 
 block discarded – undo
444 444 
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
445 445 
 				try {
446 446 
 					$sth = $this->db->prepare($query);
447 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
448 
-				} catch(PDOException $e) {
447 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
448 
+				} catch (PDOException $e) {
449 449 
 					echo "error : ".$e->getMessage();
450 450 
 				}
451 451 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 452 
 			} else $all = array();
453 453 
 		}
454 454 
 		if (empty($all)) {
455 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
456 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
455 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
456 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
457 457 
 			} else {
458 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
458 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
459 459 
 			}
460 460 
 			if ($filter_name != '') {
461 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
461 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
462 462 
 			}
463 463 
 			$Spotter = new Spotter($this->db);
464 464 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
465 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
465 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
466 466 
 		}
467 467 
 		return $all;
468 468 
 	}
469 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
469 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
470 470 
 		global $globalStatsFilters;
471 471 
 		if ($filter_name == '') $filter_name = $this->filter_name;
472 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
472 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
473 473 
 			$Spotter = new Spotter($this->db);
474 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
474 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
475 475 
 			$alliance_airlines = array();
476 476 
 			foreach ($airlines as $airline) {
477 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
477 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
478 478 
 			}
479 479 
 			if ($year == '' && $month == '') {
480 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
480 
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481 
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 482 
 				 try {
483 483 
 					$sth = $this->db->prepare($query);
484 484 
 					$sth->execute(array(':filter_name' => $filter_name));
485 
-				} catch(PDOException $e) {
485 
+				} catch (PDOException $e) {
486 486 
 					echo "error : ".$e->getMessage();
487 487 
 				}
488 488 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -493,46 +493,46 @@  discard block
 
 block discarded – undo
493 493 
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
494 494 
 				 try {
495 495 
 					$sth = $this->db->prepare($query);
496 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
497 
-				} catch(PDOException $e) {
496 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
497 
+				} catch (PDOException $e) {
498 498 
 					echo "error : ".$e->getMessage();
499 499 
 				}
500 500 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 501 
 			} else $all = array();
502 502 
 		}
503 503 
 		if (empty($all)) {
504 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
505 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
504 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
505 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
506 506 
 			} else {
507 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
508 508 
 			}
509 509 
 			if ($filter_name != '') {
510 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
510 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
511 511 
 			}
512 512 
 			$Spotter = new Spotter($this->db);
513 513 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
514 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
514 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
515 515 
 		}
516 516 
 		return $all;
517 517 
 	}
518 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
518 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
519 519 
 		$Connection = new Connection($this->db);
520 520 
 		if ($filter_name == '') $filter_name = $this->filter_name;
521 521 
 		if ($Connection->tableExists('countries')) {
522 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
522 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
523 523 
 				$Spotter = new Spotter($this->db);
524 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
524 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
525 525 
 				if ($year == '' && $month == '') {
526 526 
 					$alliance_airlines = array();
527 527 
 					foreach ($airlines as $airline) {
528 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
528 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
529 529 
 					}
530 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
530 
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531 
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 532 
 					 try {
533 533 
 						$sth = $this->db->prepare($query);
534 534 
 						$sth->execute(array(':filter_name' => $filter_name));
535 
-					} catch(PDOException $e) {
535 
+					} catch (PDOException $e) {
536 536 
 						echo "error : ".$e->getMessage();
537 537 
 					}
538 538 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -544,8 +544,8 @@  discard block
 
 block discarded – undo
544 544 
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
545 545 
 					 try {
546 546 
 						$sth = $this->db->prepare($query);
547 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
548 
-					} catch(PDOException $e) {
547 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
548 
+					} catch (PDOException $e) {
549 549 
 						echo "error : ".$e->getMessage();
550 550 
 					}
551 551 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -562,7 +562,7 @@  discard block
 
 block discarded – undo
562 562 
 			return array();
563 563 
 		}
564 564 
 	}
565 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
565 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
566 566 
 		global $globalStatsFilters;
567 567 
 		if ($filter_name == '') $filter_name = $this->filter_name;
568 568 
 		if ($year == '' && $month == '') {
 
@@ -570,41 +570,41 @@  discard block
 
 block discarded – undo
570 570 
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
571 571 
 			try {
572 572 
 				$sth = $this->db->prepare($query);
573 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
574 
-			} catch(PDOException $e) {
573 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
574 
+			} catch (PDOException $e) {
575 575 
 				echo "error : ".$e->getMessage();
576 576 
 			}
577 577 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578 
 		} else $all = array();
579 579 
 		if (empty($all)) {
580 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
580 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
581 581 
 			if ($filter_name != '') {
582 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
583 583 
 			}
584 584 
 			$Spotter = new Spotter($this->db);
585 585 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
586 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
586 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
587 587 
 		}
588 588 
 		return $all;
589 589 
 	}
590 590
591 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
591 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
592 592 
 		global $globalStatsFilters;
593 593 
 		if ($filter_name == '') $filter_name = $this->filter_name;
594 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
594 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
595 595 
 			$Spotter = new Spotter($this->db);
596 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
596 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
597 597 
 			if ($year == '' && $month == '') {
598 598 
 				$alliance_airlines = array();
599 599 
 				foreach ($airlines as $airline) {
600 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
600 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
601 601 
 				}
602 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
602 
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603 
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 604 
 				try {
605 605 
 					$sth = $this->db->prepare($query);
606 606 
 					$sth->execute(array(':filter_name' => $filter_name));
607 
-				} catch(PDOException $e) {
607 
+				} catch (PDOException $e) {
608 608 
 					echo "error : ".$e->getMessage();
609 609 
 				}
610 610 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -615,45 +615,45 @@  discard block
 
 block discarded – undo
615 615 
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
616 616 
 				try {
617 617 
 					$sth = $this->db->prepare($query);
618 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
619 
-				} catch(PDOException $e) {
618 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
619 
+				} catch (PDOException $e) {
620 620 
 					echo "error : ".$e->getMessage();
621 621 
 				}
622 622 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 623 
 			} else $all = array();
624 624 
 		}
625 625 
 		if (empty($all)) {
626 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
627 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
626 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
627 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
628 628 
 			} else {
629 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
629 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
630 630 
 			}
631 631 
 			if ($filter_name != '') {
632 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
632 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
633 633 
 			}
634 634 
 			$Spotter = new Spotter($this->db);
635 635 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
636 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
636 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
637 637 
 		}
638 638 
 		return $all;
639 639 
 	}
640 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
640 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
641 641 
 		global $globalStatsFilters;
642 642 
 		if ($filter_name == '') $filter_name = $this->filter_name;
643 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
643 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
644 644 
 			$Spotter = new Spotter($this->db);
645 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
645 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
646 646 
 			if ($year == '' && $month == '') {
647 647 
 				$alliance_airlines = array();
648 648 
 				foreach ($airlines as $airline) {
649 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
649 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
650 650 
 				}
651 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
651 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 653 
 				try {
654 654 
 					$sth = $this->db->prepare($query);
655 655 
 					$sth->execute(array(':filter_name' => $filter_name));
656 
-				} catch(PDOException $e) {
656 
+				} catch (PDOException $e) {
657 657 
 					echo "error : ".$e->getMessage();
658 658 
 				}
659 659 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -664,27 +664,27 @@  discard block
 
 block discarded – undo
664 664 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
665 665 
 				try {
666 666 
 					$sth = $this->db->prepare($query);
667 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
668 
-				} catch(PDOException $e) {
667 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
668 
+				} catch (PDOException $e) {
669 669 
 					echo "error : ".$e->getMessage();
670 670 
 				}
671 671 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 672 
 			} else $all = array();
673 673 
 		}
674 674 
 		if (empty($all)) {
675 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
676 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
675 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
676 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
677 677 
 			} else {
678 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
678 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
679 679 
 			}
680 680 
 			if ($filter_name != '') {
681 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
681 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
682 682 
 			}
683 683 
 			$Spotter = new Spotter($this->db);
684 684 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
685 685 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
686 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
687 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
686 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
687 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
688 688 
 			$all = array();
689 689 
 			foreach ($pall as $value) {
690 690 
 				$icao = $value['airport_departure_icao'];
 
@@ -700,27 +700,27 @@  discard block
 
 block discarded – undo
700 700 
 			foreach ($all as $key => $row) {
701 701 
 				$count[$key] = $row['airport_departure_icao_count'];
702 702 
 			}
703 
-			array_multisort($count,SORT_DESC,$all);
703 
+			array_multisort($count, SORT_DESC, $all);
704 704 
 		}
705 705 
 		return $all;
706 706 
 	}
707 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
707 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
708 708 
 		global $globalStatsFilters;
709 709 
 		if ($filter_name == '') $filter_name = $this->filter_name;
710 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
710 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 711 
 			$Spotter = new Spotter($this->db);
712 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
712 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
713 713 
 			if ($year == '' && $month == '') {
714 714 
 				$alliance_airlines = array();
715 715 
 				foreach ($airlines as $airline) {
716 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
716 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
717 717 
 				}
718 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
718 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 720 
 				try {
721 721 
 					$sth = $this->db->prepare($query);
722 722 
 					$sth->execute(array(':filter_name' => $filter_name));
723 
-				} catch(PDOException $e) {
723 
+				} catch (PDOException $e) {
724 724 
 					echo "error : ".$e->getMessage();
725 725 
 				}
726 726 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -731,27 +731,27 @@  discard block
 
 block discarded – undo
731 731 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
732 732 
 				try {
733 733 
 					$sth = $this->db->prepare($query);
734 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
735 
-				} catch(PDOException $e) {
734 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
735 
+				} catch (PDOException $e) {
736 736 
 					echo "error : ".$e->getMessage();
737 737 
 				}
738 738 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 739 
 			} else $all = array();
740 740 
 		}
741 741 
 		if (empty($all)) {
742 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
743 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
742 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
743 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
744 744 
 			} else {
745 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
745 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
746 746 
 			}
747 747 
 			if ($filter_name != '') {
748 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
748 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
749 749 
 			}
750 750 
 			$Spotter = new Spotter($this->db);
751 751 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
752 752 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
753 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
754 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
753 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
754 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
755 755 
 			$all = array();
756 756 
 			foreach ($pall as $value) {
757 757 
 				$icao = $value['airport_arrival_icao'];
 
@@ -767,26 +767,26 @@  discard block
 
 block discarded – undo
767 767 
 			foreach ($all as $key => $row) {
768 768 
 				$count[$key] = $row['airport_arrival_icao_count'];
769 769 
 			}
770 
-			array_multisort($count,SORT_DESC,$all);
770 
+			array_multisort($count, SORT_DESC, $all);
771 771 
 		}
772 772 
 		return $all;
773 773 
 	}
774 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
774 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
775 775 
 		global $globalDBdriver, $globalStatsFilters;
776 776 
 		if ($filter_name == '') $filter_name = $this->filter_name;
777 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
777 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
778 778 
 			$Spotter = new Spotter($this->db);
779 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
779 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
780 780 
 			$alliance_airlines = array();
781 781 
 			foreach ($airlines as $airline) {
782 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
782 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
783 783 
 			}
784 784 
 			if ($globalDBdriver == 'mysql') {
785 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
785 
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786 
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 787 
 			} else {
788 
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
788 
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789 
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 790 
 			}
791 791 
 			$query_data = array(':filter_name' => $filter_name);
792 792 
 		} else {
 
@@ -797,23 +797,23 @@  discard block
 
 block discarded – undo
797 797 
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 798 
 				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
799 799 
 			}
800 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
800 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
801 801 
 		}
802 802 
 		try {
803 803 
 			$sth = $this->db->prepare($query);
804 804 
 			$sth->execute($query_data);
805 
-		} catch(PDOException $e) {
805 
+		} catch (PDOException $e) {
806 806 
 			echo "error : ".$e->getMessage();
807 807 
 		}
808 808 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
809 809 
 		if (empty($all)) {
810 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
811 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
810 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
811 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
812 812 
 			} else {
813 813 
 				$filters = array('airlines' => array($stats_airline));
814 814 
 			}
815 815 
 			if ($filter_name != '') {
816 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
816 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
817 817 
 			}
818 818 
 			$Spotter = new Spotter($this->db);
819 819 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -821,57 +821,57 @@  discard block
 
 block discarded – undo
821 821 
 		return $all;
822 822 
 	}
823 823
824 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
824 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
825 825 
 		global $globalStatsFilters;
826 826 
 		if ($filter_name == '') $filter_name = $this->filter_name;
827 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
827 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
828 828 
 			$Spotter = new Spotter($this->db);
829 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
829 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
830 830 
 			$alliance_airlines = array();
831 831 
 			foreach ($airlines as $airline) {
832 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
832 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
833 833 
 			}
834 
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
834 
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
835 835 
 			$query_data = array(':filter_name' => $filter_name);
836 836 
 		} else {
837 837 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
838 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
838 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
839 839 
 		}
840 840 
 		try {
841 841 
 			$sth = $this->db->prepare($query);
842 842 
 			$sth->execute($query_data);
843 
-		} catch(PDOException $e) {
843 
+		} catch (PDOException $e) {
844 844 
 			echo "error : ".$e->getMessage();
845 845 
 		}
846 846 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
847 847 
 		if (empty($all)) {
848 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
849 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
848 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
849 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
850 850 
 			} else {
851 851 
 				$filters = array('airlines' => array($stats_airline));
852 852 
 			}
853 853 
 			if ($filter_name != '') {
854 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
854 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
855 855 
 			}
856 856 
 			$Spotter = new Spotter($this->db);
857 857 
 			$all = $Spotter->countAllDatesLastMonth($filters);
858 858 
 		}
859 859 
 		return $all;
860 860 
 	}
861 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
861 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
862 862 
 		global $globalDBdriver, $globalStatsFilters;
863 863 
 		if ($filter_name == '') $filter_name = $this->filter_name;
864 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
864 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
865 865 
 			$Spotter = new Spotter($this->db);
866 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
866 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
867 867 
 			$alliance_airlines = array();
868 868 
 			foreach ($airlines as $airline) {
869 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
869 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
870 870 
 			}
871 871 
 			if ($globalDBdriver == 'mysql') {
872 
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
872 
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
873 873 
 			} else {
874 
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
874 
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
875 875 
 			}
876 876 
 			$query_data = array(':filter_name' => $filter_name);
877 877 
 		} else {
 
@@ -880,60 +880,60 @@  discard block
 
 block discarded – undo
880 880 
 			} else {
881 881 
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
882 882 
 			}
883 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
883 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
884 884 
 		}
885 885 
 		try {
886 886 
 			$sth = $this->db->prepare($query);
887 887 
 			$sth->execute($query_data);
888 
-		} catch(PDOException $e) {
888 
+		} catch (PDOException $e) {
889 889 
 			echo "error : ".$e->getMessage();
890 890 
 		}
891 891 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
892 892 
 		if (empty($all)) {
893 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
894 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
893 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
894 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
895 895 
 			} else {
896 896 
 				$filters = array('airlines' => array($stats_airline));
897 897 
 			}
898 898 
 			if ($filter_name != '') {
899 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
899 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
900 900 
 			}
901 901 
 			$Spotter = new Spotter($this->db);
902 902 
 			$all = $Spotter->countAllDatesLast7Days($filters);
903 903 
 		}
904 904 
 		return $all;
905 905 
 	}
906 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
906 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
907 907 
 		global $globalStatsFilters;
908 908 
 		if ($filter_name == '') $filter_name = $this->filter_name;
909 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
909 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
910 910 
 			$Spotter = new Spotter($this->db);
911 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
911 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
912 912 
 			$alliance_airlines = array();
913 913 
 			foreach ($airlines as $airline) {
914 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
914 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
915 915 
 			}
916 
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
916 
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
917 917 
 			$query_data = array(':filter_name' => $filter_name);
918 918 
 		} else {
919 919 
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
920 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
920 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
921 921 
 		}
922 922 
 		try {
923 923 
 			$sth = $this->db->prepare($query);
924 924 
 			$sth->execute($query_data);
925 
-		} catch(PDOException $e) {
925 
+		} catch (PDOException $e) {
926 926 
 			echo "error : ".$e->getMessage();
927 927 
 		}
928 928 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
929 929 
 		if (empty($all)) {
930 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
931 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
930 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
931 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
932 932 
 			} else {
933 933 
 				$filters = array('airlines' => array($stats_airline));
934 934 
 			}
935 935 
 			if ($filter_name != '') {
936 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
936 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
937 937 
 			}
938 938 
 			$Spotter = new Spotter($this->db);
939 939 
 			$all = $Spotter->countAllDates($filters);
 
@@ -948,34 +948,34 @@  discard block
 
 block discarded – undo
948 948 
 		try {
949 949 
 			$sth = $this->db->prepare($query);
950 950 
 			$sth->execute($query_data);
951 
-		} catch(PDOException $e) {
951 
+		} catch (PDOException $e) {
952 952 
 			echo "error : ".$e->getMessage();
953 953 
 		}
954 954 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955 
 		if (empty($all)) {
956 956 
 			$filters = array();
957 957 
 			if ($filter_name != '') {
958 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959 
 			}
960 960 
 			$Spotter = new Spotter($this->db);
961 961 
 			$all = $Spotter->countAllDatesByAirlines($filters);
962 962 
 		}
963 963 
 		return $all;
964 964 
 	}
965 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
965 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
966 966 
 		global $globalStatsFilters, $globalDBdriver;
967 967 
 		if ($filter_name == '') $filter_name = $this->filter_name;
968 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
968 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
969 969 
 			$Spotter = new Spotter($this->db);
970 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
970 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
971 971 
 			$alliance_airlines = array();
972 972 
 			foreach ($airlines as $airline) {
973 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
973 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
974 974 
 			}
975 975 
 			if ($globalDBdriver == 'mysql') {
976 
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
976 
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
977 977 
 			} else {
978 
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
978 
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
979 979 
 			}
980 980 
 			$query_data = array(':filter_name' => $filter_name);
981 981 
 		} else {
 
@@ -989,18 +989,18 @@  discard block
 
 block discarded – undo
989 989 
 		try {
990 990 
 			$sth = $this->db->prepare($query);
991 991 
 			$sth->execute($query_data);
992 
-		} catch(PDOException $e) {
992 
+		} catch (PDOException $e) {
993 993 
 			echo "error : ".$e->getMessage();
994 994 
 		}
995 995 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
996 996 
 		if (empty($all)) {
997 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
998 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
997 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
998 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
999 999 
 			} else {
1000 1000 
 				$filters = array('airlines' => array($stats_airline));
1001 1001 
 			}
1002 1002 
 			if ($filter_name != '') {
1003 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1003 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1004 1004 
 			}
1005 1005 
 			$Spotter = new Spotter($this->db);
1006 1006 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1017,7 +1017,7 @@  discard block
 
 block discarded – undo
1017 1017 
 		try {
1018 1018 
 			$sth = $this->db->prepare($query);
1019 1019 
 			$sth->execute();
1020 
-		} catch(PDOException $e) {
1020 
+		} catch (PDOException $e) {
1021 1021 
 			echo "error : ".$e->getMessage();
1022 1022 
 		}
1023 1023 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1037,7 +1037,7 @@  discard block
 
 block discarded – undo
1037 1037 
 		try {
1038 1038 
 			$sth = $this->db->prepare($query);
1039 1039 
 			$sth->execute();
1040 
-		} catch(PDOException $e) {
1040 
+		} catch (PDOException $e) {
1041 1041 
 			echo "error : ".$e->getMessage();
1042 1042 
 		}
1043 1043 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1054,32 +1054,32 @@  discard block
 
 block discarded – undo
1054 1054 
 		try {
1055 1055 
 			$sth = $this->db->prepare($query);
1056 1056 
 			$sth->execute(array(':filter_name' => $filter_name));
1057 
-		} catch(PDOException $e) {
1057 
+		} catch (PDOException $e) {
1058 1058 
 			echo "error : ".$e->getMessage();
1059 1059 
 		}
1060 1060 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1061 1061 
 		if (empty($all)) {
1062 1062 
 			$filters = array();
1063 1063 
 			if ($filter_name != '') {
1064 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1064 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1065 1065 
 			}
1066 1066 
 			$Spotter = new Spotter($this->db);
1067 1067 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1068 1068 
 		}
1069 1069 
 		return $all;
1070 1070 
 	}
1071 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1071 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1072 1072 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 1073 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1074 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1074 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1075 1075 
 			$Spotter = new Spotter($this->db);
1076 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1076 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1077 1077 
 			$alliance_airlines = array();
1078 1078 
 			foreach ($airlines as $airline) {
1079 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1079 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1080 1080 
 			}
1081 
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082 
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1081 
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082 
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1083 1083 
 			$query_data = array(':filter_name' => $filter_name);
1084 1084 
 		} else {
1085 1085 
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1097,37 +1097,37 @@  discard block
 
 block discarded – undo
1097 1097 
 		try {
1098 1098 
 			$sth = $this->db->prepare($query);
1099 1099 
 			$sth->execute($query_data);
1100 
-		} catch(PDOException $e) {
1100 
+		} catch (PDOException $e) {
1101 1101 
 			echo "error : ".$e->getMessage();
1102 1102 
 		}
1103 1103 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104 1104 
 		if (empty($all)) {
1105 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1106 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1105 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1106 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1107 1107 
 			} else {
1108 1108 
 				$filters = array('airlines' => array($stats_airline));
1109 1109 
 			}
1110 1110 
 			if ($filter_name != '') {
1111 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112 
 			}
1113 1113 
 			$Spotter = new Spotter($this->db);
1114 
-			$all = $Spotter->countAllHours($orderby,$filters);
1114 
+			$all = $Spotter->countAllHours($orderby, $filters);
1115 1115 
 		}
1116 1116 
 		return $all;
1117 1117 
 	}
1118 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1118 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1119 1119 
 		global $globalStatsFilters;
1120 1120 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1121 1121 
 		if ($year == '') $year = date('Y');
1122 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1122 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1123 1123 
 		if (empty($all)) {
1124 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1125 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1124 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1125 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1126 1126 
 			} else {
1127 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1127 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1128 1128 
 			}
1129 1129 
 			if ($filter_name != '') {
1130 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1130 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1131 1131 
 			}
1132 1132 
 			$Spotter = new Spotter($this->db);
1133 1133 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1135,16 +1135,16 @@  discard block
 
 block discarded – undo
1135 1135 
 		}
1136 1136 
 		return $all;
1137 1137 
 	}
1138 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1138 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1139 1139 
 		global $globalStatsFilters;
1140 1140 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1141 1141 
 		if ($year == '') $year = date('Y');
1142 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1142 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1143 1143 
 		if (empty($all)) {
1144 1144 
 			$filters = array();
1145 
-			$filters = array('year' => $year,'month' => $month);
1145 
+			$filters = array('year' => $year, 'month' => $month);
1146 1146 
 			if ($filter_name != '') {
1147 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1147 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1148 1148 
 			}
1149 1149 
 			$Spotter = new Spotter($this->db);
1150 1150 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1152,19 +1152,19 @@  discard block
 
 block discarded – undo
1152 1152 
 		}
1153 1153 
 		return $all;
1154 1154 
 	}
1155 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1155 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1156 1156 
 		global $globalStatsFilters;
1157 1157 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1158 1158 
 		if ($year == '') $year = date('Y');
1159 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1159 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1160 1160 
 		if (empty($all)) {
1161 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1161 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1163 1163 
 			} else {
1164 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1164 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1165 1165 
 			}
1166 1166 
 			if ($filter_name != '') {
1167 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1167 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1168 1168 
 			}
1169 1169 
 			$Spotter = new Spotter($this->db);
1170 1170 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1172,48 +1172,48 @@  discard block
 
 block discarded – undo
1172 1172 
 		}
1173 1173 
 		return $all;
1174 1174 
 	}
1175 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1175 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1176 1176 
 		global $globalStatsFilters;
1177 1177 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1178 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1178 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1179 1179 
 			$Spotter = new Spotter($this->db);
1180 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1180 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1181 1181 
 			if ($year == '' && $month == '') {
1182 1182 
 				$alliance_airlines = array();
1183 1183 
 				foreach ($airlines as $airline) {
1184 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1184 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1185 1185 
 				}
1186 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1186 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1187 1187 
 				try {
1188 1188 
 					$sth = $this->db->prepare($query);
1189 1189 
 					$sth->execute(array(':filter_name' => $filter_name));
1190 
-				} catch(PDOException $e) {
1190 
+				} catch (PDOException $e) {
1191 1191 
 					echo "error : ".$e->getMessage();
1192 1192 
 				}
1193 1193 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1194 
 				$all = $result[0]['nb'];
1195 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1195 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1196 1196 
 		} else {
1197 1197 
 			if ($year == '' && $month == '') {
1198 1198 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1199 1199 
 				try {
1200 1200 
 					$sth = $this->db->prepare($query);
1201 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1202 
-				} catch(PDOException $e) {
1201 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1202 
+				} catch (PDOException $e) {
1203 1203 
 					echo "error : ".$e->getMessage();
1204 1204 
 				}
1205 1205 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1206 
 				$all = $result[0]['nb'];
1207 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1207 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1208 1208 
 		}
1209 1209 
 		if (empty($all)) {
1210 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1211 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1210 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1211 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1212 1212 
 			} else {
1213 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1213 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1214 1214 
 			}
1215 1215 
 			if ($filter_name != '') {
1216 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1216 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1217 1217 
 			}
1218 1218 
 			$Spotter = new Spotter($this->db);
1219 1219 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1221,7 +1221,7 @@  discard block
 
 block discarded – undo
1221 1221 
 		}
1222 1222 
 		return $all;
1223 1223 
 	}
1224 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1224 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1225 1225 
 		global $globalStatsFilters;
1226 1226 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1227 1227 
 		if ($year == '' && $month == '') {
 
@@ -1229,17 +1229,17 @@  discard block
 
 block discarded – undo
1229 1229 
 			try {
1230 1230 
 				$sth = $this->db->prepare($query);
1231 1231 
 				$sth->execute(array(':filter_name' => $filter_name));
1232 
-			} catch(PDOException $e) {
1232 
+			} catch (PDOException $e) {
1233 1233 
 				echo "error : ".$e->getMessage();
1234 1234 
 			}
1235 1235 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1236 
 			$all = $result[0]['nb_airline'];
1237 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1237 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1238 1238 
 		if (empty($all)) {
1239 1239 
 			$filters = array();
1240 
-			$filters = array('year' => $year,'month' => $month);
1240 
+			$filters = array('year' => $year, 'month' => $month);
1241 1241 
 			if ($filter_name != '') {
1242 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1242 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1243 1243 
 			}
1244 1244 
 			$Spotter = new Spotter($this->db);
1245 1245 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1247,29 +1247,29 @@  discard block
 
 block discarded – undo
1247 1247 
 		}
1248 1248 
 		return $all;
1249 1249 
 	}
1250 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1250 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1251 1251 
 		global $globalStatsFilters;
1252 1252 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1253 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1253 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1254 1254 
 			$Spotter = new Spotter($this->db);
1255 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1255 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1256 1256 
 			if ($year == '' && $month == '') {
1257 1257 
 				$alliance_airlines = array();
1258 1258 
 				foreach ($airlines as $airline) {
1259 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1259 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1260 1260 
 				}
1261 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1261 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1262 1262 
 				$query_values = array(':filter_name' => $filter_name);
1263 1263 
 				try {
1264 1264 
 					$sth = $this->db->prepare($query);
1265 1265 
 					$sth->execute($query_values);
1266 
-				} catch(PDOException $e) {
1266 
+				} catch (PDOException $e) {
1267 1267 
 					echo "error : ".$e->getMessage();
1268 1268 
 				}
1269 1269 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1270 1270 
 				$all = $result[0]['nb'];
1271 1271 
 			} else {
1272 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1272 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1273 1273 
 			}
1274 1274 
 		} else {
1275 1275 
 			if ($year == '' && $month == '') {
 
@@ -1278,23 +1278,23 @@  discard block
 
 block discarded – undo
1278 1278 
 				try {
1279 1279 
 					$sth = $this->db->prepare($query);
1280 1280 
 					$sth->execute($query_values);
1281 
-				} catch(PDOException $e) {
1281 
+				} catch (PDOException $e) {
1282 1282 
 					echo "error : ".$e->getMessage();
1283 1283 
 				}
1284 1284 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1285 1285 
 				$all = $result[0]['nb'];
1286 1286 
 			} else {
1287 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1287 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1288 1288 
 			}
1289 1289 
 		}
1290 1290 
 		if (empty($all)) {
1291 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1292 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1291 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1292 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1293 1293 
 			} else {
1294 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1294 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1295 1295 
 			}
1296 1296 
 			if ($filter_name != '') {
1297 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1297 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1298 1298 
 			}
1299 1299 
 			$Spotter = new Spotter($this->db);
1300 1300 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1302,7 +1302,7 @@  discard block
 
 block discarded – undo
1302 1302 
 		}
1303 1303 
 		return $all;
1304 1304 
 	}
1305 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1305 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1306 1306 
 		global $globalStatsFilters;
1307 1307 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1308 1308 
 		//if ($year == '') $year = date('Y');
 
@@ -1312,18 +1312,18 @@  discard block
 
 block discarded – undo
1312 1312 
 			try {
1313 1313 
 				$sth = $this->db->prepare($query);
1314 1314 
 				$sth->execute($query_values);
1315 
-			} catch(PDOException $e) {
1315 
+			} catch (PDOException $e) {
1316 1316 
 				echo "error : ".$e->getMessage();
1317 1317 
 			}
1318 1318 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1319 1319 
 			$all = $result[0]['nb'];
1320 1320 
 		} else {
1321 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1321 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1322 1322 
 		}
1323 1323 
 		if (empty($all)) {
1324 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1324 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1325 1325 
 			if ($filter_name != '') {
1326 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1326 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1327 1327 
 			}
1328 1328 
 			$Spotter = new Spotter($this->db);
1329 1329 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1332,104 +1332,104 @@  discard block
 
 block discarded – undo
1332 1332 
 		return $all;
1333 1333 
 	}
1334 1334
1335 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1335 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1336 1336 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1337 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1337 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 1338 
 			$Spotter = new Spotter($this->db);
1339 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1339 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1340 1340 
 			$alliance_airlines = array();
1341 1341 
 			foreach ($airlines as $airline) {
1342 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1342 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1343 1343 
 			}
1344 
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1344 
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1346 1346 
 		} else {
1347 1347 
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
1348 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1348 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1349 1349 
 		}
1350 1350 
 		try {
1351 1351 
 			$sth = $this->db->prepare($query);
1352 1352 
 			$sth->execute($query_values);
1353 
-		} catch(PDOException $e) {
1353 
+		} catch (PDOException $e) {
1354 1354 
 			echo "error : ".$e->getMessage();
1355 1355 
 		}
1356 1356 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1357 1357 
 		return $all;
1358 1358 
 	}
1359 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1359 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1360 1360 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1361 1361 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1362 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1363 
 		try {
1364 1364 
 			$sth = $this->db->prepare($query);
1365 1365 
 			$sth->execute($query_values);
1366 
-		} catch(PDOException $e) {
1366 
+		} catch (PDOException $e) {
1367 1367 
 			echo "error : ".$e->getMessage();
1368 1368 
 		}
1369 1369 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1370 
 		return $all;
1371 1371 
 	}
1372 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1372 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1373 1373 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1374 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1375 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1376 1376 
 		try {
1377 1377 
 			$sth = $this->db->prepare($query);
1378 1378 
 			$sth->execute($query_values);
1379 
-		} catch(PDOException $e) {
1379 
+		} catch (PDOException $e) {
1380 1380 
 			echo "error : ".$e->getMessage();
1381 1381 
 		}
1382 1382 
 	}
1383 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1383 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1384 1384 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1385 
 		global $globalArchiveMonths, $globalDBdriver;
1386 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1386 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1387 1387 
 			$Spotter = new Spotter($this->db);
1388 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1388 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389 
 			$alliance_airlines = array();
1390 1390 
 			foreach ($airlines as $airline) {
1391 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1391 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1392 1392 
 			}
1393 1393 
 			if ($globalDBdriver == 'mysql') {
1394 1394 
 				if ($month == '') {
1395 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1395 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1396 1396 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1397 1397 
 				} else {
1398 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1399 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1398 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1399 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1400 1400 
 				}
1401 1401 
 			} else {
1402 1402 
 				if ($month == '') {
1403 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1403 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1404 1404 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1405 1405 
 				} else {
1406 
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1407 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1406 
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1407 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1408 1408 
 				}
1409 1409 
 			}
1410 1410 
 		} else {
1411 1411 
 			if ($globalDBdriver == 'mysql') {
1412 1412 
 				if ($month == '') {
1413 1413 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1414 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1414 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1415 1415 
 				} else {
1416 1416 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1417 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1417 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1418 1418 
 				}
1419 1419 
 			} else {
1420 1420 
 				if ($month == '') {
1421 1421 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1422 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1423 1423 
 				} else {
1424 1424 
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1425 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1425 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1426 1426 
 				}
1427 1427 
 			}
1428 1428 
 		}
1429 1429 
 		try {
1430 1430 
 			$sth = $this->db->prepare($query);
1431 1431 
 			$sth->execute($query_values);
1432 
-		} catch(PDOException $e) {
1432 
+		} catch (PDOException $e) {
1433 1433 
 			echo "error : ".$e->getMessage();
1434 1434 
 		}
1435 1435 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1438,17 +1438,17 @@  discard block
 
 block discarded – undo
1438 1438 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1439 
 		global $globalArchiveMonths, $globalDBdriver;
1440 1440 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1441 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1441 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1442 1442 
 			$Spotter = new Spotter($this->db);
1443 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1443 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1444 1444 
 			$alliance_airlines = array();
1445 1445 
 			foreach ($airlines as $airline) {
1446 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1446 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1447 1447 
 			}
1448 1448 
 			if ($globalDBdriver == 'mysql') {
1449 
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1449 
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1450 1450 
 			} else {
1451 
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1451 
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1452 1452 
 			}
1453 1453 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1454 1454 
 		} else {
 
@@ -1462,7 +1462,7 @@  discard block
 
 block discarded – undo
1462 1462 
 		try {
1463 1463 
 			$sth = $this->db->prepare($query);
1464 1464 
 			$sth->execute($query_values);
1465 
-		} catch(PDOException $e) {
1465 
+		} catch (PDOException $e) {
1466 1466 
 			echo "error : ".$e->getMessage();
1467 1467 
 		}
1468 1468 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1471,17 +1471,17 @@  discard block
 
 block discarded – undo
1471 1471 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1472 
 		global $globalArchiveMonths, $globalDBdriver;
1473 1473 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1474 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1474 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1475 1475 
 			$Spotter = new Spotter($this->db);
1476 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1476 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1477 1477 
 			$alliance_airlines = array();
1478 1478 
 			foreach ($airlines as $airline) {
1479 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1479 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1480 1480 
 			}
1481 1481 
 			if ($globalDBdriver == 'mysql') {
1482 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1482 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1483 1483 
 			} else {
1484 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1484 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1485 1485 
 			}
1486 1486 
 		} else {
1487 1487 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1493,7 +1493,7 @@  discard block
 
 block discarded – undo
1493 1493 
 		try {
1494 1494 
 			$sth = $this->db->prepare($query);
1495 1495 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1496 
-		} catch(PDOException $e) {
1496 
+		} catch (PDOException $e) {
1497 1497 
 			echo "error : ".$e->getMessage();
1498 1498 
 		}
1499 1499 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1510,7 +1510,7 @@  discard block
 
 block discarded – undo
1510 1510 
 		try {
1511 1511 
 			$sth = $this->db->prepare($query);
1512 1512 
 			$sth->execute(array(':filter_name' => $filter_name));
1513 
-		} catch(PDOException $e) {
1513 
+		} catch (PDOException $e) {
1514 1514 
 			echo "error : ".$e->getMessage();
1515 1515 
 		}
1516 1516 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1527,20 +1527,20 @@  discard block
 
 block discarded – undo
1527 1527 
 		try {
1528 1528 
 			$sth = $this->db->prepare($query);
1529 1529 
 			$sth->execute(array(':filter_name' => $filter_name));
1530 
-		} catch(PDOException $e) {
1530 
+		} catch (PDOException $e) {
1531 1531 
 			echo "error : ".$e->getMessage();
1532 1532 
 		}
1533 1533 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1534 1534 
 		return $all[0]['total'];
1535 1535 
 	}
1536 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1536 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1537 1537 
 		global $globalArchiveMonths, $globalDBdriver;
1538 1538 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1539 1539 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1540 
 		try {
1541 1541 
 			$sth = $this->db->prepare($query);
1542 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1543 
-		} catch(PDOException $e) {
1542 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1543 
+		} catch (PDOException $e) {
1544 1544 
 			echo "error : ".$e->getMessage();
1545 1545 
 		}
1546 1546 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1558,20 +1558,20 @@  discard block
 
 block discarded – undo
1558 1558 
 		try {
1559 1559 
 			$sth = $this->db->prepare($query);
1560 1560 
 			$sth->execute(array(':filter_name' => $filter_name));
1561 
-		} catch(PDOException $e) {
1561 
+		} catch (PDOException $e) {
1562 1562 
 			echo "error : ".$e->getMessage();
1563 1563 
 		}
1564 1564 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1565 1565 
 		return $all[0]['total'];
1566 1566 
 	}
1567 
-	public function getStatsPilot($pilot,$filter_name = '') {
1567 
+	public function getStatsPilot($pilot, $filter_name = '') {
1568 1568 
 		global $globalArchiveMonths, $globalDBdriver;
1569 1569 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1570 1570 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1571 
 		try {
1572 1572 
 			$sth = $this->db->prepare($query);
1573 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1574 
-		} catch(PDOException $e) {
1573 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1574 
+		} catch (PDOException $e) {
1575 1575 
 			echo "error : ".$e->getMessage();
1576 1576 
 		}
1577 1577 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1579,7 +1579,7 @@  discard block
 
 block discarded – undo
1579 1579 
 		else return 0;
1580 1580 
 	}
1581 1581
1582 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1582 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1583 1583 
 		global $globalDBdriver;
1584 1584 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1587,15 +1587,15 @@  discard block
 
 block discarded – undo
1587 1587 
 		} else {
1588 1588 
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1589 1589 
 		}
1590 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1590 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1591 1591 
 		try {
1592 1592 
 			$sth = $this->db->prepare($query);
1593 1593 
 			$sth->execute($query_values);
1594 
-		} catch(PDOException $e) {
1594 
+		} catch (PDOException $e) {
1595 1595 
 			return "error : ".$e->getMessage();
1596 1596 
 		}
1597 1597 
 	}
1598 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1598 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1599 1599 
 		global $globalDBdriver;
1600 1600 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1601 1601 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1604,11 +1604,11 @@  discard block
 
 block discarded – undo
1604 1604 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1605 1605 
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1606 1606 
 		}
1607 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1607 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1608 1608 
 		try {
1609 1609 
 			$sth = $this->db->prepare($query);
1610 1610 
 			$sth->execute($query_values);
1611 
-		} catch(PDOException $e) {
1611 
+		} catch (PDOException $e) {
1612 1612 
 			return "error : ".$e->getMessage();
1613 1613 
 		}
1614 1614 
 	}
 
@@ -1632,75 +1632,75 @@  discard block
 
 block discarded – undo
1632 1632 
         }
1633 1633 
         */
1634 1634
1635 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1635 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1636 1636 
 		global $globalDBdriver;
1637 1637 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1638 1638 
 		$query_values = array();
1639 1639 
 		if ($globalDBdriver == 'mysql') {
1640 1640 
 			if ($year != '') {
1641 1641 
 				$query .= ' AND YEAR(stats_date) = :year';
1642 
-				$query_values = array_merge($query_values,array(':year' => $year));
1642 
+				$query_values = array_merge($query_values, array(':year' => $year));
1643 1643 
 			}
1644 1644 
 			if ($month != '') {
1645 1645 
 				$query .= ' AND MONTH(stats_date) = :month';
1646 
-				$query_values = array_merge($query_values,array(':month' => $month));
1646 
+				$query_values = array_merge($query_values, array(':month' => $month));
1647 1647 
 			}
1648 1648 
 			if ($day != '') {
1649 1649 
 				$query .= ' AND DAY(stats_date) = :day';
1650 
-				$query_values = array_merge($query_values,array(':day' => $day));
1650 
+				$query_values = array_merge($query_values, array(':day' => $day));
1651 1651 
 			}
1652 1652 
 		} else {
1653 1653 
 			if ($year != '') {
1654 1654 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1655 
-				$query_values = array_merge($query_values,array(':year' => $year));
1655 
+				$query_values = array_merge($query_values, array(':year' => $year));
1656 1656 
 			}
1657 1657 
 			if ($month != '') {
1658 1658 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1659 
-				$query_values = array_merge($query_values,array(':month' => $month));
1659 
+				$query_values = array_merge($query_values, array(':month' => $month));
1660 1660 
 			}
1661 1661 
 			if ($day != '') {
1662 1662 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1663 
-				$query_values = array_merge($query_values,array(':day' => $day));
1663 
+				$query_values = array_merge($query_values, array(':day' => $day));
1664 1664 
 			}
1665 1665 
 		}
1666 1666 
 		$query .= " ORDER BY source_name";
1667 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1667 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1668 1668 
 		try {
1669 1669 
 			$sth = $this->db->prepare($query);
1670 1670 
 			$sth->execute($query_values);
1671 
-		} catch(PDOException $e) {
1671 
+		} catch (PDOException $e) {
1672 1672 
 			echo "error : ".$e->getMessage();
1673 1673 
 		}
1674 1674 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1675 1675 
 		return $all;
1676 1676 
 	}
1677 1677
1678 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1678 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1679 1679 
 		global $globalDBdriver;
1680 1680 
 		if ($globalDBdriver == 'mysql') {
1681 1681 
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1682 1682 
 		} else {
1683 1683 
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);";
1684 1684 
 		}
1685 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1685 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1686 1686 
 		try {
1687 1687 
 			$sth = $this->db->prepare($query);
1688 1688 
 			$sth->execute($query_values);
1689 
-		} catch(PDOException $e) {
1689 
+		} catch (PDOException $e) {
1690 1690 
 			return "error : ".$e->getMessage();
1691 1691 
 		}
1692 1692 
 	}
1693 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1693 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1694 1694 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1695 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1696 1696 
 		try {
1697 1697 
 			$sth = $this->db->prepare($query);
1698 1698 
 			$sth->execute($query_values);
1699 
-		} catch(PDOException $e) {
1699 
+		} catch (PDOException $e) {
1700 1700 
 			return "error : ".$e->getMessage();
1701 1701 
 		}
1702 1702 
 	}
1703 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1703 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1704 1704 
 		global $globalDBdriver;
1705 1705 
 		if ($globalDBdriver == 'mysql') {
1706 1706 
 			if ($reset) {
 
@@ -1715,15 +1715,15 @@  discard block
 
 block discarded – undo
1715 1715 
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1716 1716 
 			}
1717 1717 
 		}
1718 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1718 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1719 1719 
 		try {
1720 1720 
 			$sth = $this->db->prepare($query);
1721 1721 
 			$sth->execute($query_values);
1722 
-		} catch(PDOException $e) {
1722 
+		} catch (PDOException $e) {
1723 1723 
 			return "error : ".$e->getMessage();
1724 1724 
 		}
1725 1725 
 	}
1726 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1726 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1727 1727 
 		global $globalDBdriver;
1728 1728 
 		if ($globalDBdriver == 'mysql') {
1729 1729 
 			if ($reset) {
 
@@ -1738,15 +1738,15 @@  discard block
 
 block discarded – undo
1738 1738 
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);";
1739 1739 
 			}
1740 1740 
 		}
1741 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1741 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1742 1742 
 		try {
1743 1743 
 			$sth = $this->db->prepare($query);
1744 1744 
 			$sth->execute($query_values);
1745 
-		} catch(PDOException $e) {
1745 
+		} catch (PDOException $e) {
1746 1746 
 			return "error : ".$e->getMessage();
1747 1747 
 		}
1748 1748 
 	}
1749 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1749 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1750 1750 
 		global $globalDBdriver;
1751 1751 
 		if ($globalDBdriver == 'mysql') {
1752 1752 
 			if ($reset) {
 
@@ -1761,15 +1761,15 @@  discard block
 
 block discarded – undo
1761 1761 
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);";
1762 1762 
 			}
1763 1763 
 		}
1764 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1764 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1765 1765 
 		try {
1766 1766 
 			$sth = $this->db->prepare($query);
1767 1767 
 			$sth->execute($query_values);
1768 
-		} catch(PDOException $e) {
1768 
+		} catch (PDOException $e) {
1769 1769 
 			return "error : ".$e->getMessage();
1770 1770 
 		}
1771 1771 
 	}
1772 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1772 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1773 1773 
 		global $globalDBdriver;
1774 1774 
 		if ($globalDBdriver == 'mysql') {
1775 1775 
 			if ($reset) {
 
@@ -1784,15 +1784,15 @@  discard block
 
 block discarded – undo
1784 1784 
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1785 1785 
 			}
1786 1786 
 		}
1787 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1787 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1788 1788 
 		try {
1789 1789 
 			$sth = $this->db->prepare($query);
1790 1790 
 			$sth->execute($query_values);
1791 
-		} catch(PDOException $e) {
1791 
+		} catch (PDOException $e) {
1792 1792 
 			return "error : ".$e->getMessage();
1793 1793 
 		}
1794 1794 
 	}
1795 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1795 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1796 1796 
 		global $globalDBdriver;
1797 1797 
 		if ($globalDBdriver == 'mysql') {
1798 1798 
 			if ($reset) {
 
@@ -1807,15 +1807,15 @@  discard block
 
 block discarded – undo
1807 1807 
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);";
1808 1808 
 			}
1809 1809 
 		}
1810 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1810 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1811 1811 
 		try {
1812 1812 
 			$sth = $this->db->prepare($query);
1813 1813 
 			$sth->execute($query_values);
1814 
-		} catch(PDOException $e) {
1814 
+		} catch (PDOException $e) {
1815 1815 
 			return "error : ".$e->getMessage();
1816 1816 
 		}
1817 1817 
 	}
1818 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1818 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1819 1819 
 		global $globalDBdriver;
1820 1820 
 		if ($globalDBdriver == 'mysql') {
1821 1821 
 			if ($reset) {
 
@@ -1830,15 +1830,15 @@  discard block
 
 block discarded – undo
1830 1830 
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1831 1831 
 			}
1832 1832 
 		}
1833 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1833 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1834 1834 
 		try {
1835 1835 
 			$sth = $this->db->prepare($query);
1836 1836 
 			$sth->execute($query_values);
1837 
-		} catch(PDOException $e) {
1837 
+		} catch (PDOException $e) {
1838 1838 
 			return "error : ".$e->getMessage();
1839 1839 
 		}
1840 1840 
 	}
1841 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1841 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1842 1842 
 		global $globalDBdriver;
1843 1843 
 		if ($globalDBdriver == 'mysql') {
1844 1844 
 			if ($reset) {
 
@@ -1853,15 +1853,15 @@  discard block
 
 block discarded – undo
1853 1853 
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);";
1854 1854 
 			}
1855 1855 
 		}
1856 
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1856 
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
1857 1857 
 		try {
1858 1858 
 			$sth = $this->db->prepare($query);
1859 1859 
 			$sth->execute($query_values);
1860 
-		} catch(PDOException $e) {
1860 
+		} catch (PDOException $e) {
1861 1861 
 			return "error : ".$e->getMessage();
1862 1862 
 		}
1863 1863 
 	}
1864 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1864 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1865 1865 
 		global $globalDBdriver;
1866 1866 
 		if ($airport_icao != '') {
1867 1867 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1877,16 +1877,16 @@  discard block
 
 block discarded – undo
1877 1877 
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
1878 1878 
 				}
1879 1879 
 			}
1880 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1880 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1881 1881 
 			try {
1882 1882 
 				$sth = $this->db->prepare($query);
1883 1883 
 				$sth->execute($query_values);
1884 
-			} catch(PDOException $e) {
1884 
+			} catch (PDOException $e) {
1885 1885 
 				return "error : ".$e->getMessage();
1886 1886 
 			}
1887 1887 
 		}
1888 1888 
 	}
1889 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1889 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1890 1890 
 		global $globalDBdriver;
1891 1891 
 		if ($airport_icao != '') {
1892 1892 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1894,16 +1894,16 @@  discard block
 
 block discarded – undo
1894 1894 
 			} else {
1895 1895 
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1896 1896 
 			}
1897 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1897 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1898 1898 
 			 try {
1899 1899 
 				$sth = $this->db->prepare($query);
1900 1900 
 				$sth->execute($query_values);
1901 
-			} catch(PDOException $e) {
1901 
+			} catch (PDOException $e) {
1902 1902 
 				return "error : ".$e->getMessage();
1903 1903 
 			}
1904 1904 
 		}
1905 1905 
 	}
1906 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1906 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1907 1907 
 		global $globalDBdriver;
1908 1908 
 		if ($airport_icao != '') {
1909 1909 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1919,16 +1919,16 @@  discard block
 
 block discarded – undo
1919 1919 
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);";
1920 1920 
 				}
1921 1921 
 			}
1922 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1922 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1923 1923 
 			try {
1924 1924 
 				$sth = $this->db->prepare($query);
1925 1925 
 				$sth->execute($query_values);
1926 
-			} catch(PDOException $e) {
1926 
+			} catch (PDOException $e) {
1927 1927 
 				return "error : ".$e->getMessage();
1928 1928 
 			}
1929 1929 
 		}
1930 1930 
 	}
1931 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1931 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1932 1932 
 		global $globalDBdriver;
1933 1933 
 		if ($airport_icao != '') {
1934 1934 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1936,11 +1936,11 @@  discard block
 
 block discarded – undo
1936 1936 
 			} else {
1937 1937 
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);";
1938 1938 
 			}
1939 
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1939 
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1940 1940 
 			try {
1941 1941 
 				$sth = $this->db->prepare($query);
1942 1942 
 				$sth->execute($query_values);
1943 
-			} catch(PDOException $e) {
1943 
+			} catch (PDOException $e) {
1944 1944 
 				return "error : ".$e->getMessage();
1945 1945 
 			}
1946 1946 
 		}
 
@@ -1952,7 +1952,7 @@  discard block
 
 block discarded – undo
1952 1952 
 		try {
1953 1953 
 			$sth = $this->db->prepare($query);
1954 1954 
 			$sth->execute($query_values);
1955 
-		} catch(PDOException $e) {
1955 
+		} catch (PDOException $e) {
1956 1956 
 			return "error : ".$e->getMessage();
1957 1957 
 		}
1958 1958 
 	}
 
@@ -1962,7 +1962,7 @@  discard block
 
 block discarded – undo
1962 1962 
 		try {
1963 1963 
 			$sth = $this->db->prepare($query);
1964 1964 
 			$sth->execute($query_values);
1965 
-		} catch(PDOException $e) {
1965 
+		} catch (PDOException $e) {
1966 1966 
 			return "error : ".$e->getMessage();
1967 1967 
 		}
1968 1968 
 	}
 
@@ -1972,13 +1972,13 @@  discard block
 
 block discarded – undo
1972 1972 
 		try {
1973 1973 
 			$sth = $this->db->prepare($query);
1974 1974 
 			$sth->execute($query_values);
1975 
-		} catch(PDOException $e) {
1975 
+		} catch (PDOException $e) {
1976 1976 
 			return "error : ".$e->getMessage();
1977 1977 
 		}
1978 1978 
 	}
1979 1979
1980 1980 
 	public function addOldStats() {
1981 
-		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1981 
+		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1982 1982 
 		$Common = new Common();
1983 1983 
 		$Connection = new Connection($this->db);
1984 1984 
 		date_default_timezone_set('UTC');
 
@@ -1996,41 +1996,41 @@  discard block
 
 block discarded – undo
1996 1996 
 			$Spotter = new Spotter($this->db);
1997 1997
1998 1998 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1999 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1999 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2000 2000 
 			foreach ($alldata as $number) {
2001 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2001 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2002 2002 
 			}
2003 2003 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2004 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2004 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2005 2005 
 			foreach ($alldata as $number) {
2006 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2006 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2007 2007 
 			}
2008 2008 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2009 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2009 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2010 2010 
 			foreach ($alldata as $number) {
2011 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2011 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2012 2012 
 			}
2013 2013 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2014 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2014 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2015 2015 
 			foreach ($alldata as $number) {
2016 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2016 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2017 2017 
 			}
2018 2018 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2019 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2019 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2020 2020 
 			foreach ($alldata as $number) {
2021 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2021 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2022 2022 
 			}
2023 2023 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2024 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2024 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2025 2025 
 			foreach ($alldata as $number) {
2026 2026 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2027 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2027 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2028 2028 
 			}
2029 2029
2030 2030 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2031 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2031 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2032 2032 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2033 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2033 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2034 2034 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2035 2035 
 			$alldata = array();
2036 2036 
 			foreach ($pall as $value) {
 
@@ -2047,14 +2047,14 @@  discard block
 
 block discarded – undo
2047 2047 
 			foreach ($alldata as $key => $row) {
2048 2048 
 				$count[$key] = $row['airport_departure_icao_count'];
2049 2049 
 			}
2050 
-			array_multisort($count,SORT_DESC,$alldata);
2050 
+			array_multisort($count, SORT_DESC, $alldata);
2051 2051 
 			foreach ($alldata as $number) {
2052 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2052 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
2053 2053 
 			}
2054 2054 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2055 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2055 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2056 2056 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2057 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2057 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2058 2058 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2059 2059 
 			$alldata = array();
2060 2060 
 			foreach ($pall as $value) {
 
@@ -2071,18 +2071,18 @@  discard block
 
 block discarded – undo
2071 2071 
 			foreach ($alldata as $key => $row) {
2072 2072 
 				$count[$key] = $row['airport_arrival_icao_count'];
2073 2073 
 			}
2074 
-			array_multisort($count,SORT_DESC,$alldata);
2074 
+			array_multisort($count, SORT_DESC, $alldata);
2075 2075 
 			foreach ($alldata as $number) {
2076 
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2076 
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
2077 2077 
 			}
2078 2078 
 			if ($Connection->tableExists('countries')) {
2079 2079 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2080 2080 
 				//$SpotterArchive = new SpotterArchive();
2081 2081 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2082 
 				$Spotter = new Spotter($this->db);
2083 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2083 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2084 2084 
 				foreach ($alldata as $number) {
2085 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2085 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2086 2086 
 				}
2087 2087 
 			}
2088 2088 
 			
@@ -2092,12 +2092,12 @@  discard block
 
 block discarded – undo
2092 2092 
 				$this->deleteStatsByType('fatalities_byyear');
2093 2093 
 				$alldata = $Accident->countFatalitiesByYear();
2094 2094 
 				foreach ($alldata as $number) {
2095 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2095 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2096 2096 
 				}
2097 2097 
 				$this->deleteStatsByType('fatalities_bymonth');
2098 2098 
 				$alldata = $Accident->countFatalitiesLast12Months();
2099 2099 
 				foreach ($alldata as $number) {
2100 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2100 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2101 2101 
 				}
2102 2102 
 			}
2103 2103 
 
@@ -2111,37 +2111,37 @@  discard block
 
 block discarded – undo
2111 2111 
 			$lastyear = false;
2112 2112 
 			foreach ($alldata as $number) {
2113 2113 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2114 
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2114 
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2115 2115 
 			}
2116 2116 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2117 2117 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2118 
 			foreach ($alldata as $number) {
2119 
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2119 
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2120 2120 
 			}
2121 2121 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2122 2122 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2123 
 			foreach ($alldata as $number) {
2124 
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2124 
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2125 2125 
 			}
2126 2126 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2127 2127 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2128 
 			foreach ($alldata as $number) {
2129 
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2129 
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2130 2130 
 			}
2131 2131 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2132 2132 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2133 
 			foreach ($alldata as $number) {
2134 
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2134 
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2135 2135 
 			}
2136 2136 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2137 2137 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2138 
 			foreach ($alldata as $number) {
2139 
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2139 
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2140 2140 
 			}
2141 2141 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2142 2142 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2143 
 			foreach ($alldata as $number) {
2144 
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2144 
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2145 2145 
 			}
2146 2146 
 			if ($globalDebug) echo 'Airports data...'."\n";
2147 2147 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2186,7 +2186,7 @@  discard block
 
 block discarded – undo
2186 2186 
 			}
2187 2187 
 			$alldata = $pall;
2188 2188 
 			foreach ($alldata as $number) {
2189 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2189 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2190 2190 
 			}
2191 2191 
 			echo '...Arrival'."\n";
2192 2192 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2227,7 +2227,7 @@  discard block
 
 block discarded – undo
2227 2227 
 			}
2228 2228 
 			$alldata = $pall;
2229 2229 
 			foreach ($alldata as $number) {
2230 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2230 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2231 2231 
 			}
2232 2232
2233 2233 
 			echo 'Flights data...'."\n";
 
@@ -2235,28 +2235,28 @@  discard block
 
 block discarded – undo
2235 2235 
 			echo '-> countAllDatesLastMonth...'."\n";
2236 2236 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2237 2237 
 			foreach ($alldata as $number) {
2238 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2238 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2239 2239 
 			}
2240 2240 
 			echo '-> countAllDates...'."\n";
2241 2241 
 			$previousdata = $this->countAllDates();
2242 2242 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2243 2243 
 			$this->deleteStatFlight('date');
2244 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2244 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2245 2245 
 			$values = array();
2246 2246 
 			foreach ($alldata as $cnt) {
2247 2247 
 				$values[] = $cnt['date_count'];
2248 2248 
 			}
2249 
-			array_multisort($values,SORT_DESC,$alldata);
2250 
-			array_splice($alldata,11);
2249 
+			array_multisort($values, SORT_DESC, $alldata);
2250 
+			array_splice($alldata, 11);
2251 2251 
 			foreach ($alldata as $number) {
2252 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2252 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2253 2253 
 			}
2254 2254
2255 2255 
 			$this->deleteStatFlight('hour');
2256 2256 
 			echo '-> countAllHours...'."\n";
2257 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2257 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2258 2258 
 			foreach ($alldata as $number) {
2259 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2259 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2260 2260 
 			}
2261 2261
2262 2262 
 			// Count by airlines
 
@@ -2265,42 +2265,42 @@  discard block
 
 block discarded – undo
2265 2265 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2266 2266 
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2267 
 				//$Spotter = new Spotter($this->db);
2268 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2268 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2269 2269 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2270 2270 
 				foreach ($alldata as $number) {
2271 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2271 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2272 2272 
 				}
2273 2273 
 			}
2274 2274 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2275 2275 
 			$Spotter = new Spotter($this->db);
2276 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2276 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2277 2277 
 			foreach ($alldata as $number) {
2278 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2278 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2279 2279 
 			}
2280 2280 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2281 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2281 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2282 2282 
 			foreach ($alldata as $number) {
2283 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2283 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2284 2284 
 			}
2285 2285 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2286 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2286 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2287 2287 
 			foreach ($alldata as $number) {
2288 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2288 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2289 2289 
 			}
2290 2290 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2291 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2291 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2292 2292 
 			foreach ($alldata as $number) {
2293 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2293 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2294 2294 
 			}
2295 2295 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2296 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2296 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2297 2297 
 			foreach ($alldata as $number) {
2298 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2298 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2299 2299 
 			}
2300 2300 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2301 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2301 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2302 2302 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2303 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2303 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2304 2304 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2305 2305 
 			//$alldata = array();
2306 2306 
 			foreach ($dall as $value) {
 
@@ -2320,12 +2320,12 @@  discard block
 
 block discarded – undo
2320 2320 
 			}
2321 2321 
 			$alldata = $pall;
2322 2322 
 			foreach ($alldata as $number) {
2323 
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2323 
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
2324 2324 
 			}
2325 2325 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2326 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2326 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2327 2327 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2328 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2328 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2329 2329 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2330 2330 
 			//$alldata = array();
2331 2331 
 			foreach ($dall as $value) {
 
@@ -2345,7 +2345,7 @@  discard block
 
 block discarded – undo
2345 2345 
 			}
2346 2346 
 			$alldata = $pall;
2347 2347 
 			foreach ($alldata as $number) {
2348 
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2348 
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
2349 2349 
 			}
2350 2350 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2351 
 			$Spotter = new Spotter($this->db);
 
@@ -2353,27 +2353,27 @@  discard block
 
 block discarded – undo
2353 2353 
 			$lastyear = false;
2354 2354 
 			foreach ($alldata as $number) {
2355 2355 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2356 
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2356 
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2357 2357 
 			}
2358 2358 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2359 2359 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2360 
 			foreach ($alldata as $number) {
2361 
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2361 
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2362 2362 
 			}
2363 2363 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2364 2364 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2365 
 			foreach ($alldata as $number) {
2366 
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2366 
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2367 2367 
 			}
2368 2368 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2369 2369 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2370 
 			foreach ($alldata as $number) {
2371 
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2371 
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2372 2372 
 			}
2373 2373 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2374 2374 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2375 
 			foreach ($alldata as $number) {
2376 
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2376 
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2377 2377 
 			}
2378 2378 
 			if ($globalDebug) echo '...Departure'."\n";
2379 2379 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -2396,7 +2396,7 @@  discard block
 
 block discarded – undo
2396 2396 
 			}
2397 2397 
 			$alldata = $pall;
2398 2398 
 			foreach ($alldata as $number) {
2399 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
2399 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
2400 2400 
 			}
2401 2401 
 			if ($globalDebug) echo '...Arrival'."\n";
2402 2402 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -2419,32 +2419,32 @@  discard block
 
 block discarded – undo
2419 2419 
 			}
2420 2420 
 			$alldata = $pall;
2421 2421 
 			foreach ($alldata as $number) {
2422 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
2422 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
2423 2423 
 			}
2424 2424
2425 2425 
 			if ($globalDebug) echo 'Flights data...'."\n";
2426 2426 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2427 2427 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2428 
 			foreach ($alldata as $number) {
2429 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2429 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2430 2430 
 			}
2431 2431 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2432 2432 
 			//$previousdata = $this->countAllDatesByAirlines();
2433 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2433 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2434 2434 
 			$values = array();
2435 2435 
 			foreach ($alldata as $cnt) {
2436 2436 
 				$values[] = $cnt['date_count'];
2437 2437 
 			}
2438 
-			array_multisort($values,SORT_DESC,$alldata);
2439 
-			array_splice($alldata,11);
2438 
+			array_multisort($values, SORT_DESC, $alldata);
2439 
+			array_splice($alldata, 11);
2440 2440 
 			foreach ($alldata as $number) {
2441 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2441 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2442 2442 
 			}
2443 2443
2444 2444 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2445 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2445 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2446 2446 
 			foreach ($alldata as $number) {
2447 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2447 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2448 2448 
 			}
2449 2449
2450 2450 
 			// Stats by filters
 
@@ -2468,7 +2468,7 @@  discard block
 
 block discarded – undo
2468 2468 
 							$last_update_day = date('Y').'-01-01 00:00:00';
2469 2469 
 						}
2470 2470 
 					}
2471 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2471 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2472 2472 
 						$last_update_day = date('Y').'-01-01 00:00:00';
2473 2473 
 						$reset = true;
2474 2474 
 					}
 
@@ -2476,38 +2476,38 @@  discard block
 
 block discarded – undo
2476 2476 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2477 2477 
 					$Spotter = new Spotter($this->db);
2478 2478 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2479 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2479 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2480 2480 
 					foreach ($alldata as $number) {
2481 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2481 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2482 2482 
 					}
2483 2483 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
2484 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2484 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2485 2485 
 					foreach ($alldata as $number) {
2486 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2486 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2487 2487 
 					}
2488 2488 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2489 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2489 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2490 2490 
 					foreach ($alldata as $number) {
2491 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2491 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2492 2492 
 					}
2493 2493 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
2494 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2494 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2495 2495 
 					foreach ($alldata as $number) {
2496 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2496 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2497 2497 
 					}
2498 2498 
 					if ($globalDebug) echo 'Count all owners...'."\n";
2499 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2499 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2500 2500 
 					foreach ($alldata as $number) {
2501 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2501 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2502 2502 
 					}
2503 2503 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
2504 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2504 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2505 2505 
 					foreach ($alldata as $number) {
2506 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2506 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2507 2507 
 					}
2508 2508 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
2509 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2510 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2509 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2510 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2511 2511 
 					$alldata = array();
2512 2512 
 					foreach ($pall as $value) {
2513 2513 
 						$icao = $value['airport_departure_icao'];
 
@@ -2523,13 +2523,13 @@  discard block
 
 block discarded – undo
2523 2523 
 					foreach ($alldata as $key => $row) {
2524 2524 
 						$count[$key] = $row['airport_departure_icao_count'];
2525 2525 
 					}
2526 
-					array_multisort($count,SORT_DESC,$alldata);
2526 
+					array_multisort($count, SORT_DESC, $alldata);
2527 2527 
 					foreach ($alldata as $number) {
2528 
-						echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset);
2528 
+						echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset);
2529 2529 
 					}
2530 2530 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2531 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2532 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2531 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2532 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2533 2533 
 					$alldata = array();
2534 2534 
 					foreach ($pall as $value) {
2535 2535 
 						$icao = $value['airport_arrival_icao'];
 
@@ -2545,9 +2545,9 @@  discard block
 
 block discarded – undo
2545 2545 
 					foreach ($alldata as $key => $row) {
2546 2546 
 						$count[$key] = $row['airport_arrival_icao_count'];
2547 2547 
 					}
2548 
-					array_multisort($count,SORT_DESC,$alldata);
2548 
+					array_multisort($count, SORT_DESC, $alldata);
2549 2549 
 					foreach ($alldata as $number) {
2550 
-						echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset);
2550 
+						echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset);
2551 2551 
 					}
2552 2552 
 					if ($globalDebug) echo 'Count all months...'."\n";
2553 2553 
 					$Spotter = new Spotter($this->db);
 
@@ -2555,36 +2555,36 @@  discard block
 
 block discarded – undo
2555 2555 
 					$lastyear = false;
2556 2556 
 					foreach ($alldata as $number) {
2557 2557 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
2558 
-						$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);
2558 
+						$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);
2559 2559 
 					}
2560 2560 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
2561 2561 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2562 2562 
 					foreach ($alldata as $number) {
2563 
-						$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);
2563 
+						$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);
2564 2564 
 					}
2565 2565 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2566 2566 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2567 2567 
 					foreach ($alldata as $number) {
2568 
-						$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);
2568 
+						$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);
2569 2569 
 					}
2570 2570 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
2571 2571 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2572 2572 
 					foreach ($alldata as $number) {
2573 
-						$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);
2573 
+						$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);
2574 2574 
 					}
2575 2575 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2576 2576 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 2577 
 				    	foreach ($alldata as $number) {
2578 
-			    			$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);
2578 
+			    			$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);
2579 2579 
 					}
2580 2580 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2581 2581 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2582 2582 
 					foreach ($alldata as $number) {
2583 
-						$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);
2583 
+						$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);
2584 2584 
 					}
2585 2585 
 					echo '...Departure'."\n";
2586 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2587 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2586 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2587 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2588 2588 
 					foreach ($dall as $value) {
2589 2589 
 						$icao = $value['departure_airport_icao'];
2590 2590 
 						$ddate = $value['date'];
 
@@ -2602,11 +2602,11 @@  discard block
 
 block discarded – undo
2602 2602 
 					}
2603 2603 
 					$alldata = $pall;
2604 2604 
 					foreach ($alldata as $number) {
2605 
-						$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);
2605 
+						$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);
2606 2606 
 					}
2607 2607 
 					echo '...Arrival'."\n";
2608 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2609 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2608 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2609 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2610 2610 
 					foreach ($dall as $value) {
2611 2611 
 						$icao = $value['arrival_airport_icao'];
2612 2612 
 						$ddate = $value['date'];
 
@@ -2624,39 +2624,39 @@  discard block
 
 block discarded – undo
2624 2624 
 					}
2625 2625 
 					$alldata = $pall;
2626 2626 
 					foreach ($alldata as $number) {
2627 
-						$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);
2627 
+						$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);
2628 2628 
 					}
2629 2629 
 					echo 'Flights data...'."\n";
2630 2630 
 					echo '-> countAllDatesLastMonth...'."\n";
2631 2631 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
2632 2632 
 					foreach ($alldata as $number) {
2633 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2633 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2634 2634 
 					}
2635 2635 
 					echo '-> countAllDates...'."\n";
2636 
-					$previousdata = $this->countAllDates('',$filter_name);
2637 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2636 
+					$previousdata = $this->countAllDates('', $filter_name);
2637 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2638 2638 
 					$values = array();
2639 2639 
 					foreach ($alldata as $cnt) {
2640 2640 
 						$values[] = $cnt['date_count'];
2641 2641 
 					}
2642 
-					array_multisort($values,SORT_DESC,$alldata);
2643 
-					array_splice($alldata,11);
2642 
+					array_multisort($values, SORT_DESC, $alldata);
2643 
+					array_splice($alldata, 11);
2644 2644 
 					foreach ($alldata as $number) {
2645 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2645 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2646 2646 
 					}
2647 2647
2648 2648 
 					echo '-> countAllHours...'."\n";
2649 
-					$alldata = $Spotter->countAllHours('hour',$filter);
2649 
+					$alldata = $Spotter->countAllHours('hour', $filter);
2650 2650 
 					foreach ($alldata as $number) {
2651 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2651 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2652 2652 
 					}
2653 2653 
 					echo 'Insert last stats update date...'."\n";
2654 2654 
 					date_default_timezone_set('UTC');
2655 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2655 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2656 2656 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2657 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
2657 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
2658 2658 
 							$this->deleteOldStats($filter_name);
2659 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2659 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2660 2660 
 						}
2661 2661 
 					}
2662 2662 
 				}
 
@@ -2668,16 +2668,16 @@  discard block
 
 block discarded – undo
2668 2668 
 				// SUM all previous month to put as year
2669 2669 
 				$previous_year = date('Y');
2670 2670 
 				$previous_year--;
2671 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2672 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2673 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2674 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2671 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2672 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2673 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2674 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2675 2675 
 				$allairlines = $this->getAllAirlineNames();
2676 2676 
 				foreach ($allairlines as $data) {
2677 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2678 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2679 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2680 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2677 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2678 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2679 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2680 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2681 2681 
 				}
2682 2682
2683 2683 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -2686,21 +2686,21 @@  discard block
 
 block discarded – undo
2686 2686 
 						try {
2687 2687 
 							$sth = $this->db->prepare($query);
2688 2688 
 							$sth->execute();
2689 
-						} catch(PDOException $e) {
2689 
+						} catch (PDOException $e) {
2690 2690 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2691 2691 
 						}
2692 2692 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
2693 2693 
 						try {
2694 2694 
 							$sth = $this->db->prepare($query);
2695 2695 
 							$sth->execute();
2696 
-						} catch(PDOException $e) {
2696 
+						} catch (PDOException $e) {
2697 2697 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2698 2698 
 						}
2699 2699 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
2700 2700 
 						try {
2701 2701 
 							$sth = $this->db->prepare($query);
2702 2702 
 							$sth->execute();
2703 
-						} catch(PDOException $e) {
2703 
+						} catch (PDOException $e) {
2704 2704 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2705 2705 
 						}
2706 2706 
 					}
 
@@ -2713,7 +2713,7 @@  discard block
 
 block discarded – undo
2713 2713 
 					try {
2714 2714 
 						$sth = $this->db->prepare($query);
2715 2715 
 						$sth->execute();
2716 
-					} catch(PDOException $e) {
2716 
+					} catch (PDOException $e) {
2717 2717 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2718 2718 
 					}
2719 2719 
 					if ($globalDBdriver == 'mysql') {
 
@@ -2724,7 +2724,7 @@  discard block
 
 block discarded – undo
2724 2724 
 					try {
2725 2725 
 						$sth = $this->db->prepare($query);
2726 2726 
 						$sth->execute();
2727 
-					} catch(PDOException $e) {
2727 
+					} catch (PDOException $e) {
2728 2728 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2729 2729 
 					}
2730 2730 
 					if ($globalDBdriver == 'mysql') {
 
@@ -2735,15 +2735,15 @@  discard block
 
 block discarded – undo
2735 2735 
 					try {
2736 2736 
 						$sth = $this->db->prepare($query);
2737 2737 
 						$sth->execute();
2738 
-					} catch(PDOException $e) {
2738 
+					} catch (PDOException $e) {
2739 2739 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2740 2740 
 					}
2741 2741 
 				}
2742 2742 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2743 2743 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2744 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2744 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2745 2745 
 						$this->deleteOldStats();
2746 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2746 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2747 2747 
 						$lastyearupdate = true;
2748 2748 
 					}
2749 2749 
 				}
 
@@ -2765,7 +2765,7 @@  discard block
 
 block discarded – undo
2765 2765 
 					try {
2766 2766 
 						$sth = $this->db->prepare($query);
2767 2767 
 						$sth->execute();
2768 
-					} catch(PDOException $e) {
2768 
+					} catch (PDOException $e) {
2769 2769 
 						return "error : ".$e->getMessage();
2770 2770 
 					}
2771 2771 
 					echo 'Archive old tracker data...'."\n";
 
@@ -2781,7 +2781,7 @@  discard block
 
 block discarded – undo
2781 2781 
 					try {
2782 2782 
 						$sth = $this->db->prepare($query);
2783 2783 
 						$sth->execute();
2784 
-					} catch(PDOException $e) {
2784 
+					} catch (PDOException $e) {
2785 2785 
 						return "error : ".$e->getMessage();
2786 2786 
 					}
2787 2787 
 					echo 'Archive old marine data...'."\n";
 
@@ -2797,7 +2797,7 @@  discard block
 
 block discarded – undo
2797 2797 
 					try {
2798 2798 
 						$sth = $this->db->prepare($query);
2799 2799 
 						$sth->execute();
2800 
-					} catch(PDOException $e) {
2800 
+					} catch (PDOException $e) {
2801 2801 
 						return "error : ".$e->getMessage();
2802 2802 
 					}
2803 2803 
 				}
 
@@ -2810,7 +2810,7 @@  discard block
 
 block discarded – undo
2810 2810 
 				try {
2811 2811 
 					$sth = $this->db->prepare($query);
2812 2812 
 					$sth->execute();
2813 
-				} catch(PDOException $e) {
2813 
+				} catch (PDOException $e) {
2814 2814 
 					return "error : ".$e->getMessage();
2815 2815 
 				}
2816 2816 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -2822,7 +2822,7 @@  discard block
 
 block discarded – undo
2822 2822 
 				try {
2823 2823 
 					$sth = $this->db->prepare($query);
2824 2824 
 					$sth->execute();
2825 
-				} catch(PDOException $e) {
2825 
+				} catch (PDOException $e) {
2826 2826 
 					return "error : ".$e->getMessage();
2827 2827 
 				}
2828 2828 
 				echo 'Deleting old marine data...'."\n";
 
@@ -2834,14 +2834,14 @@  discard block
 
 block discarded – undo
2834 2834 
 				try {
2835 2835 
 					$sth = $this->db->prepare($query);
2836 2836 
 					$sth->execute();
2837 
-				} catch(PDOException $e) {
2837 
+				} catch (PDOException $e) {
2838 2838 
 					return "error : ".$e->getMessage();
2839 2839 
 				}
2840 2840 
 			}
2841 2841 
 			if (!isset($lastyearupdate)) {
2842 2842 
 				echo 'Insert last stats update date...'."\n";
2843 2843 
 				date_default_timezone_set('UTC');
2844 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2844 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2845 2845 
 			}
2846 2846 
 			if ($globalStatsResetYear) {
2847 2847 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
require/class.TrackerArchive.php 2 patches
Indentation   +593 added lines, -593 removed lines patch added patch discarded remove patch 
@@ -10,10 +10,10 @@  discard block
 
 block discarded – undo
10 10 
 	}
11 11
12 12 
 	/**
13 
-	* Get SQL query part for filter used
14 
-	* @param Array $filter the filter
15 
-	* @return Array the SQL part
16 
-	*/
13 
+	 * Get SQL query part for filter used
14 
+	 * @param Array $filter the filter
15 
+	 * @return Array the SQL part
16 
+	 */
17 17 
 	public function getFilter($filter = array(),$where = false,$and = false) {
18 18 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19 
 		$filters = array();
 
@@ -106,44 +106,44 @@  discard block
 
 block discarded – undo
106 106 
 	}
107 107
108 108
109 
-        /**
110 
-        * Gets all the spotter information based on a particular callsign
111 
-        *
112 
-        * @return Array the spotter information
113 
-        *
114 
-        */
115 
-        public function getLastArchiveTrackerDataByIdent($ident)
116 
-        {
109 
+		/**
110 
+		 * Gets all the spotter information based on a particular callsign
111 
+		 *
112 
+		 * @return Array the spotter information
113 
+		 *
114 
+		 */
115 
+		public function getLastArchiveTrackerDataByIdent($ident)
116 
+		{
117 117 
 		$Tracker = new Tracker($this->db);
118 
-                date_default_timezone_set('UTC');
118 
+				date_default_timezone_set('UTC');
119 119
120 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
121 
-                //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
122 
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
120 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
121 
+				//$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
122 
+				$query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
123 123
124 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
124 
+				$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
125 125
126 
-                return $spotter_array;
127 
-        }
126 
+				return $spotter_array;
127 
+		}
128 128
129 129
130 
-        /**
131 
-        * Gets last the spotter information based on a particular id
132 
-        *
133 
-        * @return Array the spotter information
134 
-        *
135 
-        */
136 
-        public function getLastArchiveTrackerDataById($id)
137 
-        {
138 
-    		$Tracker = new Tracker($this->db);
139 
-                date_default_timezone_set('UTC');
140 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
141 
-                //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
142 
-                //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
143 
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
130 
+		/**
131 
+		 * Gets last the spotter information based on a particular id
132 
+		 *
133 
+		 * @return Array the spotter information
134 
+		 *
135 
+		 */
136 
+		public function getLastArchiveTrackerDataById($id)
137 
+		{
138 
+			$Tracker = new Tracker($this->db);
139 
+				date_default_timezone_set('UTC');
140 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
141 
+				//$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
142 
+				//$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
143 
+				$query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
144 144
145 145 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
146 
-                  /*
146 
+				  /*
147 147 
                 try {
148 148 
                         $Connection = new Connection();
149 149 
                         $sth = Connection->$db->prepare($query);
 
@@ -153,188 +153,188 @@  discard block
 
 block discarded – undo
153 153 
                 }
154 154 
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
155 155 
                 */
156 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
157 
-
158 
-                return $spotter_array;
159 
-        }
160 
-
161 
-        /**
162 
-        * Gets all the spotter information based on a particular id
163 
-        *
164 
-        * @return Array the spotter information
165 
-        *
166 
-        */
167 
-        public function getAllArchiveTrackerDataById($id)
156 
+				$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
157 
+
158 
+				return $spotter_array;
159 
+		}
160 
+
161 
+		/**
162 
+		 * Gets all the spotter information based on a particular id
163 
+		 *
164 
+		 * @return Array the spotter information
165 
+		 *
166 
+		 */
167 
+		public function getAllArchiveTrackerDataById($id)
168 168 
 	{
169 
-                date_default_timezone_set('UTC');
170 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
171 
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
169 
+				date_default_timezone_set('UTC');
170 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
171 
+				$query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
172 172
173 173 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
174 174
175 
-                try {
176 
-                        $sth = $this->db->prepare($query);
177 
-                        $sth->execute(array(':id' => $id));
178 
-                } catch(PDOException $e) {
179 
-                        echo $e->getMessage();
180 
-                        die;
181 
-                }
182 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
183 
-
184 
-                return $spotter_array;
185 
-        }
186 
-
187 
-        /**
188 
-        * Gets coordinate & time spotter information based on a particular id
189 
-        *
190 
-        * @return Array the spotter information
191 
-        *
192 
-        */
193 
-        public function getCoordArchiveTrackerDataById($id)
194 
-        {
195 
-                date_default_timezone_set('UTC');
196 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
197 
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
175 
+				try {
176 
+						$sth = $this->db->prepare($query);
177 
+						$sth->execute(array(':id' => $id));
178 
+				} catch(PDOException $e) {
179 
+						echo $e->getMessage();
180 
+						die;
181 
+				}
182 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
183 
+
184 
+				return $spotter_array;
185 
+		}
186 
+
187 
+		/**
188 
+		 * Gets coordinate & time spotter information based on a particular id
189 
+		 *
190 
+		 * @return Array the spotter information
191 
+		 *
192 
+		 */
193 
+		public function getCoordArchiveTrackerDataById($id)
194 
+		{
195 
+				date_default_timezone_set('UTC');
196 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
197 
+				$query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
198 198
199 199 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
200 200
201 
-                try {
202 
-                        $sth = $this->db->prepare($query);
203 
-                        $sth->execute(array(':id' => $id));
204 
-                } catch(PDOException $e) {
205 
-                        echo $e->getMessage();
206 
-                        die;
207 
-                }
208 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
201 
+				try {
202 
+						$sth = $this->db->prepare($query);
203 
+						$sth->execute(array(':id' => $id));
204 
+				} catch(PDOException $e) {
205 
+						echo $e->getMessage();
206 
+						die;
207 
+				}
208 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
209 209
210 
-                return $spotter_array;
211 
-        }
210 
+				return $spotter_array;
211 
+		}
212 212
213 213
214 
-        /**
215 
-        * Gets altitude information based on a particular callsign
216 
-        *
217 
-        * @return Array the spotter information
218 
-        *
219 
-        */
220 
-        public function getAltitudeArchiveTrackerDataByIdent($ident)
221 
-        {
214 
+		/**
215 
+		 * Gets altitude information based on a particular callsign
216 
+		 *
217 
+		 * @return Array the spotter information
218 
+		 *
219 
+		 */
220 
+		public function getAltitudeArchiveTrackerDataByIdent($ident)
221 
+		{
222 222
223 
-                date_default_timezone_set('UTC');
223 
+				date_default_timezone_set('UTC');
224 224
225 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
226 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
225 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
226 
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
227 227
228 
-                try {
229 
-                        $sth = $this->db->prepare($query);
230 
-                        $sth->execute(array(':ident' => $ident));
231 
-                } catch(PDOException $e) {
232 
-                        echo $e->getMessage();
233 
-                        die;
234 
-                }
235 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
228 
+				try {
229 
+						$sth = $this->db->prepare($query);
230 
+						$sth->execute(array(':ident' => $ident));
231 
+				} catch(PDOException $e) {
232 
+						echo $e->getMessage();
233 
+						die;
234 
+				}
235 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
236 236
237 
-                return $spotter_array;
238 
-        }
237 
+				return $spotter_array;
238 
+		}
239 239
240 
-        /**
241 
-        * Gets altitude information based on a particular id
242 
-        *
243 
-        * @return Array the spotter information
244 
-        *
245 
-        */
246 
-        public function getAltitudeArchiveTrackerDataById($id)
247 
-        {
240 
+		/**
241 
+		 * Gets altitude information based on a particular id
242 
+		 *
243 
+		 * @return Array the spotter information
244 
+		 *
245 
+		 */
246 
+		public function getAltitudeArchiveTrackerDataById($id)
247 
+		{
248 248
249 
-                date_default_timezone_set('UTC');
249 
+				date_default_timezone_set('UTC');
250 250
251 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
252 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
251 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
252 
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
253 253
254 
-                try {
255 
-                        $sth = $this->db->prepare($query);
256 
-                        $sth->execute(array(':id' => $id));
257 
-                } catch(PDOException $e) {
258 
-                        echo $e->getMessage();
259 
-                        die;
260 
-                }
261 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
254 
+				try {
255 
+						$sth = $this->db->prepare($query);
256 
+						$sth->execute(array(':id' => $id));
257 
+				} catch(PDOException $e) {
258 
+						echo $e->getMessage();
259 
+						die;
260 
+				}
261 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
262 262
263 
-                return $spotter_array;
264 
-        }
263 
+				return $spotter_array;
264 
+		}
265 265
266 
-        /**
267 
-        * Gets altitude & speed information based on a particular id
268 
-        *
269 
-        * @return Array the spotter information
270 
-        *
271 
-        */
272 
-        public function getAltitudeSpeedArchiveTrackerDataById($id)
273 
-        {
266 
+		/**
267 
+		 * Gets altitude & speed information based on a particular id
268 
+		 *
269 
+		 * @return Array the spotter information
270 
+		 *
271 
+		 */
272 
+		public function getAltitudeSpeedArchiveTrackerDataById($id)
273 
+		{
274 274
275 
-                date_default_timezone_set('UTC');
275 
+				date_default_timezone_set('UTC');
276 276
277 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
278 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
277 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
278 
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
279 279
280 
-                try {
281 
-                        $sth = $this->db->prepare($query);
282 
-                        $sth->execute(array(':id' => $id));
283 
-                } catch(PDOException $e) {
284 
-                        echo $e->getMessage();
285 
-                        die;
286 
-                }
287 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
280 
+				try {
281 
+						$sth = $this->db->prepare($query);
282 
+						$sth->execute(array(':id' => $id));
283 
+				} catch(PDOException $e) {
284 
+						echo $e->getMessage();
285 
+						die;
286 
+				}
287 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
288 288
289 
-                return $spotter_array;
290 
-        }
289 
+				return $spotter_array;
290 
+		}
291 291
292 292
293 
-        /**
294 
-        * Gets altitude information based on a particular callsign
295 
-        *
296 
-        * @return Array the spotter information
297 
-        *
298 
-        */
299 
-        public function getLastAltitudeArchiveTrackerDataByIdent($ident)
300 
-        {
293 
+		/**
294 
+		 * Gets altitude information based on a particular callsign
295 
+		 *
296 
+		 * @return Array the spotter information
297 
+		 *
298 
+		 */
299 
+		public function getLastAltitudeArchiveTrackerDataByIdent($ident)
300 
+		{
301 301
302 
-                date_default_timezone_set('UTC');
302 
+				date_default_timezone_set('UTC');
303 303
304 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
305 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
304 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
305 
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
306 306 
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
307 307
308 
-                try {
309 
-                        $sth = $this->db->prepare($query);
310 
-                        $sth->execute(array(':ident' => $ident));
311 
-                } catch(PDOException $e) {
312 
-                        echo $e->getMessage();
313 
-                        die;
314 
-                }
315 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
308 
+				try {
309 
+						$sth = $this->db->prepare($query);
310 
+						$sth->execute(array(':ident' => $ident));
311 
+				} catch(PDOException $e) {
312 
+						echo $e->getMessage();
313 
+						die;
314 
+				}
315 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
316 316
317 
-                return $spotter_array;
318 
-        }
317 
+				return $spotter_array;
318 
+		}
319 319
320 320
321 321
322 
-       /**
323 
-        * Gets all the archive spotter information
324 
-        *
325 
-        * @return Array the spotter information
326 
-        *
327 
-        */
328 
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
329 
-        {
330 
-    		$Tracker = new Tracker($this->db);
331 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
332 
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
322 
+	   /**
323 
+	    * Gets all the archive spotter information
324 
+	    *
325 
+	    * @return Array the spotter information
326 
+	    *
327 
+	    */
328 
+		public function getTrackerArchiveData($ident,$famtrackid,$date)
329 
+		{
330 
+			$Tracker = new Tracker($this->db);
331 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
332 
+				$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
333 333
334 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
334 
+				$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
335 335
336 
-                return $spotter_array;
337 
-        }
336 
+				return $spotter_array;
337 
+		}
338 338
339 339 
 	public function deleteTrackerArchiveTrackData()
340 340 
 	{
 
@@ -354,34 +354,34 @@  discard block
 
 block discarded – undo
354 354 
 	}
355 355
356 356 
 	/**
357 
-        * Gets Minimal Live Tracker data
358 
-        *
359 
-        * @return Array the spotter information
360 
-        *
361 
-        */
362 
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
363 
-        {
364 
-                global $globalDBdriver, $globalLiveInterval;
365 
-                date_default_timezone_set('UTC');
366 
-
367 
-                $filter_query = '';
368 
-                if (isset($filter['source']) && !empty($filter['source'])) {
369 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
370 
-                }
371 
-                // Use spotter_output also ?
372 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
373 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
374 
-                }
375 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
376 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
377 
-                }
378 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
379 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
380 
-                }
357 
+	 * Gets Minimal Live Tracker data
358 
+	 *
359 
+	 * @return Array the spotter information
360 
+	 *
361 
+	 */
362 
+		public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
363 
+		{
364 
+				global $globalDBdriver, $globalLiveInterval;
365 
+				date_default_timezone_set('UTC');
381 366
382 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
383 
-                if ($globalDBdriver == 'mysql') {
384 
-                        /*
367 
+				$filter_query = '';
368 
+				if (isset($filter['source']) && !empty($filter['source'])) {
369 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
370 
+				}
371 
+				// Use spotter_output also ?
372 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
373 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
374 
+				}
375 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
376 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
377 
+				}
378 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
379 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
380 
+				}
381 
+
382 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
383 
+				if ($globalDBdriver == 'mysql') {
384 
+						/*
385 385 
                         $query  = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk
386 386 
                     		    FROM tracker_archive
387 387 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 
@@ -400,56 +400,56 @@  discard block
 
 block discarded – undo
400 400 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
401 401 
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
402 402 
                         	    '.$filter_query.' ORDER BY famtrackid';
403 
-                } else {
404 
-                        //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
405 
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
403 
+				} else {
404 
+						//$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
405 
+						$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
406 406 
                         	    FROM tracker_archive
407 407 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
408 408 
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
409 409 
                         	    '.$filter_query.' ORDER BY famtrackid';
410 
-                }
411 
-                //echo $query;
412 
-                try {
413 
-                        $sth = $this->db->prepare($query);
414 
-                        $sth->execute();
415 
-                } catch(PDOException $e) {
416 
-                        echo $e->getMessage();
417 
-                        die;
418 
-                }
419 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
410 
+				}
411 
+				//echo $query;
412 
+				try {
413 
+						$sth = $this->db->prepare($query);
414 
+						$sth->execute();
415 
+				} catch(PDOException $e) {
416 
+						echo $e->getMessage();
417 
+						die;
418 
+				}
419 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
420 420
421 
-                return $spotter_array;
422 
-        }
421 
+				return $spotter_array;
422 
+		}
423 423
424 424 
 	/**
425 
-        * Gets Minimal Live Tracker data
426 
-        *
427 
-        * @return Array the spotter information
428 
-        *
429 
-        */
430 
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
431 
-        {
432 
-                global $globalDBdriver, $globalLiveInterval;
433 
-                date_default_timezone_set('UTC');
434 
-
435 
-                $filter_query = '';
436 
-                if (isset($filter['source']) && !empty($filter['source'])) {
437 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
438 
-                }
439 
-                // Should use spotter_output also ?
440 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
441 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
442 
-                }
443 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
444 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
445 
-                }
446 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
447 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
448 
-                }
425 
+	 * Gets Minimal Live Tracker data
426 
+	 *
427 
+	 * @return Array the spotter information
428 
+	 *
429 
+	 */
430 
+		public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
431 
+		{
432 
+				global $globalDBdriver, $globalLiveInterval;
433 
+				date_default_timezone_set('UTC');
434 
+
435 
+				$filter_query = '';
436 
+				if (isset($filter['source']) && !empty($filter['source'])) {
437 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
438 
+				}
439 
+				// Should use spotter_output also ?
440 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
441 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
442 
+				}
443 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
444 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
445 
+				}
446 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
447 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
448 
+				}
449 449
450 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
451 
-                if ($globalDBdriver == 'mysql') {
452 
-                        /*
450 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
451 
+				if ($globalDBdriver == 'mysql') {
452 
+						/*
453 453 
                         $query  = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk
454 454 
                     		    FROM tracker_archive
455 455 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 
@@ -460,95 +460,95 @@  discard block
 
 block discarded – undo
460 460 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".')
461 461 
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
462 462
463 
-                } else {
464 
-                        //$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
465 
-                       /*
463 
+				} else {
464 
+						//$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
465 
+					   /*
466 466 
                         $query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
467 467 
                         	    FROM tracker_archive_output
468 468 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
469 469 
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
470 470 
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
471 471 
                         */
472 
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
472 
+						$query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
473 473 
                         	    FROM tracker_archive_output
474 474 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
475 475 
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
476 476 
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
477 477 
 //                        	    .' GROUP BY spotter_output.famtrackid, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
478 478
479 
-                }
480 
-                //echo $query;
481 
-                try {
482 
-                        $sth = $this->db->prepare($query);
483 
-                        $sth->execute();
484 
-                } catch(PDOException $e) {
485 
-                        echo $e->getMessage();
486 
-                        die;
487 
-                }
488 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
479 
+				}
480 
+				//echo $query;
481 
+				try {
482 
+						$sth = $this->db->prepare($query);
483 
+						$sth->execute();
484 
+				} catch(PDOException $e) {
485 
+						echo $e->getMessage();
486 
+						die;
487 
+				}
488 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
489 489
490 
-                return $spotter_array;
491 
-        }
490 
+				return $spotter_array;
491 
+		}
492 492
493 493 
 	 /**
494 
-        * Gets count Live Tracker data
495 
-        *
496 
-        * @return Array the spotter information
497 
-        *
498 
-        */
499 
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
500 
-        {
501 
-                global $globalDBdriver, $globalLiveInterval;
502 
-                date_default_timezone_set('UTC');
503 
-
504 
-                $filter_query = '';
505 
-                if (isset($filter['source']) && !empty($filter['source'])) {
506 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
507 
-                }
508 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
509 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
510 
-                }
511 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
512 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
513 
-                }
514 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
515 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
516 
-                }
494 
+	  * Gets count Live Tracker data
495 
+	  *
496 
+	  * @return Array the spotter information
497 
+	  *
498 
+	  */
499 
+		public function getLiveTrackerCount($begindate,$enddate,$filter = array())
500 
+		{
501 
+				global $globalDBdriver, $globalLiveInterval;
502 
+				date_default_timezone_set('UTC');
517 503
518 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
519 
-                if ($globalDBdriver == 'mysql') {
504 
+				$filter_query = '';
505 
+				if (isset($filter['source']) && !empty($filter['source'])) {
506 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
507 
+				}
508 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
509 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
510 
+				}
511 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
512 
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
513 
+				}
514 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
515 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
516 
+				}
517 
+
518 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
519 
+				if ($globalDBdriver == 'mysql') {
520 520 
 			$query = 'SELECT COUNT(DISTINCT famtrackid) as nb
521 521 
 			FROM tracker_archive l
522 522 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
523 
-                } else {
523 
+				} else {
524 524 
 			$query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
525 
-                }
526 
-                //echo $query;
527 
-                try {
528 
-                        $sth = $this->db->prepare($query);
529 
-                        $sth->execute();
530 
-                } catch(PDOException $e) {
531 
-                        echo $e->getMessage();
532 
-                        die;
533 
-                }
525 
+				}
526 
+				//echo $query;
527 
+				try {
528 
+						$sth = $this->db->prepare($query);
529 
+						$sth->execute();
530 
+				} catch(PDOException $e) {
531 
+						echo $e->getMessage();
532 
+						die;
533 
+				}
534 534 
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
535 535 
 		$sth->closeCursor();
536 
-                return $result['nb'];
536 
+				return $result['nb'];
537 537
538 
-        }
538 
+		}
539 539
540 540
541 541
542 542 
 	// tracker_archive_output
543 543
544 
-    /**
545 
-    * Gets all the spotter information
546 
-    *
547 
-    * @return Array the spotter information
548 
-    *
549 
-    */
550 
-    public function searchTrackerData($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())
551 
-    {
544 
+	/**
545 
+	 * Gets all the spotter information
546 
+	 *
547 
+	 * @return Array the spotter information
548 
+	 *
549 
+	 */
550 
+	public function searchTrackerData($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())
551 
+	{
552 552 
 	global $globalTimezone, $globalDBdriver;
553 553 
 	require_once(dirname(__FILE__).'/class.Translation.php');
554 554 
 	$Translation = new Translation($this->db);
 
@@ -562,159 +562,159 @@  discard block
 
 block discarded – undo
562 562 
 	$filter_query = $this->getFilter($filters);
563 563 
 	if ($q != "")
564 564 
 	{
565 
-	    if (!is_string($q))
566 
-	    {
565 
+		if (!is_string($q))
566 
+		{
567 567 
 		return false;
568 
-	    } else {
568 
+		} else {
569 569
570 570 
 		$q_array = explode(" ", $q);
571 571
572 572 
 		foreach ($q_array as $q_item){
573 
-		    $additional_query .= " AND (";
574 
-		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
575 
-		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
576 
-		    $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
577 
-		    $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
578 
-		    $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
579 
-		    $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
580 
-		    $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
581 
-		    $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
582 
-		    $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
583 
-		    $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
584 
-		    $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
585 
-		    $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
586 
-		    $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
587 
-		    $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
588 
-		    $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
589 
-		    $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
590 
-		    $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
591 
-		    $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
592 
-		    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
593 
-		    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
594 
-		    $translate = $Translation->ident2icao($q_item);
595 
-		    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
596 
-		    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
597 
-		    $additional_query .= ")";
573 
+			$additional_query .= " AND (";
574 
+			$additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
575 
+			$additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
576 
+			$additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
577 
+			$additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
578 
+			$additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
579 
+			$additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
580 
+			$additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
581 
+			$additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
582 
+			$additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
583 
+			$additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
584 
+			$additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
585 
+			$additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
586 
+			$additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
587 
+			$additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
588 
+			$additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
589 
+			$additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
590 
+			$additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
591 
+			$additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
592 
+			$additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
593 
+			$additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
594 
+			$translate = $Translation->ident2icao($q_item);
595 
+			if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
596 
+			$additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
597 
+			$additional_query .= ")";
598 
+		}
598 599 
 		}
599 
-	    }
600 600 
 	}
601 601
602 602 
 	if ($registration != "")
603 603 
 	{
604 
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
605 
-	    if (!is_string($registration))
606 
-	    {
604 
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
605 
+		if (!is_string($registration))
606 
+		{
607 607 
 		return false;
608 
-	    } else {
608 
+		} else {
609 609 
 		$additional_query .= " AND (tracker_archive_output.registration = '".$registration."')";
610 
-	    }
610 
+		}
611 611 
 	}
612 612
613 613 
 	if ($aircraft_icao != "")
614 614 
 	{
615 
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
616 
-	    if (!is_string($aircraft_icao))
617 
-	    {
615 
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
616 
+		if (!is_string($aircraft_icao))
617 
+		{
618 618 
 		return false;
619 
-	    } else {
619 
+		} else {
620 620 
 		$additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')";
621 
-	    }
621 
+		}
622 622 
 	}
623 623
624 624 
 	if ($aircraft_manufacturer != "")
625 625 
 	{
626 
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
627 
-	    if (!is_string($aircraft_manufacturer))
628 
-	    {
626 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
627 
+		if (!is_string($aircraft_manufacturer))
628 
+		{
629 629 
 		return false;
630 
-	    } else {
630 
+		} else {
631 631 
 		$additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
632 
-	    }
632 
+		}
633 633 
 	}
634 634
635 635 
 	if ($highlights == "true")
636 636 
 	{
637 
-	    if (!is_string($highlights))
638 
-	    {
637 
+		if (!is_string($highlights))
638 
+		{
639 639 
 		return false;
640 
-	    } else {
640 
+		} else {
641 641 
 		$additional_query .= " AND (tracker_archive_output.highlight <> '')";
642 
-	    }
642 
+		}
643 643 
 	}
644 644
645 645 
 	if ($airline_icao != "")
646 646 
 	{
647 
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
648 
-	    if (!is_string($airline_icao))
649 
-	    {
647 
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
648 
+		if (!is_string($airline_icao))
649 
+		{
650 650 
 		return false;
651 
-	    } else {
651 
+		} else {
652 652 
 		$additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')";
653 
-	    }
653 
+		}
654 654 
 	}
655 655
656 656 
 	if ($airline_country != "")
657 657 
 	{
658 
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
659 
-	    if (!is_string($airline_country))
660 
-	    {
658 
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
659 
+		if (!is_string($airline_country))
660 
+		{
661 661 
 		return false;
662 
-	    } else {
662 
+		} else {
663 663 
 		$additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')";
664 
-	    }
664 
+		}
665 665 
 	}
666 666
667 667 
 	if ($airline_type != "")
668 668 
 	{
669 
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
670 
-	    if (!is_string($airline_type))
671 
-	    {
669 
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
670 
+		if (!is_string($airline_type))
671 
+		{
672 672 
 		return false;
673 
-	    } else {
673 
+		} else {
674 674 
 		if ($airline_type == "passenger")
675 675 
 		{
676 
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
676 
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
677 677 
 		}
678 678 
 		if ($airline_type == "cargo")
679 679 
 		{
680 
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
680 
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
681 681 
 		}
682 682 
 		if ($airline_type == "military")
683 683 
 		{
684 
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
684 
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
685 
+		}
685 686 
 		}
686 
-	    }
687 687 
 	}
688 688
689 689 
 	if ($airport != "")
690 690 
 	{
691 
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
692 
-	    if (!is_string($airport))
693 
-	    {
691 
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
692 
+		if (!is_string($airport))
693 
+		{
694 694 
 		return false;
695 
-	    } else {
695 
+		} else {
696 696 
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))";
697 
-	    }
697 
+		}
698 698 
 	}
699 699
700 700 
 	if ($airport_country != "")
701 701 
 	{
702 
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
703 
-	    if (!is_string($airport_country))
704 
-	    {
702 
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
703 
+		if (!is_string($airport_country))
704 
+		{
705 705 
 		return false;
706 
-	    } else {
706 
+		} else {
707 707 
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))";
708 
-	    }
708 
+		}
709 709 
 	}
710 710
711 711 
 	if ($callsign != "")
712 712 
 	{
713 
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
714 
-	    if (!is_string($callsign))
715 
-	    {
713 
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
714 
+		if (!is_string($callsign))
715 
+		{
716 716 
 		return false;
717 
-	    } else {
717 
+		} else {
718 718 
 		$translate = $Translation->ident2icao($callsign);
719 719 
 		if ($translate != $callsign) {
720 720 
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
 
@@ -722,99 +722,99 @@  discard block
 
 block discarded – undo
722 722 
 		} else {
723 723 
 			$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
724 724 
 		}
725 
-	    }
725 
+		}
726 726 
 	}
727 727
728 728 
 	if ($owner != "")
729 729 
 	{
730 
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
731 
-	    if (!is_string($owner))
732 
-	    {
730 
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
731 
+		if (!is_string($owner))
732 
+		{
733 733 
 		return false;
734 
-	    } else {
734 
+		} else {
735 735 
 		$additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')";
736 
-	    }
736 
+		}
737 737 
 	}
738 738
739 739 
 	if ($pilot_name != "")
740 740 
 	{
741 
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
742 
-	    if (!is_string($pilot_name))
743 
-	    {
741 
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
742 
+		if (!is_string($pilot_name))
743 
+		{
744 744 
 		return false;
745 
-	    } else {
745 
+		} else {
746 746 
 		$additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')";
747 
-	    }
747 
+		}
748 748 
 	}
749 749
750 750 
 	if ($pilot_id != "")
751 751 
 	{
752 
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
753 
-	    if (!is_string($pilot_id))
754 
-	    {
752 
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
753 
+		if (!is_string($pilot_id))
754 
+		{
755 755 
 		return false;
756 
-	    } else {
756 
+		} else {
757 757 
 		$additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')";
758 
-	    }
758 
+		}
759 759 
 	}
760 760
761 761 
 	if ($departure_airport_route != "")
762 762 
 	{
763 
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
764 
-	    if (!is_string($departure_airport_route))
765 
-	    {
763 
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
764 
+		if (!is_string($departure_airport_route))
765 
+		{
766 766 
 		return false;
767 
-	    } else {
767 
+		} else {
768 768 
 		$additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')";
769 
-	    }
769 
+		}
770 770 
 	}
771 771
772 772 
 	if ($arrival_airport_route != "")
773 773 
 	{
774 
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
775 
-	    if (!is_string($arrival_airport_route))
776 
-	    {
774 
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
775 
+		if (!is_string($arrival_airport_route))
776 
+		{
777 777 
 		return false;
778 
-	    } else {
778 
+		} else {
779 779 
 		$additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
780 
-	    }
780 
+		}
781 781 
 	}
782 782
783 783 
 	if ($altitude != "")
784 784 
 	{
785 
-	    $altitude_array = explode(",", $altitude);
785 
+		$altitude_array = explode(",", $altitude);
786 786
787 
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
788 
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
787 
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
788 
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
789 789
790 790
791 
-	    if ($altitude_array[1] != "")
792 
-	    {
791 
+		if ($altitude_array[1] != "")
792 
+		{
793 793 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
794 794 
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
795 795 
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
796 
-	    } else {
796 
+		} else {
797 797 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
798 798 
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
799 
-	    }
799 
+		}
800 800 
 	}
801 801
802 802 
 	if ($date_posted != "")
803 803 
 	{
804 
-	    $date_array = explode(",", $date_posted);
804 
+		$date_array = explode(",", $date_posted);
805 805
806 
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
807 
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
806 
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
807 
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
808 808
809 
-	    if ($globalTimezone != '') {
809 
+		if ($globalTimezone != '') {
810 810 
 		date_default_timezone_set($globalTimezone);
811 811 
 		$datetime = new DateTime();
812 812 
 		$offset = $datetime->format('P');
813 
-	    } else $offset = '+00:00';
813 
+		} else $offset = '+00:00';
814 814
815 815
816 
-	    if ($date_array[1] != "")
817 
-	    {
816 
+		if ($date_array[1] != "")
817 
+		{
818 818 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
819 819 
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
820 820 
 		if ($globalDBdriver == 'mysql') {
 
@@ -822,28 +822,28 @@  discard block
 
 block discarded – undo
822 822 
 		} else {
823 823 
 			$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
824 824 
 		}
825 
-	    } else {
825 
+		} else {
826 826 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
827 
-                if ($globalDBdriver == 'mysql') {
827 
+				if ($globalDBdriver == 'mysql') {
828 828 
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
829 829 
 		} else {
830 830 
 			$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
831 831 
 		}
832 
-	    }
832 
+		}
833 833 
 	}
834 834
835 835 
 	if ($limit != "")
836 836 
 	{
837 
-	    $limit_array = explode(",", $limit);
837 
+		$limit_array = explode(",", $limit);
838 838
839 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
840 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
839 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
840 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
841 841
842 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
843 
-	    {
842 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
843 
+		{
844 844 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
845 845 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
846 
-	    }
846 
+		}
847 847 
 	}
848 848
849 849 
 
@@ -874,33 +874,33 @@  discard block
 
 block discarded – undo
874 874 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
875 875
876 876 
 	return $spotter_array;
877 
-    }
877 
+	}
878 878
879 
-    public function deleteTrackerArchiveData()
880 
-    {
879 
+	public function deleteTrackerArchiveData()
880 
+	{
881 881 
 		global $globalArchiveKeepMonths, $globalDBdriver;
882 
-                date_default_timezone_set('UTC');
883 
-                if ($globalDBdriver == 'mysql') {
882 
+				date_default_timezone_set('UTC');
883 
+				if ($globalDBdriver == 'mysql') {
884 884 
 			$query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
885 885 
 		} else {
886 886 
 			$query = "DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
887 887 
 		}
888 
-                try {
889 
-                        $sth = $this->db->prepare($query);
890 
-                        $sth->execute();
891 
-                } catch(PDOException $e) {
892 
-                        return "error";
893 
-                }
888 
+				try {
889 
+						$sth = $this->db->prepare($query);
890 
+						$sth->execute();
891 
+				} catch(PDOException $e) {
892 
+						return "error";
893 
+				}
894 894 
 	}
895 895
896 
-    /**
897 
-    * Gets all the spotter information based on the callsign
898 
-    *
899 
-    * @return Array the spotter information
900 
-    *
901 
-    */
902 
-    public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
903 
-    {
896 
+	/**
897 
+	 * Gets all the spotter information based on the callsign
898 
+	 *
899 
+	 * @return Array the spotter information
900 
+	 *
901 
+	 */
902 
+	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
903 
+	{
904 904 
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
905 905
906 906 
 	date_default_timezone_set('UTC');
 
@@ -912,35 +912,35 @@  discard block
 
 block discarded – undo
912 912
913 913 
 	if ($ident != "")
914 914 
 	{
915 
-	    if (!is_string($ident))
916 
-	    {
915 
+		if (!is_string($ident))
916 
+		{
917 917 
 		return false;
918 
-	    } else {
918 
+		} else {
919 919 
 		$additional_query = " AND (tracker_archive_output.ident = :ident)";
920 920 
 		$query_values = array(':ident' => $ident);
921 
-	    }
921 
+		}
922 922 
 	}
923 923
924 924 
 	if ($limit != "")
925 925 
 	{
926 
-	    $limit_array = explode(",", $limit);
926 
+		$limit_array = explode(",", $limit);
927 927
928 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
929 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
928 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
929 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
930 930
931 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
932 
-	    {
931 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
932 
+		{
933 933 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
934 934 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
935 
-	    }
935 
+		}
936 936 
 	}
937 937
938 938 
 	if ($sort != "")
939 939 
 	{
940 
-	    $search_orderby_array = $Tracker->getOrderBy();
941 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
940 
+		$search_orderby_array = $Tracker->getOrderBy();
941 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
942 942 
 	} else {
943 
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
943 
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
944 944 
 	}
945 945
946 946 
 	$query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
 
@@ -948,17 +948,17 @@  discard block
 
 block discarded – undo
948 948 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
949 949
950 950 
 	return $spotter_array;
951 
-    }
951 
+	}
952 952
953 953
954 
-    /**
955 
-    * Gets all the spotter information based on the owner
956 
-    *
957 
-    * @return Array the spotter information
958 
-    *
959 
-    */
960 
-    public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
961 
-    {
954 
+	/**
955 
+	 * Gets all the spotter information based on the owner
956 
+	 *
957 
+	 * @return Array the spotter information
958 
+	 *
959 
+	 */
960 
+	public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
961 
+	{
962 962 
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
963 963
964 964 
 	date_default_timezone_set('UTC');
 
@@ -971,35 +971,35 @@  discard block
 
 block discarded – undo
971 971
972 972 
 	if ($owner != "")
973 973 
 	{
974 
-	    if (!is_string($owner))
975 
-	    {
974 
+		if (!is_string($owner))
975 
+		{
976 976 
 		return false;
977 
-	    } else {
977 
+		} else {
978 978 
 		$additional_query = " AND (tracker_archive_output.owner_name = :owner)";
979 979 
 		$query_values = array(':owner' => $owner);
980 
-	    }
980 
+		}
981 981 
 	}
982 982
983 983 
 	if ($limit != "")
984 984 
 	{
985 
-	    $limit_array = explode(",", $limit);
985 
+		$limit_array = explode(",", $limit);
986 986
987 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
988 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
987 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
988 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
989 989
990 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
991 
-	    {
990 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
991 
+		{
992 992 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
993 993 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
994 
-	    }
994 
+		}
995 995 
 	}
996 996
997 997 
 	if ($sort != "")
998 998 
 	{
999 
-	    $search_orderby_array = $Tracker->getOrderBy();
1000 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
999 
+		$search_orderby_array = $Tracker->getOrderBy();
1000 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1001 1001 
 	} else {
1002 
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
1002 
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
1003 1003 
 	}
1004 1004
1005 1005 
 	$query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1007,16 +1007,16 @@  discard block
 
 block discarded – undo
1007 1007 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
1008 1008
1009 1009 
 	return $spotter_array;
1010 
-    }
1011 
-
1012 
-    /**
1013 
-    * Gets all the spotter information based on the pilot
1014 
-    *
1015 
-    * @return Array the spotter information
1016 
-    *
1017 
-    */
1018 
-    public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1019 
-    {
1010 
+	}
1011 
+
1012 
+	/**
1013 
+	 * Gets all the spotter information based on the pilot
1014 
+	 *
1015 
+	 * @return Array the spotter information
1016 
+	 *
1017 
+	 */
1018 
+	public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1019 
+	{
1020 1020 
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
1021 1021
1022 1022 
 	date_default_timezone_set('UTC');
 
@@ -1035,24 +1035,24 @@  discard block
 
 block discarded – undo
1035 1035
1036 1036 
 	if ($limit != "")
1037 1037 
 	{
1038 
-	    $limit_array = explode(",", $limit);
1038 
+		$limit_array = explode(",", $limit);
1039 1039
1040 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1041 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1040 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1041 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1042 1042
1043 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1044 
-	    {
1043 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1044 
+		{
1045 1045 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1046 1046 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1047 
-	    }
1047 
+		}
1048 1048 
 	}
1049 1049
1050 1050 
 	if ($sort != "")
1051 1051 
 	{
1052 
-	    $search_orderby_array = $Tracker->getOrderBy();
1053 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1052 
+		$search_orderby_array = $Tracker->getOrderBy();
1053 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1054 1054 
 	} else {
1055 
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
1055 
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
1056 1056 
 	}
1057 1057
1058 1058 
 	$query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1060,16 +1060,16 @@  discard block
 
 block discarded – undo
1060 1060 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
1061 1061
1062 1062 
 	return $spotter_array;
1063 
-    }
1064 
-
1065 
-    /**
1066 
-    * Gets all number of flight over countries
1067 
-    *
1068 
-    * @return Array the airline country list
1069 
-    *
1070 
-    */
1071 
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1072 
-    {
1063 
+	}
1064 
+
1065 
+	/**
1066 
+	 * Gets all number of flight over countries
1067 
+	 *
1068 
+	 * @return Array the airline country list
1069 
+	 *
1070 
+	 */
1071 
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1072 
+	{
1073 1073 
 	global $globalDBdriver;
1074 1074 
 	/*
1075 1075 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1079,14 +1079,14 @@  discard block
 
 block discarded – undo
1079 1079 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
1080 1080 
 		    FROM countries c, tracker_archive s
1081 1081 
 		    WHERE c.iso2 = s.over_country ";
1082 
-                if ($olderthanmonths > 0) {
1083 
-            		if ($globalDBdriver == 'mysql') {
1082 
+				if ($olderthanmonths > 0) {
1083 
+					if ($globalDBdriver == 'mysql') {
1084 1084 
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1085 1085 
 			} else {
1086 1086 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1087 1087 
 			}
1088 1088 
 		}
1089 
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1089 
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1090 1090 
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1091 1091 
 	if ($limit) $query .= " LIMIT 0,10";
1092 1092 
       
@@ -1099,23 +1099,23 @@  discard block
 
 block discarded – undo
1099 1099
1100 1100 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1101 1101 
 	{
1102 
-	    $temp_array['flight_count'] = $row['nb'];
1103 
-	    $temp_array['flight_country'] = $row['name'];
1104 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1105 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1106 
-	    $flight_array[] = $temp_array;
1102 
+		$temp_array['flight_count'] = $row['nb'];
1103 
+		$temp_array['flight_country'] = $row['name'];
1104 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1105 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1106 
+		$flight_array[] = $temp_array;
1107 1107 
 	}
1108 1108 
 	return $flight_array;
1109 
-    }
1110 
-
1111 
-    /**
1112 
-    * Gets all number of flight over countries
1113 
-    *
1114 
-    * @return Array the airline country list
1115 
-    *
1116 
-    */
1117 
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1118 
-    {
1109 
+	}
1110 
+
1111 
+	/**
1112 
+	 * Gets all number of flight over countries
1113 
+	 *
1114 
+	 * @return Array the airline country list
1115 
+	 *
1116 
+	 */
1117 
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1118 
+	{
1119 1119 
 	global $globalDBdriver;
1120 1120 
 	/*
1121 1121 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1125,14 +1125,14 @@  discard block
 
 block discarded – undo
1125 1125 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
1126 1126 
 		    FROM countries c, tracker_archive s, spotter_output o
1127 1127 
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.famtrackid = s.famtrackid ";
1128 
-                if ($olderthanmonths > 0) {
1129 
-            		if ($globalDBdriver == 'mysql') {
1128 
+				if ($olderthanmonths > 0) {
1129 
+					if ($globalDBdriver == 'mysql') {
1130 1130 
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1131 1131 
 			} else {
1132 1132 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1133 1133 
 			}
1134 1134 
 		}
1135 
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1135 
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1136 1136 
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1137 1137 
 	if ($limit) $query .= " LIMIT 0,10";
1138 1138 
       
@@ -1145,24 +1145,24 @@  discard block
 
 block discarded – undo
1145 1145
1146 1146 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1147 1147 
 	{
1148 
-	    $temp_array['airline_icao'] = $row['airline_icao'];
1149 
-	    $temp_array['flight_count'] = $row['nb'];
1150 
-	    $temp_array['flight_country'] = $row['name'];
1151 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1152 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1153 
-	    $flight_array[] = $temp_array;
1148 
+		$temp_array['airline_icao'] = $row['airline_icao'];
1149 
+		$temp_array['flight_count'] = $row['nb'];
1150 
+		$temp_array['flight_country'] = $row['name'];
1151 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1152 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1153 
+		$flight_array[] = $temp_array;
1154 1154 
 	}
1155 1155 
 	return $flight_array;
1156 
-    }
1157 
-
1158 
-    /**
1159 
-    * Gets last spotter information based on a particular callsign
1160 
-    *
1161 
-    * @return Array the spotter information
1162 
-    *
1163 
-    */
1164 
-    public function getDateArchiveTrackerDataById($id,$date)
1165 
-    {
1156 
+	}
1157 
+
1158 
+	/**
1159 
+	 * Gets last spotter information based on a particular callsign
1160 
+	 *
1161 
+	 * @return Array the spotter information
1162 
+	 *
1163 
+	 */
1164 
+	public function getDateArchiveTrackerDataById($id,$date)
1165 
+	{
1166 1166 
 	$Tracker = new Tracker($this->db);
1167 1167 
 	date_default_timezone_set('UTC');
1168 1168 
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
 
@@ -1170,16 +1170,16 @@  discard block
 
 block discarded – undo
1170 1170 
 	$date = date('c',$date);
1171 1171 
 	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
1172 1172 
 	return $spotter_array;
1173 
-    }
1174 
-
1175 
-    /**
1176 
-    * Gets all the spotter information based on a particular callsign
1177 
-    *
1178 
-    * @return Array the spotter information
1179 
-    *
1180 
-    */
1181 
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
1182 
-    {
1173 
+	}
1174 
+
1175 
+	/**
1176 
+	 * Gets all the spotter information based on a particular callsign
1177 
+	 *
1178 
+	 * @return Array the spotter information
1179 
+	 *
1180 
+	 */
1181 
+	public function getDateArchiveTrackerDataByIdent($ident,$date)
1182 
+	{
1183 1183 
 	$Tracker = new Tracker($this->db);
1184 1184 
 	date_default_timezone_set('UTC');
1185 1185 
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 
@@ -1187,16 +1187,16 @@  discard block
 
 block discarded – undo
1187 1187 
 	$date = date('c',$date);
1188 1188 
 	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1189 1189 
 	return $spotter_array;
1190 
-    }
1191 
-
1192 
-    /**
1193 
-    * Gets all the spotter information based on the airport
1194 
-    *
1195 
-    * @return Array the spotter information
1196 
-    *
1197 
-    */
1198 
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1199 
-    {
1190 
+	}
1191 
+
1192 
+	/**
1193 
+	 * Gets all the spotter information based on the airport
1194 
+	 *
1195 
+	 * @return Array the spotter information
1196 
+	 *
1197 
+	 */
1198 
+	public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1199 
+	{
1200 1200 
 	global $global_query;
1201 1201 
 	$Tracker = new Tracker($this->db);
1202 1202 
 	date_default_timezone_set('UTC');
 
@@ -1207,35 +1207,35 @@  discard block
 
 block discarded – undo
1207 1207
1208 1208 
 	if ($airport != "")
1209 1209 
 	{
1210 
-	    if (!is_string($airport))
1211 
-	    {
1210 
+		if (!is_string($airport))
1211 
+		{
1212 1212 
 		return false;
1213 
-	    } else {
1213 
+		} else {
1214 1214 
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))";
1215 1215 
 		$query_values = array(':airport' => $airport);
1216 
-	    }
1216 
+		}
1217 1217 
 	}
1218 1218
1219 1219 
 	if ($limit != "")
1220 1220 
 	{
1221 
-	    $limit_array = explode(",", $limit);
1221 
+		$limit_array = explode(",", $limit);
1222 1222
1223 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1224 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1223 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1224 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1225 1225
1226 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1227 
-	    {
1226 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1227 
+		{
1228 1228 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1229 1229 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1230 
-	    }
1230 
+		}
1231 1231 
 	}
1232 1232
1233 1233 
 	if ($sort != "")
1234 1234 
 	{
1235 
-	    $search_orderby_array = $Tracker->getOrderBy();
1236 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1235 
+		$search_orderby_array = $Tracker->getOrderBy();
1236 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1237 1237 
 	} else {
1238 
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
1238 
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
1239 1239 
 	}
1240 1240
1241 1241 
 	$query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
 
@@ -1243,6 +1243,6 @@  discard block
 
 block discarded – undo
1243 1243 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
1244 1244
1245 1245 
 	return $spotter_array;
1246 
-    }
1246 
+	}
1247 1247 
 }
1248 1248 
 ?>
1249 1249 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +107 added lines, -107 removed lines patch added patch discarded remove patch 
@@ -14,33 +14,33 @@  discard block
 
 block discarded – undo
14 14 
 	* @param Array $filter the filter
15 15 
 	* @return Array the SQL part
16 16 
 	*/
17 
-	public function getFilter($filter = array(),$where = false,$and = false) {
17 
+	public function getFilter($filter = array(), $where = false, $and = false) {
18 18 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19 
 		$filters = array();
20 20 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22 
 				$filters = $globalStatsFilters[$globalFilterName];
23 23 
 			} else {
24 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
24 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
25 25 
 			}
26 26 
 		}
27 27 
 		if (isset($filter[0]['source'])) {
28 
-			$filters = array_merge($filters,$filter);
28 
+			$filters = array_merge($filters, $filter);
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['idents']) && !empty($flt['idents'])) {
35 35 
 				if (isset($flt['source'])) {
36 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
36 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
37 37 
 				} else {
38 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
38 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
39 39 
 				}
40 40 
 			}
41 41 
 		}
42 42 
 		if (isset($filter['source']) && !empty($filter['source'])) {
43 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
43 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
44 44 
 		}
45 45 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
46 46 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -68,38 +68,38 @@  discard block
 
 block discarded – undo
68 68 
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'";
69 69 
 				}
70 70 
 			}
71 
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
71 
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
72 72 
 		}
73 73 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
74 
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
75 75 
 		}
76 76 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77 77 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 78 
 		if ($filter_query_where != '') {
79 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
80 80 
 		}
81 81 
 		$filter_query = $filter_query_join.$filter_query_where;
82 82 
 		return $filter_query;
83 83 
 	}
84 84
85 85 
 	// tracker_archive
86 
-	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
86 
+	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
87 87 
 		require_once(dirname(__FILE__).'/class.Tracker.php');
88 88 
 		if ($over_country == '') {
89 89 
 			$Tracker = new Tracker($this->db);
90 
-			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
90 
+			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude);
91 91 
 			if (!empty($data_country)) $country = $data_country['iso2'];
92 92 
 			else $country = '';
93 93 
 		} else $country = $over_country;
94 94 
 		// Route is not added in tracker_archive
95 
-		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type)
95 
+		$query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type)
96 96 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
97 
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':comment' => $comment,':type' => $type);
97 
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':comment' => $comment, ':type' => $type);
98 98 
 		try {
99 99 
 			$sth = $this->db->prepare($query);
100 100 
 			$sth->execute($query_values);
101 101 
 			$sth->closeCursor();
102 
-		} catch(PDOException $e) {
102 
+		} catch (PDOException $e) {
103 103 
 			return "error : ".$e->getMessage();
104 104 
 		}
105 105 
 		return "success";
 
@@ -119,9 +119,9 @@  discard block
 
 block discarded – undo
119 119
120 120 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
121 121 
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
122 
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
122 
+                $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
123 123
124 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
124 
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident));
125 125
126 126 
                 return $spotter_array;
127 127 
         }
 
@@ -140,7 +140,7 @@  discard block
 
 block discarded – undo
140 140 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
141 141 
                 //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
142 142 
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
143 
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
143 
+                $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
144 144
145 145 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
146 146 
                   /*
 
@@ -153,7 +153,7 @@  discard block
 
 block discarded – undo
153 153 
                 }
154 154 
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
155 155 
                 */
156 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
156 
+                $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id));
157 157
158 158 
                 return $spotter_array;
159 159 
         }
 
@@ -168,14 +168,14 @@  discard block
 
 block discarded – undo
168 168 
 	{
169 169 
                 date_default_timezone_set('UTC');
170 170 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
171 
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
171 
+                $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
172 172
173 173 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
174 174
175 175 
                 try {
176 176 
                         $sth = $this->db->prepare($query);
177 177 
                         $sth->execute(array(':id' => $id));
178 
-                } catch(PDOException $e) {
178 
+                } catch (PDOException $e) {
179 179 
                         echo $e->getMessage();
180 180 
                         die;
181 181 
                 }
 
@@ -194,14 +194,14 @@  discard block
 
 block discarded – undo
194 194 
         {
195 195 
                 date_default_timezone_set('UTC');
196 196 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
197 
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
197 
+                $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
198 198
199 199 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
200 200
201 201 
                 try {
202 202 
                         $sth = $this->db->prepare($query);
203 203 
                         $sth->execute(array(':id' => $id));
204 
-                } catch(PDOException $e) {
204 
+                } catch (PDOException $e) {
205 205 
                         echo $e->getMessage();
206 206 
                         die;
207 207 
                 }
 
@@ -223,12 +223,12 @@  discard block
 
 block discarded – undo
223 223 
                 date_default_timezone_set('UTC');
224 224
225 225 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
226 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
226 
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
227 227
228 228 
                 try {
229 229 
                         $sth = $this->db->prepare($query);
230 230 
                         $sth->execute(array(':ident' => $ident));
231 
-                } catch(PDOException $e) {
231 
+                } catch (PDOException $e) {
232 232 
                         echo $e->getMessage();
233 233 
                         die;
234 234 
                 }
 
@@ -249,12 +249,12 @@  discard block
 
 block discarded – undo
249 249 
                 date_default_timezone_set('UTC');
250 250
251 251 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
252 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
252 
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
253 253
254 254 
                 try {
255 255 
                         $sth = $this->db->prepare($query);
256 256 
                         $sth->execute(array(':id' => $id));
257 
-                } catch(PDOException $e) {
257 
+                } catch (PDOException $e) {
258 258 
                         echo $e->getMessage();
259 259 
                         die;
260 260 
                 }
 
@@ -275,12 +275,12 @@  discard block
 
 block discarded – undo
275 275 
                 date_default_timezone_set('UTC');
276 276
277 277 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
278 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
278 
+                $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
279 279
280 280 
                 try {
281 281 
                         $sth = $this->db->prepare($query);
282 282 
                         $sth->execute(array(':id' => $id));
283 
-                } catch(PDOException $e) {
283 
+                } catch (PDOException $e) {
284 284 
                         echo $e->getMessage();
285 285 
                         die;
286 286 
                 }
 
@@ -302,13 +302,13 @@  discard block
 
 block discarded – undo
302 302 
                 date_default_timezone_set('UTC');
303 303
304 304 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
305 
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
305 
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
306 306 
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
307 307
308 308 
                 try {
309 309 
                         $sth = $this->db->prepare($query);
310 310 
                         $sth->execute(array(':ident' => $ident));
311 
-                } catch(PDOException $e) {
311 
+                } catch (PDOException $e) {
312 312 
                         echo $e->getMessage();
313 313 
                         die;
314 314 
                 }
 
@@ -325,13 +325,13 @@  discard block
 
 block discarded – undo
325 325 
         * @return Array the spotter information
326 326 
         *
327 327 
         */
328 
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
328 
+        public function getTrackerArchiveData($ident, $famtrackid, $date)
329 329 
         {
330 330 
     		$Tracker = new Tracker($this->db);
331 331 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
332 
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
332 
+                $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
333 333
334 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
334 
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%'));
335 335
336 336 
                 return $spotter_array;
337 337 
         }
 
@@ -347,7 +347,7 @@  discard block
 
 block discarded – undo
347 347 
 		try {
348 348 
 			$sth = $this->db->prepare($query);
349 349 
 			$sth->execute();
350 
-		} catch(PDOException $e) {
350 
+		} catch (PDOException $e) {
351 351 
 			echo $e->getMessage();
352 352 
 			die;
353 353 
 		}
 
@@ -359,24 +359,24 @@  discard block
 
 block discarded – undo
359 359 
         * @return Array the spotter information
360 360 
         *
361 361 
         */
362 
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
362 
+        public function getMinLiveTrackerData($begindate, $enddate, $filter = array())
363 363 
         {
364 364 
                 global $globalDBdriver, $globalLiveInterval;
365 365 
                 date_default_timezone_set('UTC');
366 366
367 367 
                 $filter_query = '';
368 368 
                 if (isset($filter['source']) && !empty($filter['source'])) {
369 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
369 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
370 370 
                 }
371 371 
                 // Use spotter_output also ?
372 372 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
373 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
373 
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
374 374 
                 }
375 375 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
376 376 
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
377 377 
                 }
378 378 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
379 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
379 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
380 380 
                 }
381 381
382 382 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -395,14 +395,14 @@  discard block
 
 block discarded – undo
395 395 
 						GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid
396 396 
 				    AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
397 397 
 */
398 
-			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
398 
+			$query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
399 399 
 				    FROM tracker_archive
400 400 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
401 401 
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
402 402 
                         	    '.$filter_query.' ORDER BY famtrackid';
403 403 
                 } else {
404 404 
                         //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
405 
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
405 
+                        $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
406 406 
                         	    FROM tracker_archive
407 407 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
408 408 
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
 
@@ -412,7 +412,7 @@  discard block
 
 block discarded – undo
412 412 
                 try {
413 413 
                         $sth = $this->db->prepare($query);
414 414 
                         $sth->execute();
415 
-                } catch(PDOException $e) {
415 
+                } catch (PDOException $e) {
416 416 
                         echo $e->getMessage();
417 417 
                         die;
418 418 
                 }
 
@@ -427,24 +427,24 @@  discard block
 
 block discarded – undo
427 427 
         * @return Array the spotter information
428 428 
         *
429 429 
         */
430 
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
430 
+        public function getMinLiveTrackerDataPlayback($begindate, $enddate, $filter = array())
431 431 
         {
432 432 
                 global $globalDBdriver, $globalLiveInterval;
433 433 
                 date_default_timezone_set('UTC');
434 434
435 435 
                 $filter_query = '';
436 436 
                 if (isset($filter['source']) && !empty($filter['source'])) {
437 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
437 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
438 438 
                 }
439 439 
                 // Should use spotter_output also ?
440 440 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
441 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
441 
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
442 442 
                 }
443 443 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
444 444 
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
445 445 
                 }
446 446 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
447 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
447 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
448 448 
                 }
449 449
450 450 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -454,7 +454,7 @@  discard block
 
 block discarded – undo
454 454 
                     		    FROM tracker_archive
455 455 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
456 456 
 			*/
457 
-			$query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk
457 
+			$query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk
458 458 
 				    FROM tracker_archive_output
459 459 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao
460 460 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -469,7 +469,7 @@  discard block
 
 block discarded – undo
469 469 
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
470 470 
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
471 471 
                         */
472 
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
472 
+                        $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
473 473 
                         	    FROM tracker_archive_output
474 474 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
475 475 
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
 
@@ -481,7 +481,7 @@  discard block
 
 block discarded – undo
481 481 
                 try {
482 482 
                         $sth = $this->db->prepare($query);
483 483 
                         $sth->execute();
484 
-                } catch(PDOException $e) {
484 
+                } catch (PDOException $e) {
485 485 
                         echo $e->getMessage();
486 486 
                         die;
487 487 
                 }
 
@@ -496,23 +496,23 @@  discard block
 
 block discarded – undo
496 496 
         * @return Array the spotter information
497 497 
         *
498 498 
         */
499 
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
499 
+        public function getLiveTrackerCount($begindate, $enddate, $filter = array())
500 500 
         {
501 501 
                 global $globalDBdriver, $globalLiveInterval;
502 502 
                 date_default_timezone_set('UTC');
503 503
504 504 
                 $filter_query = '';
505 505 
                 if (isset($filter['source']) && !empty($filter['source'])) {
506 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
506 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
507 507 
                 }
508 508 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
509 
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
509 
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
510 510 
                 }
511 511 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
512 512 
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
513 513 
                 }
514 514 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
515 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
515 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
516 516 
                 }
517 517
518 518 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -527,7 +527,7 @@  discard block
 
 block discarded – undo
527 527 
                 try {
528 528 
                         $sth = $this->db->prepare($query);
529 529 
                         $sth->execute();
530 
-                } catch(PDOException $e) {
530 
+                } catch (PDOException $e) {
531 531 
                         echo $e->getMessage();
532 532 
                         die;
533 533 
                 }
 
@@ -547,7 +547,7 @@  discard block
 
 block discarded – undo
547 547 
     * @return Array the spotter information
548 548 
     *
549 549 
     */
550 
-    public function searchTrackerData($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())
550 
+    public function searchTrackerData($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())
551 551 
     {
552 552 
 	global $globalTimezone, $globalDBdriver;
553 553 
 	require_once(dirname(__FILE__).'/class.Translation.php');
 
@@ -569,7 +569,7 @@  discard block
 
 block discarded – undo
569 569
570 570 
 		$q_array = explode(" ", $q);
571 571
572 
-		foreach ($q_array as $q_item){
572 
+		foreach ($q_array as $q_item) {
573 573 
 		    $additional_query .= " AND (";
574 574 
 		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
575 575 
 		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
 
@@ -601,7 +601,7 @@  discard block
 
 block discarded – undo
601 601
602 602 
 	if ($registration != "")
603 603 
 	{
604 
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
604 
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
605 605 
 	    if (!is_string($registration))
606 606 
 	    {
607 607 
 		return false;
 
@@ -612,7 +612,7 @@  discard block
 
 block discarded – undo
612 612
613 613 
 	if ($aircraft_icao != "")
614 614 
 	{
615 
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
615 
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
616 616 
 	    if (!is_string($aircraft_icao))
617 617 
 	    {
618 618 
 		return false;
 
@@ -623,7 +623,7 @@  discard block
 
 block discarded – undo
623 623
624 624 
 	if ($aircraft_manufacturer != "")
625 625 
 	{
626 
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
626 
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
627 627 
 	    if (!is_string($aircraft_manufacturer))
628 628 
 	    {
629 629 
 		return false;
 
@@ -644,7 +644,7 @@  discard block
 
 block discarded – undo
644 644
645 645 
 	if ($airline_icao != "")
646 646 
 	{
647 
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
647 
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
648 648 
 	    if (!is_string($airline_icao))
649 649 
 	    {
650 650 
 		return false;
 
@@ -655,7 +655,7 @@  discard block
 
 block discarded – undo
655 655
656 656 
 	if ($airline_country != "")
657 657 
 	{
658 
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
658 
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
659 659 
 	    if (!is_string($airline_country))
660 660 
 	    {
661 661 
 		return false;
 
@@ -666,7 +666,7 @@  discard block
 
 block discarded – undo
666 666
667 667 
 	if ($airline_type != "")
668 668 
 	{
669 
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
669 
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
670 670 
 	    if (!is_string($airline_type))
671 671 
 	    {
672 672 
 		return false;
 
@@ -688,7 +688,7 @@  discard block
 
 block discarded – undo
688 688
689 689 
 	if ($airport != "")
690 690 
 	{
691 
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
691 
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
692 692 
 	    if (!is_string($airport))
693 693 
 	    {
694 694 
 		return false;
 
@@ -699,7 +699,7 @@  discard block
 
 block discarded – undo
699 699
700 700 
 	if ($airport_country != "")
701 701 
 	{
702 
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
702 
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
703 703 
 	    if (!is_string($airport_country))
704 704 
 	    {
705 705 
 		return false;
 
@@ -710,7 +710,7 @@  discard block
 
 block discarded – undo
710 710
711 711 
 	if ($callsign != "")
712 712 
 	{
713 
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
713 
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
714 714 
 	    if (!is_string($callsign))
715 715 
 	    {
716 716 
 		return false;
 
@@ -718,7 +718,7 @@  discard block
 
 block discarded – undo
718 718 
 		$translate = $Translation->ident2icao($callsign);
719 719 
 		if ($translate != $callsign) {
720 720 
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
721 
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
721 
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
722 722 
 		} else {
723 723 
 			$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
724 724 
 		}
 
@@ -727,7 +727,7 @@  discard block
 
 block discarded – undo
727 727
728 728 
 	if ($owner != "")
729 729 
 	{
730 
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
730 
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
731 731 
 	    if (!is_string($owner))
732 732 
 	    {
733 733 
 		return false;
 
@@ -738,7 +738,7 @@  discard block
 
 block discarded – undo
738 738
739 739 
 	if ($pilot_name != "")
740 740 
 	{
741 
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
741 
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
742 742 
 	    if (!is_string($pilot_name))
743 743 
 	    {
744 744 
 		return false;
 
@@ -749,7 +749,7 @@  discard block
 
 block discarded – undo
749 749
750 750 
 	if ($pilot_id != "")
751 751 
 	{
752 
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
752 
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
753 753 
 	    if (!is_string($pilot_id))
754 754 
 	    {
755 755 
 		return false;
 
@@ -760,7 +760,7 @@  discard block
 
 block discarded – undo
760 760
761 761 
 	if ($departure_airport_route != "")
762 762 
 	{
763 
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
763 
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
764 764 
 	    if (!is_string($departure_airport_route))
765 765 
 	    {
766 766 
 		return false;
 
@@ -771,7 +771,7 @@  discard block
 
 block discarded – undo
771 771
772 772 
 	if ($arrival_airport_route != "")
773 773 
 	{
774 
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
774 
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
775 775 
 	    if (!is_string($arrival_airport_route))
776 776 
 	    {
777 777 
 		return false;
 
@@ -784,8 +784,8 @@  discard block
 
 block discarded – undo
784 784 
 	{
785 785 
 	    $altitude_array = explode(",", $altitude);
786 786
787 
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
788 
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
787 
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
788 
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
789 789
790 790
791 791 
 	    if ($altitude_array[1] != "")
 
@@ -803,8 +803,8 @@  discard block
 
 block discarded – undo
803 803 
 	{
804 804 
 	    $date_array = explode(",", $date_posted);
805 805
806 
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
807 
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
806 
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
807 
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
808 808
809 809 
 	    if ($globalTimezone != '') {
810 810 
 		date_default_timezone_set($globalTimezone);
 
@@ -836,8 +836,8 @@  discard block
 
 block discarded – undo
836 836 
 	{
837 837 
 	    $limit_array = explode(",", $limit);
838 838
839 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
840 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
839 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
840 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
841 841
842 842 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
843 843 
 	    {
 
@@ -848,8 +848,8 @@  discard block
 
 block discarded – undo
848 848
849 849
850 850 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
851 
-		$dist = number_format($dist*0.621371,2,'.','');
852 
-		$query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
851 
+		$dist = number_format($dist*0.621371, 2, '.', '');
852 
+		$query = "SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
853 853 
                           FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
854 854 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
855 855 
 	} else {
 
@@ -866,12 +866,12 @@  discard block
 
 block discarded – undo
866 866 
 			$additional_query .= " AND (tracker_archive_output.waypoints <> '')";
867 867 
 		}
868 868
869 
-		$query  = "SELECT tracker_archive_output.* FROM tracker_archive_output
869 
+		$query = "SELECT tracker_archive_output.* FROM tracker_archive_output
870 870 
 		    WHERE tracker_archive_output.ident <> ''
871 871 
 		    ".$additional_query."
872 872 
 		    ".$filter_query.$orderby_query;
873 873 
 	}
874 
-	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
874 
+	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
875 875
876 876 
 	return $spotter_array;
877 877 
     }
 
@@ -888,7 +888,7 @@  discard block
 
 block discarded – undo
888 888 
                 try {
889 889 
                         $sth = $this->db->prepare($query);
890 890 
                         $sth->execute();
891 
-                } catch(PDOException $e) {
891 
+                } catch (PDOException $e) {
892 892 
                         return "error";
893 893 
                 }
894 894 
 	}
 
@@ -925,8 +925,8 @@  discard block
 
 block discarded – undo
925 925 
 	{
926 926 
 	    $limit_array = explode(",", $limit);
927 927
928 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
929 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
928 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
929 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
930 930
931 931 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
932 932 
 	    {
 
@@ -967,7 +967,7 @@  discard block
 
 block discarded – undo
967 967 
 	$query_values = array();
968 968 
 	$limit_query = '';
969 969 
 	$additional_query = '';
970 
-	$filter_query = $this->getFilter($filter,true,true);
970 
+	$filter_query = $this->getFilter($filter, true, true);
971 971
972 972 
 	if ($owner != "")
973 973 
 	{
 
@@ -984,8 +984,8 @@  discard block
 
 block discarded – undo
984 984 
 	{
985 985 
 	    $limit_array = explode(",", $limit);
986 986
987 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
988 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
987 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
988 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
989 989
990 990 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
991 991 
 	    {
 
@@ -1025,7 +1025,7 @@  discard block
 
 block discarded – undo
1025 1025 
 	$query_values = array();
1026 1026 
 	$limit_query = '';
1027 1027 
 	$additional_query = '';
1028 
-	$filter_query = $this->getFilter($filter,true,true);
1028 
+	$filter_query = $this->getFilter($filter, true, true);
1029 1029
1030 1030 
 	if ($pilot != "")
1031 1031 
 	{
 
@@ -1037,8 +1037,8 @@  discard block
 
 block discarded – undo
1037 1037 
 	{
1038 1038 
 	    $limit_array = explode(",", $limit);
1039 1039
1040 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1041 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1040 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1041 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1042 1042
1043 1043 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1044 1044 
 	    {
 
@@ -1068,7 +1068,7 @@  discard block
 
 block discarded – undo
1068 1068 
     * @return Array the airline country list
1069 1069 
     *
1070 1070 
     */
1071 
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1071 
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
1072 1072 
     {
1073 1073 
 	global $globalDBdriver;
1074 1074 
 	/*
 
@@ -1097,7 +1097,7 @@  discard block
 
 block discarded – undo
1097 1097 
 	$flight_array = array();
1098 1098 
 	$temp_array = array();
1099 1099
1100 
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1100 
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1101 1101 
 	{
1102 1102 
 	    $temp_array['flight_count'] = $row['nb'];
1103 1103 
 	    $temp_array['flight_country'] = $row['name'];
 
@@ -1114,7 +1114,7 @@  discard block
 
 block discarded – undo
1114 1114 
     * @return Array the airline country list
1115 1115 
     *
1116 1116 
     */
1117 
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1117 
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
1118 1118 
     {
1119 1119 
 	global $globalDBdriver;
1120 1120 
 	/*
 
@@ -1143,7 +1143,7 @@  discard block
 
 block discarded – undo
1143 1143 
 	$flight_array = array();
1144 1144 
 	$temp_array = array();
1145 1145
1146 
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1146 
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1147 1147 
 	{
1148 1148 
 	    $temp_array['airline_icao'] = $row['airline_icao'];
1149 1149 
 	    $temp_array['flight_count'] = $row['nb'];
 
@@ -1161,14 +1161,14 @@  discard block
 
 block discarded – undo
1161 1161 
     * @return Array the spotter information
1162 1162 
     *
1163 1163 
     */
1164 
-    public function getDateArchiveTrackerDataById($id,$date)
1164 
+    public function getDateArchiveTrackerDataById($id, $date)
1165 1165 
     {
1166 1166 
 	$Tracker = new Tracker($this->db);
1167 1167 
 	date_default_timezone_set('UTC');
1168 1168 
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
1169 
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1170 
-	$date = date('c',$date);
1171 
-	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
1169 
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1170 
+	$date = date('c', $date);
1171 
+	$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date));
1172 1172 
 	return $spotter_array;
1173 1173 
     }
1174 1174 
 
@@ -1178,14 +1178,14 @@  discard block
 
 block discarded – undo
1178 1178 
     * @return Array the spotter information
1179 1179 
     *
1180 1180 
     */
1181 
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
1181 
+    public function getDateArchiveTrackerDataByIdent($ident, $date)
1182 1182 
     {
1183 1183 
 	$Tracker = new Tracker($this->db);
1184 1184 
 	date_default_timezone_set('UTC');
1185 1185 
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1186 
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1187 
-	$date = date('c',$date);
1188 
-	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1186 
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
1187 
+	$date = date('c', $date);
1188 
+	$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
1189 1189 
 	return $spotter_array;
1190 1190 
     }
1191 1191 
 
@@ -1195,7 +1195,7 @@  discard block
 
 block discarded – undo
1195 1195 
     * @return Array the spotter information
1196 1196 
     *
1197 1197 
     */
1198 
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1198 
+    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1199 1199 
     {
1200 1200 
 	global $global_query;
1201 1201 
 	$Tracker = new Tracker($this->db);
 
@@ -1203,7 +1203,7 @@  discard block
 
 block discarded – undo
1203 1203 
 	$query_values = array();
1204 1204 
 	$limit_query = '';
1205 1205 
 	$additional_query = '';
1206 
-	$filter_query = $this->getFilter($filters,true,true);
1206 
+	$filter_query = $this->getFilter($filters, true, true);
1207 1207
1208 1208 
 	if ($airport != "")
1209 1209 
 	{
 
@@ -1220,8 +1220,8 @@  discard block
 
 block discarded – undo
1220 1220 
 	{
1221 1221 
 	    $limit_array = explode(",", $limit);
1222 1222
1223 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1224 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1223 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1224 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1225 1225
1226 1226 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1227 1227 
 	    {
Please login to merge, or discard this patch.
require/class.MarineArchive.php 2 patches
Indentation   +589 added lines, -589 removed lines patch added patch discarded remove patch 
@@ -10,10 +10,10 @@  discard block
 
 block discarded – undo
10 10 
 	}
11 11
12 12 
 	/**
13 
-	* Get SQL query part for filter used
14 
-	* @param Array $filter the filter
15 
-	* @return Array the SQL part
16 
-	*/
13 
+	 * Get SQL query part for filter used
14 
+	 * @param Array $filter the filter
15 
+	 * @return Array the SQL part
16 
+	 */
17 17 
 	public function getFilter($filter = array(),$where = false,$and = false) {
18 18 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19 
 		$filters = array();
 
@@ -110,44 +110,44 @@  discard block
 
 block discarded – undo
110 110 
 	}
111 111
112 112
113 
-        /**
114 
-        * Gets all the spotter information based on a particular callsign
115 
-        *
116 
-        * @return Array the spotter information
117 
-        *
118 
-        */
119 
-        public function getLastArchiveMarineDataByIdent($ident)
120 
-        {
113 
+		/**
114 
+		 * Gets all the spotter information based on a particular callsign
115 
+		 *
116 
+		 * @return Array the spotter information
117 
+		 *
118 
+		 */
119 
+		public function getLastArchiveMarineDataByIdent($ident)
120 
+		{
121 121 
 		$Marine = new Marine($this->db);
122 
-                date_default_timezone_set('UTC');
122 
+				date_default_timezone_set('UTC');
123 123
124 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
125 
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
126 
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
124 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
125 
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
126 
+				$query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
127 127
128 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
128 
+				$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
129 129
130 
-                return $spotter_array;
131 
-        }
130 
+				return $spotter_array;
131 
+		}
132 132
133 133
134 
-        /**
135 
-        * Gets last the spotter information based on a particular id
136 
-        *
137 
-        * @return Array the spotter information
138 
-        *
139 
-        */
140 
-        public function getLastArchiveMarineDataById($id)
141 
-        {
142 
-    		$Marine = new Marine($this->db);
143 
-                date_default_timezone_set('UTC');
144 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
145 
-                //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
146 
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
147 
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
134 
+		/**
135 
+		 * Gets last the spotter information based on a particular id
136 
+		 *
137 
+		 * @return Array the spotter information
138 
+		 *
139 
+		 */
140 
+		public function getLastArchiveMarineDataById($id)
141 
+		{
142 
+			$Marine = new Marine($this->db);
143 
+				date_default_timezone_set('UTC');
144 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
145 
+				//$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
146 
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
147 
+				$query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
148 148
149 149 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
150 
-                  /*
150 
+				  /*
151 151 
                 try {
152 152 
                         $Connection = new Connection();
153 153 
                         $sth = Connection->$db->prepare($query);
 
@@ -157,178 +157,178 @@  discard block
 
 block discarded – undo
157 157 
                 }
158 158 
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
159 159 
                 */
160 
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
161 
-
162 
-                return $spotter_array;
163 
-        }
164 
-
165 
-        /**
166 
-        * Gets all the spotter information based on a particular id
167 
-        *
168 
-        * @return Array the spotter information
169 
-        *
170 
-        */
171 
-        public function getAllArchiveMarineDataById($id)
160 
+				$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
161 
+
162 
+				return $spotter_array;
163 
+		}
164 
+
165 
+		/**
166 
+		 * Gets all the spotter information based on a particular id
167 
+		 *
168 
+		 * @return Array the spotter information
169 
+		 *
170 
+		 */
171 
+		public function getAllArchiveMarineDataById($id)
172 172 
 	{
173 
-                date_default_timezone_set('UTC');
174 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
175 
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
173 
+				date_default_timezone_set('UTC');
174 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
175 
+				$query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
176 176
177 177 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
178 178
179 
-                try {
180 
-                        $sth = $this->db->prepare($query);
181 
-                        $sth->execute(array(':id' => $id));
182 
-                } catch(PDOException $e) {
183 
-                        echo $e->getMessage();
184 
-                        die;
185 
-                }
186 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
187 
-
188 
-                return $spotter_array;
189 
-        }
190 
-
191 
-        /**
192 
-        * Gets coordinate & time spotter information based on a particular id
193 
-        *
194 
-        * @return Array the spotter information
195 
-        *
196 
-        */
197 
-        public function getCoordArchiveMarineDataById($id)
198 
-        {
199 
-                date_default_timezone_set('UTC');
200 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
201 
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
179 
+				try {
180 
+						$sth = $this->db->prepare($query);
181 
+						$sth->execute(array(':id' => $id));
182 
+				} catch(PDOException $e) {
183 
+						echo $e->getMessage();
184 
+						die;
185 
+				}
186 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
187 
+
188 
+				return $spotter_array;
189 
+		}
190 
+
191 
+		/**
192 
+		 * Gets coordinate & time spotter information based on a particular id
193 
+		 *
194 
+		 * @return Array the spotter information
195 
+		 *
196 
+		 */
197 
+		public function getCoordArchiveMarineDataById($id)
198 
+		{
199 
+				date_default_timezone_set('UTC');
200 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
201 
+				$query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
202 202
203 203 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
204 204
205 
-                try {
206 
-                        $sth = $this->db->prepare($query);
207 
-                        $sth->execute(array(':id' => $id));
208 
-                } catch(PDOException $e) {
209 
-                        echo $e->getMessage();
210 
-                        die;
211 
-                }
212 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
205 
+				try {
206 
+						$sth = $this->db->prepare($query);
207 
+						$sth->execute(array(':id' => $id));
208 
+				} catch(PDOException $e) {
209 
+						echo $e->getMessage();
210 
+						die;
211 
+				}
212 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
213 213
214 
-                return $spotter_array;
215 
-        }
214 
+				return $spotter_array;
215 
+		}
216 216
217 217
218 
-        /**
219 
-        * Gets altitude information based on a particular callsign
220 
-        *
221 
-        * @return Array the spotter information
222 
-        *
223 
-        */
224 
-        public function getAltitudeArchiveMarineDataByIdent($ident)
225 
-        {
218 
+		/**
219 
+		 * Gets altitude information based on a particular callsign
220 
+		 *
221 
+		 * @return Array the spotter information
222 
+		 *
223 
+		 */
224 
+		public function getAltitudeArchiveMarineDataByIdent($ident)
225 
+		{
226 226
227 
-                date_default_timezone_set('UTC');
227 
+				date_default_timezone_set('UTC');
228 228
229 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
230 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
229 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
230 
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
231 231
232 
-                try {
233 
-                        $sth = $this->db->prepare($query);
234 
-                        $sth->execute(array(':ident' => $ident));
235 
-                } catch(PDOException $e) {
236 
-                        echo $e->getMessage();
237 
-                        die;
238 
-                }
239 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
232 
+				try {
233 
+						$sth = $this->db->prepare($query);
234 
+						$sth->execute(array(':ident' => $ident));
235 
+				} catch(PDOException $e) {
236 
+						echo $e->getMessage();
237 
+						die;
238 
+				}
239 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
240 240
241 
-                return $spotter_array;
242 
-        }
241 
+				return $spotter_array;
242 
+		}
243 243
244 
-        /**
245 
-        * Gets altitude information based on a particular id
246 
-        *
247 
-        * @return Array the spotter information
248 
-        *
249 
-        */
250 
-        public function getAltitudeArchiveMarineDataById($id)
251 
-        {
244 
+		/**
245 
+		 * Gets altitude information based on a particular id
246 
+		 *
247 
+		 * @return Array the spotter information
248 
+		 *
249 
+		 */
250 
+		public function getAltitudeArchiveMarineDataById($id)
251 
+		{
252 252
253 
-                date_default_timezone_set('UTC');
253 
+				date_default_timezone_set('UTC');
254 254
255 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
256 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
255 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
256 
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
257 257
258 
-                try {
259 
-                        $sth = $this->db->prepare($query);
260 
-                        $sth->execute(array(':id' => $id));
261 
-                } catch(PDOException $e) {
262 
-                        echo $e->getMessage();
263 
-                        die;
264 
-                }
265 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
258 
+				try {
259 
+						$sth = $this->db->prepare($query);
260 
+						$sth->execute(array(':id' => $id));
261 
+				} catch(PDOException $e) {
262 
+						echo $e->getMessage();
263 
+						die;
264 
+				}
265 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
266 266
267 
-                return $spotter_array;
268 
-        }
267 
+				return $spotter_array;
268 
+		}
269 269
270 
-        /**
271 
-        * Gets altitude & speed information based on a particular id
272 
-        *
273 
-        * @return Array the spotter information
274 
-        *
275 
-        */
276 
-        public function getAltitudeSpeedArchiveMarineDataById($id)
277 
-        {
270 
+		/**
271 
+		 * Gets altitude & speed information based on a particular id
272 
+		 *
273 
+		 * @return Array the spotter information
274 
+		 *
275 
+		 */
276 
+		public function getAltitudeSpeedArchiveMarineDataById($id)
277 
+		{
278 278
279 
-                date_default_timezone_set('UTC');
279 
+				date_default_timezone_set('UTC');
280 280
281 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
282 
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
281 
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
282 
+				$query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
283 283
284 
-                try {
285 
-                        $sth = $this->db->prepare($query);
286 
-                        $sth->execute(array(':id' => $id));
287 
-                } catch(PDOException $e) {
288 
-                        echo $e->getMessage();
289 
-                        die;
290 
-                }
291 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
284 
+				try {
285 
+						$sth = $this->db->prepare($query);
286 
+						$sth->execute(array(':id' => $id));
287 
+				} catch(PDOException $e) {
288 
+						echo $e->getMessage();
289 
+						die;
290 
+				}
291 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
292 292
293 
-                return $spotter_array;
294 
-        }
293 
+				return $spotter_array;
294 
+		}
295 295
296 296
297 
-        /**
298 
-        * Gets altitude information based on a particular callsign
299 
-        *
300 
-        * @return Array the spotter information
301 
-        *
302 
-        */
303 
-        public function getLastAltitudeArchiveMarineDataByIdent($ident)
304 
-        {
297 
+		/**
298 
+		 * Gets altitude information based on a particular callsign
299 
+		 *
300 
+		 * @return Array the spotter information
301 
+		 *
302 
+		 */
303 
+		public function getLastAltitudeArchiveMarineDataByIdent($ident)
304 
+		{
305 305
306 
-                date_default_timezone_set('UTC');
306 
+				date_default_timezone_set('UTC');
307 307
308 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
309 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
308 
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
309 
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
310 310 
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
311 311
312 
-                try {
313 
-                        $sth = $this->db->prepare($query);
314 
-                        $sth->execute(array(':ident' => $ident));
315 
-                } catch(PDOException $e) {
316 
-                        echo $e->getMessage();
317 
-                        die;
318 
-                }
319 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
312 
+				try {
313 
+						$sth = $this->db->prepare($query);
314 
+						$sth->execute(array(':ident' => $ident));
315 
+				} catch(PDOException $e) {
316 
+						echo $e->getMessage();
317 
+						die;
318 
+				}
319 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
320 320
321 
-                return $spotter_array;
322 
-        }
321 
+				return $spotter_array;
322 
+		}
323 323
324 324
325 325
326 
-       /**
327 
-        * Gets all the archive spotter information
328 
-        *
329 
-        * @return Array the spotter information
330 
-        *
331 
-        */
326 
+	   /**
327 
+	    * Gets all the archive spotter information
328 
+	    *
329 
+	    * @return Array the spotter information
330 
+	    *
331 
+	    */
332 332 
 	public function getMarineArchiveData($ident,$fammarine_id,$date)
333 333 
 	{
334 334 
 		$Marine = new Marine($this->db);
 
@@ -338,10 +338,10 @@  discard block
 
 block discarded – undo
338 338 
 		return $spotter_array;
339 339 
 	}
340 340
341 
-       /**
342 
-        * Delete all tracking data
343 
-        *
344 
-        */
341 
+	   /**
342 
+	    * Delete all tracking data
343 
+	    *
344 
+	    */
345 345 
 	public function deleteMarineArchiveTrackData()
346 346 
 	{
347 347 
 		global $globalArchiveKeepTrackMonths, $globalDBdriver;
 
@@ -360,34 +360,34 @@  discard block
 
 block discarded – undo
360 360 
 	}
361 361
362 362 
 	/**
363 
-        * Gets Minimal Live Marine data
364 
-        *
365 
-        * @return Array the spotter information
366 
-        *
367 
-        */
368 
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
369 
-        {
370 
-                global $globalDBdriver, $globalLiveInterval;
371 
-                date_default_timezone_set('UTC');
372 
-
373 
-                $filter_query = '';
374 
-                if (isset($filter['source']) && !empty($filter['source'])) {
375 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
376 
-                }
377 
-                // Use spotter_output also ?
378 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
379 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
380 
-                }
381 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
382 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
383 
-                }
384 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
385 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
386 
-                }
363 
+	 * Gets Minimal Live Marine data
364 
+	 *
365 
+	 * @return Array the spotter information
366 
+	 *
367 
+	 */
368 
+		public function getMinLiveMarineData($begindate,$enddate,$filter = array())
369 
+		{
370 
+				global $globalDBdriver, $globalLiveInterval;
371 
+				date_default_timezone_set('UTC');
387 372
388 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
389 
-                if ($globalDBdriver == 'mysql') {
390 
-                        /*
373 
+				$filter_query = '';
374 
+				if (isset($filter['source']) && !empty($filter['source'])) {
375 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
376 
+				}
377 
+				// Use spotter_output also ?
378 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
379 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
380 
+				}
381 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
382 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
383 
+				}
384 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
385 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
386 
+				}
387 
+
388 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
389 
+				if ($globalDBdriver == 'mysql') {
390 
+						/*
391 391 
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk
392 392 
                     		    FROM marine_archive
393 393 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 
@@ -406,56 +406,56 @@  discard block
 
 block discarded – undo
406 406 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
407 407 
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
408 408 
                         	    '.$filter_query.' ORDER BY fammarine_id';
409 
-                } else {
410 
-                        //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
411 
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
409 
+				} else {
410 
+						//$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
411 
+						$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
412 412 
                         	    FROM marine_archive
413 413 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
414 414 
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
415 415 
                         	    '.$filter_query.' ORDER BY fammarine_id';
416 
-                }
417 
-                //echo $query;
418 
-                try {
419 
-                        $sth = $this->db->prepare($query);
420 
-                        $sth->execute();
421 
-                } catch(PDOException $e) {
422 
-                        echo $e->getMessage();
423 
-                        die;
424 
-                }
425 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
416 
+				}
417 
+				//echo $query;
418 
+				try {
419 
+						$sth = $this->db->prepare($query);
420 
+						$sth->execute();
421 
+				} catch(PDOException $e) {
422 
+						echo $e->getMessage();
423 
+						die;
424 
+				}
425 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
426 426
427 
-                return $spotter_array;
428 
-        }
427 
+				return $spotter_array;
428 
+		}
429 429
430 430 
 	/**
431 
-        * Gets Minimal Live Marine data
432 
-        *
433 
-        * @return Array the spotter information
434 
-        *
435 
-        */
436 
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
437 
-        {
438 
-                global $globalDBdriver, $globalLiveInterval;
439 
-                date_default_timezone_set('UTC');
440 
-
441 
-                $filter_query = '';
442 
-                if (isset($filter['source']) && !empty($filter['source'])) {
443 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
444 
-                }
445 
-                // Should use spotter_output also ?
446 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
447 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
448 
-                }
449 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
450 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
451 
-                }
452 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
453 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
454 
-                }
431 
+	 * Gets Minimal Live Marine data
432 
+	 *
433 
+	 * @return Array the spotter information
434 
+	 *
435 
+	 */
436 
+		public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
437 
+		{
438 
+				global $globalDBdriver, $globalLiveInterval;
439 
+				date_default_timezone_set('UTC');
455 440
456 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
457 
-                if ($globalDBdriver == 'mysql') {
458 
-                        /*
441 
+				$filter_query = '';
442 
+				if (isset($filter['source']) && !empty($filter['source'])) {
443 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
444 
+				}
445 
+				// Should use spotter_output also ?
446 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
447 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
448 
+				}
449 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
450 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
451 
+				}
452 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
453 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
454 
+				}
455 
+
456 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
457 
+				if ($globalDBdriver == 'mysql') {
458 
+						/*
459 459 
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk
460 460 
                     		    FROM marine_archive
461 461 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 
@@ -466,95 +466,95 @@  discard block
 
 block discarded – undo
466 466 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".')
467 467 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
468 468
469 
-                } else {
470 
-                        //$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
471 
-                       /*
469 
+				} else {
470 
+						//$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
471 
+					   /*
472 472 
                         $query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
473 473 
                         	    FROM marine_archive_output
474 474 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
475 475 
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
476 476 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
477 477 
                         */
478 
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
478 
+						$query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
479 479 
                         	    FROM marine_archive_output
480 480 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
481 481 
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
482 482 
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
483 483 
 //                        	    .' GROUP BY spotter_output.fammarine_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
484 484
485 
-                }
486 
-                //echo $query;
487 
-                try {
488 
-                        $sth = $this->db->prepare($query);
489 
-                        $sth->execute();
490 
-                } catch(PDOException $e) {
491 
-                        echo $e->getMessage();
492 
-                        die;
493 
-                }
494 
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
485 
+				}
486 
+				//echo $query;
487 
+				try {
488 
+						$sth = $this->db->prepare($query);
489 
+						$sth->execute();
490 
+				} catch(PDOException $e) {
491 
+						echo $e->getMessage();
492 
+						die;
493 
+				}
494 
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
495 495
496 
-                return $spotter_array;
497 
-        }
496 
+				return $spotter_array;
497 
+		}
498 498
499 499 
 	 /**
500 
-        * Gets count Live Marine data
501 
-        *
502 
-        * @return Array the spotter information
503 
-        *
504 
-        */
505 
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
506 
-        {
507 
-                global $globalDBdriver, $globalLiveInterval;
508 
-                date_default_timezone_set('UTC');
509 
-
510 
-                $filter_query = '';
511 
-                if (isset($filter['source']) && !empty($filter['source'])) {
512 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
513 
-                }
514 
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
515 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
516 
-                }
517 
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
518 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
519 
-                }
520 
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
521 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
522 
-                }
500 
+	  * Gets count Live Marine data
501 
+	  *
502 
+	  * @return Array the spotter information
503 
+	  *
504 
+	  */
505 
+		public function getLiveMarineCount($begindate,$enddate,$filter = array())
506 
+		{
507 
+				global $globalDBdriver, $globalLiveInterval;
508 
+				date_default_timezone_set('UTC');
523 509
524 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
525 
-                if ($globalDBdriver == 'mysql') {
510 
+				$filter_query = '';
511 
+				if (isset($filter['source']) && !empty($filter['source'])) {
512 
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
513 
+				}
514 
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
515 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
516 
+				}
517 
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
518 
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
519 
+				}
520 
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
521 
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
522 
+				}
523 
+
524 
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
525 
+				if ($globalDBdriver == 'mysql') {
526 526 
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb
527 527 
 			FROM marine_archive l
528 528 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
529 
-                } else {
529 
+				} else {
530 530 
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
531 
-                }
532 
-                //echo $query;
533 
-                try {
534 
-                        $sth = $this->db->prepare($query);
535 
-                        $sth->execute();
536 
-                } catch(PDOException $e) {
537 
-                        echo $e->getMessage();
538 
-                        die;
539 
-                }
531 
+				}
532 
+				//echo $query;
533 
+				try {
534 
+						$sth = $this->db->prepare($query);
535 
+						$sth->execute();
536 
+				} catch(PDOException $e) {
537 
+						echo $e->getMessage();
538 
+						die;
539 
+				}
540 540 
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
541 541 
 		$sth->closeCursor();
542 
-                return $result['nb'];
542 
+				return $result['nb'];
543 543
544 
-        }
544 
+		}
545 545
546 546
547 547
548 548 
 	// marine_archive_output
549 549
550 
-    /**
551 
-    * Gets all the spotter information
552 
-    *
553 
-    * @return Array the spotter information
554 
-    *
555 
-    */
556 
-    public function searchMarineData($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())
557 
-    {
550 
+	/**
551 
+	 * Gets all the spotter information
552 
+	 *
553 
+	 * @return Array the spotter information
554 
+	 *
555 
+	 */
556 
+	public function searchMarineData($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())
557 
+	{
558 558 
 	global $globalTimezone, $globalDBdriver;
559 559 
 	require_once(dirname(__FILE__).'/class.Translation.php');
560 560 
 	$Translation = new Translation($this->db);
 
@@ -568,159 +568,159 @@  discard block
 
 block discarded – undo
568 568 
 	$filter_query = $this->getFilter($filters);
569 569 
 	if ($q != "")
570 570 
 	{
571 
-	    if (!is_string($q))
572 
-	    {
571 
+		if (!is_string($q))
572 
+		{
573 573 
 		return false;
574 
-	    } else {
574 
+		} else {
575 575
576 576 
 		$q_array = explode(" ", $q);
577 577
578 578 
 		foreach ($q_array as $q_item){
579 
-		    $additional_query .= " AND (";
580 
-		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
581 
-		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
582 
-		    $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
583 
-		    $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
584 
-		    $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
585 
-		    $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
586 
-		    $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
587 
-		    $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
588 
-		    $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
589 
-		    $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
590 
-		    $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
591 
-		    $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
592 
-		    $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
593 
-		    $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
594 
-		    $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
595 
-		    $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
596 
-		    $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
597 
-		    $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
598 
-		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
599 
-		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
600 
-		    $translate = $Translation->ident2icao($q_item);
601 
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
602 
-		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
603 
-		    $additional_query .= ")";
579 
+			$additional_query .= " AND (";
580 
+			$additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
581 
+			$additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
582 
+			$additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
583 
+			$additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
584 
+			$additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
585 
+			$additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
586 
+			$additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
587 
+			$additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
588 
+			$additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
589 
+			$additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
590 
+			$additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
591 
+			$additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
592 
+			$additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
593 
+			$additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
594 
+			$additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
595 
+			$additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
596 
+			$additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
597 
+			$additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
598 
+			$additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
599 
+			$additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
600 
+			$translate = $Translation->ident2icao($q_item);
601 
+			if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
602 
+			$additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
603 
+			$additional_query .= ")";
604 
+		}
604 605 
 		}
605 
-	    }
606 606 
 	}
607 607
608 608 
 	if ($registration != "")
609 609 
 	{
610 
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
611 
-	    if (!is_string($registration))
612 
-	    {
610 
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
611 
+		if (!is_string($registration))
612 
+		{
613 613 
 		return false;
614 
-	    } else {
614 
+		} else {
615 615 
 		$additional_query .= " AND (marine_archive_output.registration = '".$registration."')";
616 
-	    }
616 
+		}
617 617 
 	}
618 618
619 619 
 	if ($aircraft_icao != "")
620 620 
 	{
621 
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
622 
-	    if (!is_string($aircraft_icao))
623 
-	    {
621 
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
622 
+		if (!is_string($aircraft_icao))
623 
+		{
624 624 
 		return false;
625 
-	    } else {
625 
+		} else {
626 626 
 		$additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')";
627 
-	    }
627 
+		}
628 628 
 	}
629 629
630 630 
 	if ($aircraft_manufacturer != "")
631 631 
 	{
632 
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
633 
-	    if (!is_string($aircraft_manufacturer))
634 
-	    {
632 
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
633 
+		if (!is_string($aircraft_manufacturer))
634 
+		{
635 635 
 		return false;
636 
-	    } else {
636 
+		} else {
637 637 
 		$additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
638 
-	    }
638 
+		}
639 639 
 	}
640 640
641 641 
 	if ($highlights == "true")
642 642 
 	{
643 
-	    if (!is_string($highlights))
644 
-	    {
643 
+		if (!is_string($highlights))
644 
+		{
645 645 
 		return false;
646 
-	    } else {
646 
+		} else {
647 647 
 		$additional_query .= " AND (marine_archive_output.highlight <> '')";
648 
-	    }
648 
+		}
649 649 
 	}
650 650
651 651 
 	if ($airline_icao != "")
652 652 
 	{
653 
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
654 
-	    if (!is_string($airline_icao))
655 
-	    {
653 
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
654 
+		if (!is_string($airline_icao))
655 
+		{
656 656 
 		return false;
657 
-	    } else {
657 
+		} else {
658 658 
 		$additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')";
659 
-	    }
659 
+		}
660 660 
 	}
661 661
662 662 
 	if ($airline_country != "")
663 663 
 	{
664 
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
665 
-	    if (!is_string($airline_country))
666 
-	    {
664 
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
665 
+		if (!is_string($airline_country))
666 
+		{
667 667 
 		return false;
668 
-	    } else {
668 
+		} else {
669 669 
 		$additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')";
670 
-	    }
670 
+		}
671 671 
 	}
672 672
673 673 
 	if ($airline_type != "")
674 674 
 	{
675 
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
676 
-	    if (!is_string($airline_type))
677 
-	    {
675 
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
676 
+		if (!is_string($airline_type))
677 
+		{
678 678 
 		return false;
679 
-	    } else {
679 
+		} else {
680 680 
 		if ($airline_type == "passenger")
681 681 
 		{
682 
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
682 
+			$additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
683 683 
 		}
684 684 
 		if ($airline_type == "cargo")
685 685 
 		{
686 
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
686 
+			$additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
687 687 
 		}
688 688 
 		if ($airline_type == "military")
689 689 
 		{
690 
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'military')";
690 
+			$additional_query .= " AND (marine_archive_output.airline_type = 'military')";
691 
+		}
691 692 
 		}
692 
-	    }
693 693 
 	}
694 694
695 695 
 	if ($airport != "")
696 696 
 	{
697 
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
698 
-	    if (!is_string($airport))
699 
-	    {
697 
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
698 
+		if (!is_string($airport))
699 
+		{
700 700 
 		return false;
701 
-	    } else {
701 
+		} else {
702 702 
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))";
703 
-	    }
703 
+		}
704 704 
 	}
705 705
706 706 
 	if ($airport_country != "")
707 707 
 	{
708 
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
709 
-	    if (!is_string($airport_country))
710 
-	    {
708 
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
709 
+		if (!is_string($airport_country))
710 
+		{
711 711 
 		return false;
712 
-	    } else {
712 
+		} else {
713 713 
 		$additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))";
714 
-	    }
714 
+		}
715 715 
 	}
716 716
717 717 
 	if ($callsign != "")
718 718 
 	{
719 
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
720 
-	    if (!is_string($callsign))
721 
-	    {
719 
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
720 
+		if (!is_string($callsign))
721 
+		{
722 722 
 		return false;
723 
-	    } else {
723 
+		} else {
724 724 
 		$translate = $Translation->ident2icao($callsign);
725 725 
 		if ($translate != $callsign) {
726 726 
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
 
@@ -728,99 +728,99 @@  discard block
 
 block discarded – undo
728 728 
 		} else {
729 729 
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
730 730 
 		}
731 
-	    }
731 
+		}
732 732 
 	}
733 733
734 734 
 	if ($owner != "")
735 735 
 	{
736 
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
737 
-	    if (!is_string($owner))
738 
-	    {
736 
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
737 
+		if (!is_string($owner))
738 
+		{
739 739 
 		return false;
740 
-	    } else {
740 
+		} else {
741 741 
 		$additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')";
742 
-	    }
742 
+		}
743 743 
 	}
744 744
745 745 
 	if ($pilot_name != "")
746 746 
 	{
747 
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
748 
-	    if (!is_string($pilot_name))
749 
-	    {
747 
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
748 
+		if (!is_string($pilot_name))
749 
+		{
750 750 
 		return false;
751 
-	    } else {
751 
+		} else {
752 752 
 		$additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')";
753 
-	    }
753 
+		}
754 754 
 	}
755 755
756 756 
 	if ($pilot_id != "")
757 757 
 	{
758 
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
759 
-	    if (!is_string($pilot_id))
760 
-	    {
758 
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
759 
+		if (!is_string($pilot_id))
760 
+		{
761 761 
 		return false;
762 
-	    } else {
762 
+		} else {
763 763 
 		$additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')";
764 
-	    }
764 
+		}
765 765 
 	}
766 766
767 767 
 	if ($departure_airport_route != "")
768 768 
 	{
769 
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
770 
-	    if (!is_string($departure_airport_route))
771 
-	    {
769 
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
770 
+		if (!is_string($departure_airport_route))
771 
+		{
772 772 
 		return false;
773 
-	    } else {
773 
+		} else {
774 774 
 		$additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')";
775 
-	    }
775 
+		}
776 776 
 	}
777 777
778 778 
 	if ($arrival_airport_route != "")
779 779 
 	{
780 
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
781 
-	    if (!is_string($arrival_airport_route))
782 
-	    {
780 
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
781 
+		if (!is_string($arrival_airport_route))
782 
+		{
783 783 
 		return false;
784 
-	    } else {
784 
+		} else {
785 785 
 		$additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
786 
-	    }
786 
+		}
787 787 
 	}
788 788
789 789 
 	if ($altitude != "")
790 790 
 	{
791 
-	    $altitude_array = explode(",", $altitude);
791 
+		$altitude_array = explode(",", $altitude);
792 792
793 
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
794 
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
793 
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
794 
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
795 795
796 796
797 
-	    if ($altitude_array[1] != "")
798 
-	    {
797 
+		if ($altitude_array[1] != "")
798 
+		{
799 799 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
800 800 
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
801 801 
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
802 
-	    } else {
802 
+		} else {
803 803 
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
804 804 
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
805 
-	    }
805 
+		}
806 806 
 	}
807 807
808 808 
 	if ($date_posted != "")
809 809 
 	{
810 
-	    $date_array = explode(",", $date_posted);
810 
+		$date_array = explode(",", $date_posted);
811 811
812 
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
813 
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
812 
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
813 
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
814 814
815 
-	    if ($globalTimezone != '') {
815 
+		if ($globalTimezone != '') {
816 816 
 		date_default_timezone_set($globalTimezone);
817 817 
 		$datetime = new DateTime();
818 818 
 		$offset = $datetime->format('P');
819 
-	    } else $offset = '+00:00';
819 
+		} else $offset = '+00:00';
820 820
821 821
822 
-	    if ($date_array[1] != "")
823 
-	    {
822 
+		if ($date_array[1] != "")
823 
+		{
824 824 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
825 825 
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
826 826 
 		if ($globalDBdriver == 'mysql') {
 
@@ -828,28 +828,28 @@  discard block
 
 block discarded – undo
828 828 
 		} else {
829 829 
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
830 830 
 		}
831 
-	    } else {
831 
+		} else {
832 832 
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
833 
-                if ($globalDBdriver == 'mysql') {
833 
+				if ($globalDBdriver == 'mysql') {
834 834 
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
835 835 
 		} else {
836 836 
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
837 837 
 		}
838 
-	    }
838 
+		}
839 839 
 	}
840 840
841 841 
 	if ($limit != "")
842 842 
 	{
843 
-	    $limit_array = explode(",", $limit);
843 
+		$limit_array = explode(",", $limit);
844 844
845 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
846 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
845 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
846 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
847 847
848 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
849 
-	    {
848 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
849 
+		{
850 850 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
851 851 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
852 
-	    }
852 
+		}
853 853 
 	}
854 854
855 855 
 
@@ -880,33 +880,33 @@  discard block
 
 block discarded – undo
880 880 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
881 881
882 882 
 	return $spotter_array;
883 
-    }
883 
+	}
884 884
885 
-    public function deleteMarineArchiveData()
886 
-    {
885 
+	public function deleteMarineArchiveData()
886 
+	{
887 887 
 		global $globalArchiveKeepMonths, $globalDBdriver;
888 
-                date_default_timezone_set('UTC');
889 
-                if ($globalDBdriver == 'mysql') {
888 
+				date_default_timezone_set('UTC');
889 
+				if ($globalDBdriver == 'mysql') {
890 890 
 			$query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
891 891 
 		} else {
892 892 
 			$query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
893 893 
 		}
894 
-                try {
895 
-                        $sth = $this->db->prepare($query);
896 
-                        $sth->execute();
897 
-                } catch(PDOException $e) {
898 
-                        return "error";
899 
-                }
894 
+				try {
895 
+						$sth = $this->db->prepare($query);
896 
+						$sth->execute();
897 
+				} catch(PDOException $e) {
898 
+						return "error";
899 
+				}
900 900 
 	}
901 901
902 
-    /**
903 
-    * Gets all the spotter information based on the callsign
904 
-    *
905 
-    * @return Array the spotter information
906 
-    *
907 
-    */
908 
-    public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
909 
-    {
902 
+	/**
903 
+	 * Gets all the spotter information based on the callsign
904 
+	 *
905 
+	 * @return Array the spotter information
906 
+	 *
907 
+	 */
908 
+	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
909 
+	{
910 910 
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
911 911
912 912 
 	date_default_timezone_set('UTC');
 
@@ -918,35 +918,35 @@  discard block
 
 block discarded – undo
918 918
919 919 
 	if ($ident != "")
920 920 
 	{
921 
-	    if (!is_string($ident))
922 
-	    {
921 
+		if (!is_string($ident))
922 
+		{
923 923 
 		return false;
924 
-	    } else {
924 
+		} else {
925 925 
 		$additional_query = " AND (marine_archive_output.ident = :ident)";
926 926 
 		$query_values = array(':ident' => $ident);
927 
-	    }
927 
+		}
928 928 
 	}
929 929
930 930 
 	if ($limit != "")
931 931 
 	{
932 
-	    $limit_array = explode(",", $limit);
932 
+		$limit_array = explode(",", $limit);
933 933
934 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
935 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
934 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
935 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
936 936
937 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
938 
-	    {
937 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
938 
+		{
939 939 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
940 940 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
941 
-	    }
941 
+		}
942 942 
 	}
943 943
944 944 
 	if ($sort != "")
945 945 
 	{
946 
-	    $search_orderby_array = $Marine->getOrderBy();
947 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
946 
+		$search_orderby_array = $Marine->getOrderBy();
947 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
948 948 
 	} else {
949 
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
949 
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
950 950 
 	}
951 951
952 952 
 	$query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
 
@@ -954,17 +954,17 @@  discard block
 
 block discarded – undo
954 954 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
955 955
956 956 
 	return $spotter_array;
957 
-    }
957 
+	}
958 958
959 959
960 
-    /**
961 
-    * Gets all the spotter information based on the owner
962 
-    *
963 
-    * @return Array the spotter information
964 
-    *
965 
-    */
966 
-    public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
967 
-    {
960 
+	/**
961 
+	 * Gets all the spotter information based on the owner
962 
+	 *
963 
+	 * @return Array the spotter information
964 
+	 *
965 
+	 */
966 
+	public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
967 
+	{
968 968 
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
969 969
970 970 
 	date_default_timezone_set('UTC');
 
@@ -977,35 +977,35 @@  discard block
 
 block discarded – undo
977 977
978 978 
 	if ($owner != "")
979 979 
 	{
980 
-	    if (!is_string($owner))
981 
-	    {
980 
+		if (!is_string($owner))
981 
+		{
982 982 
 		return false;
983 
-	    } else {
983 
+		} else {
984 984 
 		$additional_query = " AND (marine_archive_output.owner_name = :owner)";
985 985 
 		$query_values = array(':owner' => $owner);
986 
-	    }
986 
+		}
987 987 
 	}
988 988
989 989 
 	if ($limit != "")
990 990 
 	{
991 
-	    $limit_array = explode(",", $limit);
991 
+		$limit_array = explode(",", $limit);
992 992
993 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
994 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
993 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
994 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
995 995
996 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
997 
-	    {
996 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
997 
+		{
998 998 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
999 999 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1000 
-	    }
1000 
+		}
1001 1001 
 	}
1002 1002
1003 1003 
 	if ($sort != "")
1004 1004 
 	{
1005 
-	    $search_orderby_array = $Marine->getOrderBy();
1006 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1005 
+		$search_orderby_array = $Marine->getOrderBy();
1006 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1007 1007 
 	} else {
1008 
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
1008 
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
1009 1009 
 	}
1010 1010
1011 1011 
 	$query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1013,16 +1013,16 @@  discard block
 
 block discarded – undo
1013 1013 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
1014 1014
1015 1015 
 	return $spotter_array;
1016 
-    }
1017 
-
1018 
-    /**
1019 
-    * Gets all the spotter information based on the pilot
1020 
-    *
1021 
-    * @return Array the spotter information
1022 
-    *
1023 
-    */
1024 
-    public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1025 
-    {
1016 
+	}
1017 
+
1018 
+	/**
1019 
+	 * Gets all the spotter information based on the pilot
1020 
+	 *
1021 
+	 * @return Array the spotter information
1022 
+	 *
1023 
+	 */
1024 
+	public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
1025 
+	{
1026 1026 
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
1027 1027
1028 1028 
 	date_default_timezone_set('UTC');
 
@@ -1041,24 +1041,24 @@  discard block
 
 block discarded – undo
1041 1041
1042 1042 
 	if ($limit != "")
1043 1043 
 	{
1044 
-	    $limit_array = explode(",", $limit);
1044 
+		$limit_array = explode(",", $limit);
1045 1045
1046 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1047 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1046 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1047 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1048 1048
1049 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1050 
-	    {
1049 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1050 
+		{
1051 1051 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1052 1052 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1053 
-	    }
1053 
+		}
1054 1054 
 	}
1055 1055
1056 1056 
 	if ($sort != "")
1057 1057 
 	{
1058 
-	    $search_orderby_array = $Marine->getOrderBy();
1059 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1058 
+		$search_orderby_array = $Marine->getOrderBy();
1059 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1060 1060 
 	} else {
1061 
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
1061 
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
1062 1062 
 	}
1063 1063
1064 1064 
 	$query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
 
@@ -1066,16 +1066,16 @@  discard block
 
 block discarded – undo
1066 1066 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
1067 1067
1068 1068 
 	return $spotter_array;
1069 
-    }
1070 
-
1071 
-    /**
1072 
-    * Gets all number of flight over countries
1073 
-    *
1074 
-    * @return Array the airline country list
1075 
-    *
1076 
-    */
1077 
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1078 
-    {
1069 
+	}
1070 
+
1071 
+	/**
1072 
+	 * Gets all number of flight over countries
1073 
+	 *
1074 
+	 * @return Array the airline country list
1075 
+	 *
1076 
+	 */
1077 
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1078 
+	{
1079 1079 
 	global $globalDBdriver;
1080 1080 
 	/*
1081 1081 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1085,14 +1085,14 @@  discard block
 
 block discarded – undo
1085 1085 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
1086 1086 
 		    FROM countries c, marine_archive s
1087 1087 
 		    WHERE c.iso2 = s.over_country ";
1088 
-                if ($olderthanmonths > 0) {
1089 
-            		if ($globalDBdriver == 'mysql') {
1088 
+				if ($olderthanmonths > 0) {
1089 
+					if ($globalDBdriver == 'mysql') {
1090 1090 
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1091 1091 
 			} else {
1092 1092 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1093 1093 
 			}
1094 1094 
 		}
1095 
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1095 
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1096 1096 
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1097 1097 
 	if ($limit) $query .= " LIMIT 0,10";
1098 1098 
       
@@ -1105,23 +1105,23 @@  discard block
 
 block discarded – undo
1105 1105
1106 1106 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1107 1107 
 	{
1108 
-	    $temp_array['flight_count'] = $row['nb'];
1109 
-	    $temp_array['flight_country'] = $row['name'];
1110 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1111 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1112 
-	    $flight_array[] = $temp_array;
1108 
+		$temp_array['flight_count'] = $row['nb'];
1109 
+		$temp_array['flight_country'] = $row['name'];
1110 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1111 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1112 
+		$flight_array[] = $temp_array;
1113 1113 
 	}
1114 1114 
 	return $flight_array;
1115 
-    }
1116 
-
1117 
-    /**
1118 
-    * Gets all number of flight over countries
1119 
-    *
1120 
-    * @return Array the airline country list
1121 
-    *
1122 
-    */
1123 
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1124 
-    {
1115 
+	}
1116 
+
1117 
+	/**
1118 
+	 * Gets all number of flight over countries
1119 
+	 *
1120 
+	 * @return Array the airline country list
1121 
+	 *
1122 
+	 */
1123 
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1124 
+	{
1125 1125 
 	global $globalDBdriver;
1126 1126 
 	/*
1127 1127 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1131,14 +1131,14 @@  discard block
 
 block discarded – undo
1131 1131 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
1132 1132 
 		    FROM countries c, marine_archive s, spotter_output o
1133 1133 
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id ";
1134 
-                if ($olderthanmonths > 0) {
1135 
-            		if ($globalDBdriver == 'mysql') {
1134 
+				if ($olderthanmonths > 0) {
1135 
+					if ($globalDBdriver == 'mysql') {
1136 1136 
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
1137 1137 
 			} else {
1138 1138 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1139 1139 
 			}
1140 1140 
 		}
1141 
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1141 
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1142 1142 
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1143 1143 
 	if ($limit) $query .= " LIMIT 0,10";
1144 1144 
       
@@ -1151,24 +1151,24 @@  discard block
 
 block discarded – undo
1151 1151
1152 1152 
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1153 1153 
 	{
1154 
-	    $temp_array['airline_icao'] = $row['airline_icao'];
1155 
-	    $temp_array['flight_count'] = $row['nb'];
1156 
-	    $temp_array['flight_country'] = $row['name'];
1157 
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
1158 
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
1159 
-	    $flight_array[] = $temp_array;
1154 
+		$temp_array['airline_icao'] = $row['airline_icao'];
1155 
+		$temp_array['flight_count'] = $row['nb'];
1156 
+		$temp_array['flight_country'] = $row['name'];
1157 
+		$temp_array['flight_country_iso3'] = $row['iso3'];
1158 
+		$temp_array['flight_country_iso2'] = $row['iso2'];
1159 
+		$flight_array[] = $temp_array;
1160 1160 
 	}
1161 1161 
 	return $flight_array;
1162 
-    }
1163 
-
1164 
-    /**
1165 
-    * Gets last spotter information based on a particular callsign
1166 
-    *
1167 
-    * @return Array the spotter information
1168 
-    *
1169 
-    */
1170 
-    public function getDateArchiveMarineDataById($id,$date)
1171 
-    {
1162 
+	}
1163 
+
1164 
+	/**
1165 
+	 * Gets last spotter information based on a particular callsign
1166 
+	 *
1167 
+	 * @return Array the spotter information
1168 
+	 *
1169 
+	 */
1170 
+	public function getDateArchiveMarineDataById($id,$date)
1171 
+	{
1172 1172 
 	$Marine = new Marine($this->db);
1173 1173 
 	date_default_timezone_set('UTC');
1174 1174 
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
 
@@ -1176,16 +1176,16 @@  discard block
 
 block discarded – undo
1176 1176 
 	$date = date('c',$date);
1177 1177 
 	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
1178 1178 
 	return $spotter_array;
1179 
-    }
1180 
-
1181 
-    /**
1182 
-    * Gets all the spotter information based on a particular callsign
1183 
-    *
1184 
-    * @return Array the spotter information
1185 
-    *
1186 
-    */
1187 
-    public function getDateArchiveMarineDataByIdent($ident,$date)
1188 
-    {
1179 
+	}
1180 
+
1181 
+	/**
1182 
+	 * Gets all the spotter information based on a particular callsign
1183 
+	 *
1184 
+	 * @return Array the spotter information
1185 
+	 *
1186 
+	 */
1187 
+	public function getDateArchiveMarineDataByIdent($ident,$date)
1188 
+	{
1189 1189 
 	$Marine = new Marine($this->db);
1190 1190 
 	date_default_timezone_set('UTC');
1191 1191 
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 
@@ -1193,16 +1193,16 @@  discard block
 
 block discarded – undo
1193 1193 
 	$date = date('c',$date);
1194 1194 
 	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1195 1195 
 	return $spotter_array;
1196 
-    }
1197 
-
1198 
-    /**
1199 
-    * Gets all the spotter information based on the airport
1200 
-    *
1201 
-    * @return Array the spotter information
1202 
-    *
1203 
-    */
1204 
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1205 
-    {
1196 
+	}
1197 
+
1198 
+	/**
1199 
+	 * Gets all the spotter information based on the airport
1200 
+	 *
1201 
+	 * @return Array the spotter information
1202 
+	 *
1203 
+	 */
1204 
+	public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1205 
+	{
1206 1206 
 	global $global_query;
1207 1207 
 	$Marine = new Marine($this->db);
1208 1208 
 	date_default_timezone_set('UTC');
 
@@ -1213,35 +1213,35 @@  discard block
 
 block discarded – undo
1213 1213
1214 1214 
 	if ($airport != "")
1215 1215 
 	{
1216 
-	    if (!is_string($airport))
1217 
-	    {
1216 
+		if (!is_string($airport))
1217 
+		{
1218 1218 
 		return false;
1219 
-	    } else {
1219 
+		} else {
1220 1220 
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))";
1221 1221 
 		$query_values = array(':airport' => $airport);
1222 
-	    }
1222 
+		}
1223 1223 
 	}
1224 1224
1225 1225 
 	if ($limit != "")
1226 1226 
 	{
1227 
-	    $limit_array = explode(",", $limit);
1227 
+		$limit_array = explode(",", $limit);
1228 1228
1229 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1230 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1229 
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1230 
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1231 1231
1232 
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1233 
-	    {
1232 
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1233 
+		{
1234 1234 
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
1235 1235 
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1236 
-	    }
1236 
+		}
1237 1237 
 	}
1238 1238
1239 1239 
 	if ($sort != "")
1240 1240 
 	{
1241 
-	    $search_orderby_array = $Marine->getOrderBy();
1242 
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
1241 
+		$search_orderby_array = $Marine->getOrderBy();
1242 
+		$orderby_query = $search_orderby_array[$sort]['sql'];
1243 1243 
 	} else {
1244 
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
1244 
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
1245 1245 
 	}
1246 1246
1247 1247 
 	$query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
 
@@ -1249,6 +1249,6 @@  discard block
 
 block discarded – undo
1249 1249 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
1250 1250
1251 1251 
 	return $spotter_array;
1252 
-    }
1252 
+	}
1253 1253 
 }
1254 1254 
 ?>
1255 1255 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch 
@@ -14,33 +14,33 @@  discard block
 
 block discarded – undo
14 14 
 	* @param Array $filter the filter
15 15 
 	* @return Array the SQL part
16 16 
 	*/
17 
-	public function getFilter($filter = array(),$where = false,$and = false) {
17 
+	public function getFilter($filter = array(), $where = false, $and = false) {
18 18 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
19 19 
 		$filters = array();
20 20 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22 
 				$filters = $globalStatsFilters[$globalFilterName];
23 23 
 			} else {
24 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
24 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
25 25 
 			}
26 26 
 		}
27 27 
 		if (isset($filter[0]['source'])) {
28 
-			$filters = array_merge($filters,$filter);
28 
+			$filters = array_merge($filters, $filter);
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['idents']) && !empty($flt['idents'])) {
35 35 
 				if (isset($flt['source'])) {
36 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
36 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
37 37 
 				} else {
38 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
38 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
39 39 
 				}
40 40 
 			}
41 41 
 		}
42 42 
 		if (isset($filter['source']) && !empty($filter['source'])) {
43 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
43 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
44 44 
 		}
45 45 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
46 46 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -68,42 +68,42 @@  discard block
 
 block discarded – undo
68 68 
 					$filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'";
69 69 
 				}
70 70 
 			}
71 
-			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
71 
+			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
72 72 
 		}
73 73 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
74 
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
75 75 
 		}
76 76 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77 77 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 78 
 		if ($filter_query_where != '') {
79 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
79 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
80 80 
 		}
81 81 
 		$filter_query = $filter_query_join.$filter_query_where;
82 82 
 		return $filter_query;
83 83 
 	}
84 84
85 85 
 	// marine_archive
86 
-	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
86 
+	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
87 87 
 		require_once(dirname(__FILE__).'/class.Marine.php');
88 88 
 		if ($over_country == '') {
89 89 
 			$Marine = new Marine($this->db);
90 
-			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
90 
+			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude);
91 91 
 			if (!empty($data_country)) $country = $data_country['iso2'];
92 92 
 			else $country = '';
93 93 
 		} else $country = $over_country;
94 94
95 95 
 		//$country = $over_country;
96 96 
 		// Route is not added in marine_archive
97 
-		$query  = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date)
97 
+		$query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date)
98 98 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)';
99 99
100 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
100 
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
101 101
102 102 
 		try {
103 103 
 			$sth = $this->db->prepare($query);
104 104 
 			$sth->execute($query_values);
105 105 
 			$sth->closeCursor();
106 
-		} catch(PDOException $e) {
106 
+		} catch (PDOException $e) {
107 107 
 			return "error : ".$e->getMessage();
108 108 
 		}
109 109 
 		return "success";
 
@@ -123,9 +123,9 @@  discard block
 
 block discarded – undo
123 123
124 124 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
125 125 
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
126 
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
126 
+                $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
127 127
128 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
128 
+                $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident));
129 129
130 130 
                 return $spotter_array;
131 131 
         }
 
@@ -144,7 +144,7 @@  discard block
 
 block discarded – undo
144 144 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
145 145 
                 //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
146 146 
                 //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
147 
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
147 
+                $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
148 148
149 149 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
150 150 
                   /*
 
@@ -157,7 +157,7 @@  discard block
 
 block discarded – undo
157 157 
                 }
158 158 
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
159 159 
                 */
160 
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
160 
+                $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id));
161 161
162 162 
                 return $spotter_array;
163 163 
         }
 
@@ -172,14 +172,14 @@  discard block
 
 block discarded – undo
172 172 
 	{
173 173 
                 date_default_timezone_set('UTC');
174 174 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
175 
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
175 
+                $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
176 176
177 177 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
178 178
179 179 
                 try {
180 180 
                         $sth = $this->db->prepare($query);
181 181 
                         $sth->execute(array(':id' => $id));
182 
-                } catch(PDOException $e) {
182 
+                } catch (PDOException $e) {
183 183 
                         echo $e->getMessage();
184 184 
                         die;
185 185 
                 }
 
@@ -198,14 +198,14 @@  discard block
 
 block discarded – undo
198 198 
         {
199 199 
                 date_default_timezone_set('UTC');
200 200 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
201 
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
201 
+                $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
202 202
203 203 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
204 204
205 205 
                 try {
206 206 
                         $sth = $this->db->prepare($query);
207 207 
                         $sth->execute(array(':id' => $id));
208 
-                } catch(PDOException $e) {
208 
+                } catch (PDOException $e) {
209 209 
                         echo $e->getMessage();
210 210 
                         die;
211 211 
                 }
 
@@ -227,12 +227,12 @@  discard block
 
 block discarded – undo
227 227 
                 date_default_timezone_set('UTC');
228 228
229 229 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
230 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
230 
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
231 231
232 232 
                 try {
233 233 
                         $sth = $this->db->prepare($query);
234 234 
                         $sth->execute(array(':ident' => $ident));
235 
-                } catch(PDOException $e) {
235 
+                } catch (PDOException $e) {
236 236 
                         echo $e->getMessage();
237 237 
                         die;
238 238 
                 }
 
@@ -253,12 +253,12 @@  discard block
 
 block discarded – undo
253 253 
                 date_default_timezone_set('UTC');
254 254
255 255 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
256 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
256 
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
257 257
258 258 
                 try {
259 259 
                         $sth = $this->db->prepare($query);
260 260 
                         $sth->execute(array(':id' => $id));
261 
-                } catch(PDOException $e) {
261 
+                } catch (PDOException $e) {
262 262 
                         echo $e->getMessage();
263 263 
                         die;
264 264 
                 }
 
@@ -279,12 +279,12 @@  discard block
 
 block discarded – undo
279 279 
                 date_default_timezone_set('UTC');
280 280
281 281 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
282 
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
282 
+                $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
283 283
284 284 
                 try {
285 285 
                         $sth = $this->db->prepare($query);
286 286 
                         $sth->execute(array(':id' => $id));
287 
-                } catch(PDOException $e) {
287 
+                } catch (PDOException $e) {
288 288 
                         echo $e->getMessage();
289 289 
                         die;
290 290 
                 }
 
@@ -306,13 +306,13 @@  discard block
 
 block discarded – undo
306 306 
                 date_default_timezone_set('UTC');
307 307
308 308 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
309 
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
309 
+                $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
310 310 
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
311 311
312 312 
                 try {
313 313 
                         $sth = $this->db->prepare($query);
314 314 
                         $sth->execute(array(':ident' => $ident));
315 
-                } catch(PDOException $e) {
315 
+                } catch (PDOException $e) {
316 316 
                         echo $e->getMessage();
317 317 
                         die;
318 318 
                 }
 
@@ -329,12 +329,12 @@  discard block
 
 block discarded – undo
329 329 
         * @return Array the spotter information
330 330 
         *
331 331 
         */
332 
-	public function getMarineArchiveData($ident,$fammarine_id,$date)
332 
+	public function getMarineArchiveData($ident, $fammarine_id, $date)
333 333 
 	{
334 334 
 		$Marine = new Marine($this->db);
335 335 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
336 336 
 		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
337 
-		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
337 
+		$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%'));
338 338 
 		return $spotter_array;
339 339 
 	}
340 340 
 
@@ -353,7 +353,7 @@  discard block
 
 block discarded – undo
353 353 
 		try {
354 354 
 			$sth = $this->db->prepare($query);
355 355 
 			$sth->execute();
356 
-		} catch(PDOException $e) {
356 
+		} catch (PDOException $e) {
357 357 
 			echo $e->getMessage();
358 358 
 			die;
359 359 
 		}
 
@@ -365,24 +365,24 @@  discard block
 
 block discarded – undo
365 365 
         * @return Array the spotter information
366 366 
         *
367 367 
         */
368 
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
368 
+        public function getMinLiveMarineData($begindate, $enddate, $filter = array())
369 369 
         {
370 370 
                 global $globalDBdriver, $globalLiveInterval;
371 371 
                 date_default_timezone_set('UTC');
372 372
373 373 
                 $filter_query = '';
374 374 
                 if (isset($filter['source']) && !empty($filter['source'])) {
375 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
375 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
376 376 
                 }
377 377 
                 // Use spotter_output also ?
378 378 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
379 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
379 
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
380 380 
                 }
381 381 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
382 382 
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
383 383 
                 }
384 384 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
385 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
385 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
386 386 
                 }
387 387
388 388 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -401,14 +401,14 @@  discard block
 
 block discarded – undo
401 401 
 						GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id
402 402 
 				    AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
403 403 
 */
404 
-			$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
404 
+			$query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
405 405 
 				    FROM marine_archive
406 406 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
407 407 
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
408 408 
                         	    '.$filter_query.' ORDER BY fammarine_id';
409 409 
                 } else {
410 410 
                         //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
411 
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
411 
+                        $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
412 412 
                         	    FROM marine_archive
413 413 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
414 414 
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
 
@@ -418,7 +418,7 @@  discard block
 
 block discarded – undo
418 418 
                 try {
419 419 
                         $sth = $this->db->prepare($query);
420 420 
                         $sth->execute();
421 
-                } catch(PDOException $e) {
421 
+                } catch (PDOException $e) {
422 422 
                         echo $e->getMessage();
423 423 
                         die;
424 424 
                 }
 
@@ -433,24 +433,24 @@  discard block
 
 block discarded – undo
433 433 
         * @return Array the spotter information
434 434 
         *
435 435 
         */
436 
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
436 
+        public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array())
437 437 
         {
438 438 
                 global $globalDBdriver, $globalLiveInterval;
439 439 
                 date_default_timezone_set('UTC');
440 440
441 441 
                 $filter_query = '';
442 442 
                 if (isset($filter['source']) && !empty($filter['source'])) {
443 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
443 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
444 444 
                 }
445 445 
                 // Should use spotter_output also ?
446 446 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
447 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
447 
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
448 448 
                 }
449 449 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
450 450 
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
451 451 
                 }
452 452 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
453 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
453 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
454 454 
                 }
455 455
456 456 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -460,7 +460,7 @@  discard block
 
 block discarded – undo
460 460 
                     		    FROM marine_archive
461 461 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
462 462 
 			*/
463 
-			$query  = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk
463 
+			$query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk
464 464 
 				    FROM marine_archive_output
465 465 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao
466 466 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -475,7 +475,7 @@  discard block
 
 block discarded – undo
475 475 
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
476 476 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
477 477 
                         */
478 
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
478 
+                        $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
479 479 
                         	    FROM marine_archive_output
480 480 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
481 481 
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
 
@@ -487,7 +487,7 @@  discard block
 
 block discarded – undo
487 487 
                 try {
488 488 
                         $sth = $this->db->prepare($query);
489 489 
                         $sth->execute();
490 
-                } catch(PDOException $e) {
490 
+                } catch (PDOException $e) {
491 491 
                         echo $e->getMessage();
492 492 
                         die;
493 493 
                 }
 
@@ -502,23 +502,23 @@  discard block
 
 block discarded – undo
502 502 
         * @return Array the spotter information
503 503 
         *
504 504 
         */
505 
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
505 
+        public function getLiveMarineCount($begindate, $enddate, $filter = array())
506 506 
         {
507 507 
                 global $globalDBdriver, $globalLiveInterval;
508 508 
                 date_default_timezone_set('UTC');
509 509
510 510 
                 $filter_query = '';
511 511 
                 if (isset($filter['source']) && !empty($filter['source'])) {
512 
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
512 
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
513 513 
                 }
514 514 
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
515 
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
515 
+                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
516 516 
                 }
517 517 
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
518 518 
                         $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
519 519 
                 }
520 520 
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
521 
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
521 
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
522 522 
                 }
523 523
524 524 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 
@@ -533,7 +533,7 @@  discard block
 
 block discarded – undo
533 533 
                 try {
534 534 
                         $sth = $this->db->prepare($query);
535 535 
                         $sth->execute();
536 
-                } catch(PDOException $e) {
536 
+                } catch (PDOException $e) {
537 537 
                         echo $e->getMessage();
538 538 
                         die;
539 539 
                 }
 
@@ -553,7 +553,7 @@  discard block
 
 block discarded – undo
553 553 
     * @return Array the spotter information
554 554 
     *
555 555 
     */
556 
-    public function searchMarineData($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())
556 
+    public function searchMarineData($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())
557 557 
     {
558 558 
 	global $globalTimezone, $globalDBdriver;
559 559 
 	require_once(dirname(__FILE__).'/class.Translation.php');
 
@@ -575,7 +575,7 @@  discard block
 
 block discarded – undo
575 575
576 576 
 		$q_array = explode(" ", $q);
577 577
578 
-		foreach ($q_array as $q_item){
578 
+		foreach ($q_array as $q_item) {
579 579 
 		    $additional_query .= " AND (";
580 580 
 		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
581 581 
 		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
 
@@ -607,7 +607,7 @@  discard block
 
 block discarded – undo
607 607
608 608 
 	if ($registration != "")
609 609 
 	{
610 
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
610 
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
611 611 
 	    if (!is_string($registration))
612 612 
 	    {
613 613 
 		return false;
 
@@ -618,7 +618,7 @@  discard block
 
 block discarded – undo
618 618
619 619 
 	if ($aircraft_icao != "")
620 620 
 	{
621 
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
621 
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
622 622 
 	    if (!is_string($aircraft_icao))
623 623 
 	    {
624 624 
 		return false;
 
@@ -629,7 +629,7 @@  discard block
 
 block discarded – undo
629 629
630 630 
 	if ($aircraft_manufacturer != "")
631 631 
 	{
632 
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
632 
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
633 633 
 	    if (!is_string($aircraft_manufacturer))
634 634 
 	    {
635 635 
 		return false;
 
@@ -650,7 +650,7 @@  discard block
 
 block discarded – undo
650 650
651 651 
 	if ($airline_icao != "")
652 652 
 	{
653 
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
653 
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
654 654 
 	    if (!is_string($airline_icao))
655 655 
 	    {
656 656 
 		return false;
 
@@ -661,7 +661,7 @@  discard block
 
 block discarded – undo
661 661
662 662 
 	if ($airline_country != "")
663 663 
 	{
664 
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
664 
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
665 665 
 	    if (!is_string($airline_country))
666 666 
 	    {
667 667 
 		return false;
 
@@ -672,7 +672,7 @@  discard block
 
 block discarded – undo
672 672
673 673 
 	if ($airline_type != "")
674 674 
 	{
675 
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
675 
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
676 676 
 	    if (!is_string($airline_type))
677 677 
 	    {
678 678 
 		return false;
 
@@ -694,7 +694,7 @@  discard block
 
 block discarded – undo
694 694
695 695 
 	if ($airport != "")
696 696 
 	{
697 
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
697 
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
698 698 
 	    if (!is_string($airport))
699 699 
 	    {
700 700 
 		return false;
 
@@ -705,7 +705,7 @@  discard block
 
 block discarded – undo
705 705
706 706 
 	if ($airport_country != "")
707 707 
 	{
708 
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
708 
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
709 709 
 	    if (!is_string($airport_country))
710 710 
 	    {
711 711 
 		return false;
 
@@ -716,7 +716,7 @@  discard block
 
 block discarded – undo
716 716
717 717 
 	if ($callsign != "")
718 718 
 	{
719 
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
719 
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
720 720 
 	    if (!is_string($callsign))
721 721 
 	    {
722 722 
 		return false;
 
@@ -724,7 +724,7 @@  discard block
 
 block discarded – undo
724 724 
 		$translate = $Translation->ident2icao($callsign);
725 725 
 		if ($translate != $callsign) {
726 726 
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
727 
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
727 
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
728 728 
 		} else {
729 729 
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
730 730 
 		}
 
@@ -733,7 +733,7 @@  discard block
 
 block discarded – undo
733 733
734 734 
 	if ($owner != "")
735 735 
 	{
736 
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
736 
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
737 737 
 	    if (!is_string($owner))
738 738 
 	    {
739 739 
 		return false;
 
@@ -744,7 +744,7 @@  discard block
 
 block discarded – undo
744 744
745 745 
 	if ($pilot_name != "")
746 746 
 	{
747 
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
747 
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
748 748 
 	    if (!is_string($pilot_name))
749 749 
 	    {
750 750 
 		return false;
 
@@ -755,7 +755,7 @@  discard block
 
 block discarded – undo
755 755
756 756 
 	if ($pilot_id != "")
757 757 
 	{
758 
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
758 
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
759 759 
 	    if (!is_string($pilot_id))
760 760 
 	    {
761 761 
 		return false;
 
@@ -766,7 +766,7 @@  discard block
 
 block discarded – undo
766 766
767 767 
 	if ($departure_airport_route != "")
768 768 
 	{
769 
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
769 
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
770 770 
 	    if (!is_string($departure_airport_route))
771 771 
 	    {
772 772 
 		return false;
 
@@ -777,7 +777,7 @@  discard block
 
 block discarded – undo
777 777
778 778 
 	if ($arrival_airport_route != "")
779 779 
 	{
780 
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
780 
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
781 781 
 	    if (!is_string($arrival_airport_route))
782 782 
 	    {
783 783 
 		return false;
 
@@ -790,8 +790,8 @@  discard block
 
 block discarded – undo
790 790 
 	{
791 791 
 	    $altitude_array = explode(",", $altitude);
792 792
793 
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
794 
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
793 
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
794 
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
795 795
796 796
797 797 
 	    if ($altitude_array[1] != "")
 
@@ -809,8 +809,8 @@  discard block
 
 block discarded – undo
809 809 
 	{
810 810 
 	    $date_array = explode(",", $date_posted);
811 811
812 
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
813 
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
812 
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
813 
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
814 814
815 815 
 	    if ($globalTimezone != '') {
816 816 
 		date_default_timezone_set($globalTimezone);
 
@@ -842,8 +842,8 @@  discard block
 
 block discarded – undo
842 842 
 	{
843 843 
 	    $limit_array = explode(",", $limit);
844 844
845 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
846 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
845 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
846 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
847 847
848 848 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
849 849 
 	    {
 
@@ -854,8 +854,8 @@  discard block
 
 block discarded – undo
854 854
855 855
856 856 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
857 
-		$dist = number_format($dist*0.621371,2,'.','');
858 
-		$query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance
857 
+		$dist = number_format($dist*0.621371, 2, '.', '');
858 
+		$query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance
859 859 
                           FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
860 860 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
861 861 
 	} else {
 
@@ -872,12 +872,12 @@  discard block
 
 block discarded – undo
872 872 
 			$additional_query .= " AND (marine_archive_output.waypoints <> '')";
873 873 
 		}
874 874
875 
-		$query  = "SELECT marine_archive_output.* FROM marine_archive_output
875 
+		$query = "SELECT marine_archive_output.* FROM marine_archive_output
876 876 
 		    WHERE marine_archive_output.ident <> ''
877 877 
 		    ".$additional_query."
878 878 
 		    ".$filter_query.$orderby_query;
879 879 
 	}
880 
-	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
880 
+	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
881 881
882 882 
 	return $spotter_array;
883 883 
     }
 
@@ -894,7 +894,7 @@  discard block
 
 block discarded – undo
894 894 
                 try {
895 895 
                         $sth = $this->db->prepare($query);
896 896 
                         $sth->execute();
897 
-                } catch(PDOException $e) {
897 
+                } catch (PDOException $e) {
898 898 
                         return "error";
899 899 
                 }
900 900 
 	}
 
@@ -931,8 +931,8 @@  discard block
 
 block discarded – undo
931 931 
 	{
932 932 
 	    $limit_array = explode(",", $limit);
933 933
934 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
935 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
934 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
935 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
936 936
937 937 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
938 938 
 	    {
 
@@ -973,7 +973,7 @@  discard block
 
 block discarded – undo
973 973 
 	$query_values = array();
974 974 
 	$limit_query = '';
975 975 
 	$additional_query = '';
976 
-	$filter_query = $this->getFilter($filter,true,true);
976 
+	$filter_query = $this->getFilter($filter, true, true);
977 977
978 978 
 	if ($owner != "")
979 979 
 	{
 
@@ -990,8 +990,8 @@  discard block
 
 block discarded – undo
990 990 
 	{
991 991 
 	    $limit_array = explode(",", $limit);
992 992
993 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
994 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
993 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
994 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
995 995
996 996 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
997 997 
 	    {
 
@@ -1031,7 +1031,7 @@  discard block
 
 block discarded – undo
1031 1031 
 	$query_values = array();
1032 1032 
 	$limit_query = '';
1033 1033 
 	$additional_query = '';
1034 
-	$filter_query = $this->getFilter($filter,true,true);
1034 
+	$filter_query = $this->getFilter($filter, true, true);
1035 1035
1036 1036 
 	if ($pilot != "")
1037 1037 
 	{
 
@@ -1043,8 +1043,8 @@  discard block
 
 block discarded – undo
1043 1043 
 	{
1044 1044 
 	    $limit_array = explode(",", $limit);
1045 1045
1046 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1047 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1046 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1047 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1048 1048
1049 1049 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1050 1050 
 	    {
 
@@ -1074,7 +1074,7 @@  discard block
 
 block discarded – undo
1074 1074 
     * @return Array the airline country list
1075 1075 
     *
1076 1076 
     */
1077 
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
1077 
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
1078 1078 
     {
1079 1079 
 	global $globalDBdriver;
1080 1080 
 	/*
 
@@ -1103,7 +1103,7 @@  discard block
 
 block discarded – undo
1103 1103 
 	$flight_array = array();
1104 1104 
 	$temp_array = array();
1105 1105
1106 
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1106 
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1107 1107 
 	{
1108 1108 
 	    $temp_array['flight_count'] = $row['nb'];
1109 1109 
 	    $temp_array['flight_country'] = $row['name'];
 
@@ -1120,7 +1120,7 @@  discard block
 
 block discarded – undo
1120 1120 
     * @return Array the airline country list
1121 1121 
     *
1122 1122 
     */
1123 
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
1123 
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
1124 1124 
     {
1125 1125 
 	global $globalDBdriver;
1126 1126 
 	/*
 
@@ -1149,7 +1149,7 @@  discard block
 
 block discarded – undo
1149 1149 
 	$flight_array = array();
1150 1150 
 	$temp_array = array();
1151 1151
1152 
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
1152 
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1153 1153 
 	{
1154 1154 
 	    $temp_array['airline_icao'] = $row['airline_icao'];
1155 1155 
 	    $temp_array['flight_count'] = $row['nb'];
 
@@ -1167,14 +1167,14 @@  discard block
 
 block discarded – undo
1167 1167 
     * @return Array the spotter information
1168 1168 
     *
1169 1169 
     */
1170 
-    public function getDateArchiveMarineDataById($id,$date)
1170 
+    public function getDateArchiveMarineDataById($id, $date)
1171 1171 
     {
1172 1172 
 	$Marine = new Marine($this->db);
1173 1173 
 	date_default_timezone_set('UTC');
1174 1174 
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
1175 1175 
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
1176 
-	$date = date('c',$date);
1177 
-	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
1176 
+	$date = date('c', $date);
1177 
+	$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date));
1178 1178 
 	return $spotter_array;
1179 1179 
     }
1180 1180 
 
@@ -1184,14 +1184,14 @@  discard block
 
 block discarded – undo
1184 1184 
     * @return Array the spotter information
1185 1185 
     *
1186 1186 
     */
1187 
-    public function getDateArchiveMarineDataByIdent($ident,$date)
1187 
+    public function getDateArchiveMarineDataByIdent($ident, $date)
1188 1188 
     {
1189 1189 
 	$Marine = new Marine($this->db);
1190 1190 
 	date_default_timezone_set('UTC');
1191 1191 
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1192 1192 
 	$query  = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
1193 
-	$date = date('c',$date);
1194 
-	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
1193 
+	$date = date('c', $date);
1194 
+	$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
1195 1195 
 	return $spotter_array;
1196 1196 
     }
1197 1197 
 
@@ -1201,7 +1201,7 @@  discard block
 
 block discarded – undo
1201 1201 
     * @return Array the spotter information
1202 1202 
     *
1203 1203 
     */
1204 
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
1204 
+    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
1205 1205 
     {
1206 1206 
 	global $global_query;
1207 1207 
 	$Marine = new Marine($this->db);
 
@@ -1209,7 +1209,7 @@  discard block
 
 block discarded – undo
1209 1209 
 	$query_values = array();
1210 1210 
 	$limit_query = '';
1211 1211 
 	$additional_query = '';
1212 
-	$filter_query = $this->getFilter($filters,true,true);
1212 
+	$filter_query = $this->getFilter($filters, true, true);
1213 1213
1214 1214 
 	if ($airport != "")
1215 1215 
 	{
 
@@ -1226,8 +1226,8 @@  discard block
 
 block discarded – undo
1226 1226 
 	{
1227 1227 
 	    $limit_array = explode(",", $limit);
1228 1228
1229 
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1230 
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1229 
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1230 
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1231 1231
1232 1232 
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1233 1233 
 	    {
Please login to merge, or discard this patch.