View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 9fb1e4...96d9e7 )
by Yannick
35:21
created
Status
Category
Toggle Patches
require/class.Stats.php 1 patch
Braces   +661 added lines, -231 removed lines patch added patch discarded remove patch 
@@ -15,10 +15,14 @@  discard block
 
 block discarded – undo
15 15
16 16 
 	public function __construct($dbc = null) {
17 17 
 		global $globalFilterName;
18 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
18 
+		if (isset($globalFilterName)) {
19 
+			$this->filter_name = $globalFilterName;
20 
+		}
19 21 
 		$Connection = new Connection($dbc);
20 22 
 		$this->db = $Connection->db();
21 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
23 
+		if ($this->db === null) {
24 
+			die('Error: No DB connection. (Stats)');
25 
+		}
22 26 
 	}
23 27
24 28 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -86,7 +90,9 @@  discard block
 
 block discarded – undo
86 90
87 91 
 	public function getAllAirlineNames($filter_name = '') {
88 92 
 		global $globalStatsFilters;
89 
-		if ($filter_name == '') $filter_name = $this->filter_name;
93 
+		if ($filter_name == '') {
94 
+			$filter_name = $this->filter_name;
95 
+		}
90 96 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
91 97 
 		 try {
92 98 
 			$sth = $this->db->prepare($query);
 
@@ -106,7 +112,9 @@  discard block
 
 block discarded – undo
106 112 
 		return $all;
107 113 
 	}
108 114 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
109 
-		if ($filter_name == '') $filter_name = $this->filter_name;
115 
+		if ($filter_name == '') {
116 
+			$filter_name = $this->filter_name;
117 
+		}
110 118 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 119 
 		try {
112 120 
 			$sth = $this->db->prepare($query);
 
@@ -118,7 +126,9 @@  discard block
 
 block discarded – undo
118 126 
 		return $all;
119 127 
 	}
120 128 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
121 
-		if ($filter_name == '') $filter_name = $this->filter_name;
129 
+		if ($filter_name == '') {
130 
+			$filter_name = $this->filter_name;
131 
+		}
122 132 
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
123 133 
 		try {
124 134 
 			$sth = $this->db->prepare($query);
 
@@ -130,7 +140,9 @@  discard block
 
 block discarded – undo
130 140 
 		return $all;
131 141 
 	}
132 142 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
133 
-		if ($filter_name == '') $filter_name = $this->filter_name;
143 
+		if ($filter_name == '') {
144 
+			$filter_name = $this->filter_name;
145 
+		}
134 146 
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
135 147 
 		try {
136 148 
 			$sth = $this->db->prepare($query);
 
@@ -143,7 +155,9 @@  discard block
 
 block discarded – undo
143 155 
 	}
144 156
145 157 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
158 
+		if ($filter_name == '') {
159 
+			$filter_name = $this->filter_name;
160 
+		}
147 161 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 162 
 		try {
149 163 
 			$sth = $this->db->prepare($query);
 
@@ -156,7 +170,9 @@  discard block
 
 block discarded – undo
156 170 
 	}
157 171
158 172 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
159 
-		if ($filter_name == '') $filter_name = $this->filter_name;
173 
+		if ($filter_name == '') {
174 
+			$filter_name = $this->filter_name;
175 
+		}
160 176 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
161 177 
 		try {
162 178 
 			$sth = $this->db->prepare($query);
 
@@ -171,7 +187,9 @@  discard block
 
 block discarded – undo
171 187
172 188 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
173 189 
 		global $globalStatsFilters;
174 
-		if ($filter_name == '') $filter_name = $this->filter_name;
190 
+		if ($filter_name == '') {
191 
+			$filter_name = $this->filter_name;
192 
+		}
175 193 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
176 194 
 			$Spotter = new Spotter($this->db);
177 195 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -180,8 +198,11 @@  discard block
 
 block discarded – undo
180 198 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
181 199 
 			}
182 200 
 			if ($year == '' && $month == '') {
183 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
201 
+				if ($limit) {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
203 
+				} else {
204 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
205 
+				}
185 206 
 				try {
186 207 
 					$sth = $this->db->prepare($query);
187 208 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -189,11 +210,16 @@  discard block
 
 block discarded – undo
189 210 
 					echo "error : ".$e->getMessage();
190 211 
 				}
191 212 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
192 
-			} else $all = array();
213 
+			} else {
214 
+				$all = array();
215 
+			}
193 216 
 		} else {
194 217 
 			if ($year == '' && $month == '') {
195 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
196 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
218 
+				if ($limit) {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
220 
+				} else {
221 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
222 
+				}
197 223 
 				try {
198 224 
 					$sth = $this->db->prepare($query);
199 225 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -201,7 +227,9 @@  discard block
 
 block discarded – undo
201 227 
 					echo "error : ".$e->getMessage();
202 228 
 				}
203 229 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 
-			} else $all = array();
230 
+			} else {
231 
+				$all = array();
232 
+			}
205 233 
 		}
206 234 
 		if (empty($all)) {
207 235 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -220,10 +248,15 @@  discard block
 
 block discarded – undo
220 248 
 	}
221 249 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
222 250 
 		global $globalStatsFilters;
223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
251 
+		if ($filter_name == '') {
252 
+			$filter_name = $this->filter_name;
253 
+		}
224 254 
 		if ($year == '' && $month == '') {
225 
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
226 
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
255 
+			if ($limit) {
256 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
257 
+			} else {
258 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
259 
+			}
227 260 
 			try {
228 261 
 				$sth = $this->db->prepare($query);
229 262 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -231,7 +264,9 @@  discard block
 
 block discarded – undo
231 264 
 				echo "error : ".$e->getMessage();
232 265 
 			}
233 266 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 
-		} else $all = array();
267 
+		} else {
268 
+			$all = array();
269 
+		}
235 270 
 		if (empty($all)) {
236 271 
 			$Spotter = new Spotter($this->db);
237 272 
 			$filters = array();
 
@@ -246,7 +281,9 @@  discard block
 
 block discarded – undo
246 281 
 	}
247 282 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
248 283 
 		global $globalStatsFilters;
249 
-		if ($filter_name == '') $filter_name = $this->filter_name;
284 
+		if ($filter_name == '') {
285 
+			$filter_name = $this->filter_name;
286 
+		}
250 287 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
251 288 
 			$Spotter = new Spotter($this->db);
252 289 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -255,8 +292,11 @@  discard block
 
 block discarded – undo
255 292 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
256 293 
 			}
257 294 
 			if ($year == '' && $month == '') {
258 
-				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";
259 
-				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";
295 
+				if ($limit) {
296 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
297 
+				} else {
298 
+					$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";
299 
+				}
260 300 
 				try {
261 301 
 					$sth = $this->db->prepare($query);
262 302 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -264,11 +304,16 @@  discard block
 
 block discarded – undo
264 304 
 					echo "error : ".$e->getMessage();
265 305 
 				}
266 306 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
267 
-			} else $all = array();
307 
+			} else {
308 
+				$all = array();
309 
+			}
268 310 
 		} else {
269 311 
 			if ($year == '' && $month == '') {
270 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
271 
-				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";
312 
+				if ($limit) {
313 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
314 
+				} else {
315 
+					$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";
316 
+				}
272 317 
 				try {
273 318 
 					$sth = $this->db->prepare($query);
274 319 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -276,7 +321,9 @@  discard block
 
 block discarded – undo
276 321 
 					echo "error : ".$e->getMessage();
277 322 
 				}
278 323 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
279 
-			} else $all = array();
324 
+			} else {
325 
+				$all = array();
326 
+			}
280 327 
 		}
281 328 
 		if (empty($all)) {
282 329 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -296,7 +343,9 @@  discard block
 
 block discarded – undo
296 343
297 344 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
298 345 
 		global $globalStatsFilters;
299 
-		if ($filter_name == '') $filter_name = $this->filter_name;
346 
+		if ($filter_name == '') {
347 
+			$filter_name = $this->filter_name;
348 
+		}
300 349 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
301 350 
 			$Spotter = new Spotter($this->db);
302 351 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -305,8 +354,11 @@  discard block
 
 block discarded – undo
305 354 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
306 355 
 			}
307 356 
 			if ($year == '' && $month == '') {
308 
-				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";
309 
-				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";
357 
+				if ($limit) {
358 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_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";
359 
+				} else {
360 
+					$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";
361 
+				}
310 362 
 				try {
311 363 
 					$sth = $this->db->prepare($query);
312 364 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -314,11 +366,16 @@  discard block
 
 block discarded – undo
314 366 
 					echo "error : ".$e->getMessage();
315 367 
 				}
316 368 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
317 
-			} else $all = array();
369 
+			} else {
370 
+				$all = array();
371 
+			}
318 372 
 		} else {
319 373 
 			if ($year == '' && $month == '') {
320 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
321 
-				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";
374 
+				if ($limit) {
375 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
376 
+				} else {
377 
+					$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";
378 
+				}
322 379 
 				try {
323 380 
 					$sth = $this->db->prepare($query);
324 381 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -326,7 +383,9 @@  discard block
 
 block discarded – undo
326 383 
 					echo "error : ".$e->getMessage();
327 384 
 				}
328 385 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
329 
-			} else $all = array();
386 
+			} else {
387 
+				$all = array();
388 
+			}
330 389 
 		}
331 390 
 		if (empty($all)) {
332 391 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -345,7 +404,9 @@  discard block
 
 block discarded – undo
345 404 
 	}
346 405 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
347 406 
 		global $globalStatsFilters;
348 
-		if ($filter_name == '') $filter_name = $this->filter_name;
407 
+		if ($filter_name == '') {
408 
+			$filter_name = $this->filter_name;
409 
+		}
349 410 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
350 411 
 			$Spotter = new Spotter($this->db);
351 412 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -353,12 +414,18 @@  discard block
 
 block discarded – undo
353 414 
 			foreach ($airlines as $airline) {
354 415 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
355 416 
 			}
356 
-			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";
357 
-			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";
417 
+			if ($limit) {
418 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.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";
419 
+			} else {
420 
+				$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";
421 
+			}
358 422 
 			$query_values = array(':filter_name' => $filter_name);
359 423 
 		} else {
360 
-			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";
361 
-			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";
424 
+			if ($limit) {
425 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.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";
426 
+			} else {
427 
+				$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";
428 
+			}
362 429 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
363 430 
 		}
364 431 
 		try {
 
@@ -386,17 +453,29 @@  discard block
 
 block discarded – undo
386 453
387 454 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
388 455 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
389 
-		if ($filter_name == '') $filter_name = $this->filter_name;
456 
+		if ($filter_name == '') {
457 
+			$filter_name = $this->filter_name;
458 
+		}
390 459 
 		if ($year == '' && $month == '') {
391 
-			if ($globalVATSIM) $forsource = 'vatsim';
392 
-			if ($globalIVAO) $forsource = 'ivao';
460 
+			if ($globalVATSIM) {
461 
+				$forsource = 'vatsim';
462 
+			}
463 
+			if ($globalIVAO) {
464 
+				$forsource = 'ivao';
465 
+			}
393 466 
 			if (isset($forsource)) {
394 
-				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";
395 
-				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";
467 
+				if ($limit) {
468 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
469 
+				} else {
470 
+					$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";
471 
+				}
396 472 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
397 473 
 			} else {
398 
-				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";
399 
-				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";
474 
+				if ($limit) {
475 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
476 
+				} else {
477 
+					$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";
478 
+				}
400 479 
 				$query_values = array(':filter_name' => $filter_name);
401 480 
 			}
402 481 
 			try {
 
@@ -406,7 +485,9 @@  discard block
 
 block discarded – undo
406 485 
 				echo "error : ".$e->getMessage();
407 486 
 			}
408 487 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409 
-		} else $all = array();
488 
+		} else {
489 
+			$all = array();
490 
+		}
410 491 
                 if (empty($all)) {
411 492 
 	                $Spotter = new Spotter($this->db);
412 493 
             		$filters = array();
 
@@ -421,7 +502,9 @@  discard block
 
 block discarded – undo
421 502 
 	}
422 503 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
423 504 
 		global $globalStatsFilters;
424 
-		if ($filter_name == '') $filter_name = $this->filter_name;
505 
+		if ($filter_name == '') {
506 
+			$filter_name = $this->filter_name;
507 
+		}
425 508 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
426 509 
 			$Spotter = new Spotter($this->db);
427 510 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -430,8 +513,11 @@  discard block
 
 block discarded – undo
430 513 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
431 514 
 			}
432 515 
 			if ($year == '' && $month == '') {
433 
-				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";
434 
-				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";
516 
+				if ($limit) {
517 
+					$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";
518 
+				} else {
519 
+					$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";
520 
+				}
435 521 
 				try {
436 522 
 					$sth = $this->db->prepare($query);
437 523 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -439,11 +525,16 @@  discard block
 
 block discarded – undo
439 525 
 					echo "error : ".$e->getMessage();
440 526 
 				}
441 527 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
442 
-			} else $all = array();
528 
+			} else {
529 
+				$all = array();
530 
+			}
443 531 
 		} else {
444 532 
 			if ($year == '' && $month == '') {
445 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
446 
-				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";
533 
+				if ($limit) {
534 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
535 
+				} else {
536 
+					$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";
537 
+				}
447 538 
 				try {
448 539 
 					$sth = $this->db->prepare($query);
449 540 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -451,7 +542,9 @@  discard block
 
 block discarded – undo
451 542 
 					echo "error : ".$e->getMessage();
452 543 
 				}
453 544 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
454 
-			} else $all = array();
545 
+			} else {
546 
+				$all = array();
547 
+			}
455 548 
 		}
456 549 
 		if (empty($all)) {
457 550 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -470,7 +563,9 @@  discard block
 
 block discarded – undo
470 563 
 	}
471 564 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
472 565 
 		global $globalStatsFilters;
473 
-		if ($filter_name == '') $filter_name = $this->filter_name;
566 
+		if ($filter_name == '') {
567 
+			$filter_name = $this->filter_name;
568 
+		}
474 569 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
475 570 
 			$Spotter = new Spotter($this->db);
476 571 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -479,8 +574,11 @@  discard block
 
 block discarded – undo
479 574 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
480 575 
 			}
481 576 
 			if ($year == '' && $month == '') {
482 
-				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";
483 
-				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";
577 
+				if ($limit) {
578 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
579 
+				} else {
580 
+					$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";
581 
+				}
484 582 
 				 try {
485 583 
 					$sth = $this->db->prepare($query);
486 584 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -488,11 +586,16 @@  discard block
 
 block discarded – undo
488 586 
 					echo "error : ".$e->getMessage();
489 587 
 				}
490 588 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
491 
-			} else $all = array();
589 
+			} else {
590 
+				$all = array();
591 
+			}
492 592 
 		} else {
493 593 
 			if ($year == '' && $month == '') {
494 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
495 
-				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";
594 
+				if ($limit) {
595 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
596 
+				} else {
597 
+					$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";
598 
+				}
496 599 
 				 try {
497 600 
 					$sth = $this->db->prepare($query);
498 601 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -500,7 +603,9 @@  discard block
 
 block discarded – undo
500 603 
 					echo "error : ".$e->getMessage();
501 604 
 				}
502 605 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
503 
-			} else $all = array();
606 
+			} else {
607 
+				$all = array();
608 
+			}
504 609 
 		}
505 610 
 		if (empty($all)) {
506 611 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -519,7 +624,9 @@  discard block
 
 block discarded – undo
519 624 
 	}
520 625 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
521 626 
 		$Connection = new Connection($this->db);
522 
-		if ($filter_name == '') $filter_name = $this->filter_name;
627 
+		if ($filter_name == '') {
628 
+			$filter_name = $this->filter_name;
629 
+		}
523 630 
 		if ($Connection->tableExists('countries')) {
524 631 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
525 632 
 				$Spotter = new Spotter($this->db);
 
@@ -529,8 +636,11 @@  discard block
 
 block discarded – undo
529 636 
 					foreach ($airlines as $airline) {
530 637 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
531 638 
 					}
532 
-					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";
533 
-					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";
639 
+					if ($limit) {
640 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
641 
+					} else {
642 
+						$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";
643 
+					}
534 644 
 					 try {
535 645 
 						$sth = $this->db->prepare($query);
536 646 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -539,11 +649,16 @@  discard block
 
 block discarded – undo
539 649 
 					}
540 650 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
541 651 
 					return $all;
542 
-				} else return array();
652 
+				} else {
653 
+					return array();
654 
+				}
543 655 
 			} else {
544 656 
 				if ($year == '' && $month == '') {
545 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
546 
-					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";
657 
+					if ($limit) {
658 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
659 
+					} else {
660 
+						$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";
661 
+					}
547 662 
 					 try {
548 663 
 						$sth = $this->db->prepare($query);
549 664 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -552,7 +667,9 @@  discard block
 
 block discarded – undo
552 667 
 					}
553 668 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 669 
 					return $all;
555 
-				} else return array();
670 
+				} else {
671 
+					return array();
672 
+				}
556 673 
 			}
557 674 
 		} else {
558 675 
 			/*
 
@@ -566,10 +683,15 @@  discard block
 
 block discarded – undo
566 683 
 	}
567 684 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
568 685 
 		global $globalStatsFilters;
569 
-		if ($filter_name == '') $filter_name = $this->filter_name;
686 
+		if ($filter_name == '') {
687 
+			$filter_name = $this->filter_name;
688 
+		}
570 689 
 		if ($year == '' && $month == '') {
571 
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
572 
-			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";
690 
+			if ($limit) {
691 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
692 
+			} else {
693 
+				$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";
694 
+			}
573 695 
 			try {
574 696 
 				$sth = $this->db->prepare($query);
575 697 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -577,7 +699,9 @@  discard block
 
 block discarded – undo
577 699 
 				echo "error : ".$e->getMessage();
578 700 
 			}
579 701 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
580 
-		} else $all = array();
702 
+		} else {
703 
+			$all = array();
704 
+		}
581 705 
 		if (empty($all)) {
582 706 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
583 707 
 			if ($filter_name != '') {
 
@@ -592,7 +716,9 @@  discard block
 
 block discarded – undo
592 716
593 717 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
594 718 
 		global $globalStatsFilters;
595 
-		if ($filter_name == '') $filter_name = $this->filter_name;
719 
+		if ($filter_name == '') {
720 
+			$filter_name = $this->filter_name;
721 
+		}
596 722 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
597 723 
 			$Spotter = new Spotter($this->db);
598 724 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -601,8 +727,11 @@  discard block
 
 block discarded – undo
601 727 
 				foreach ($airlines as $airline) {
602 728 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
603 729 
 				}
604 
-				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";
605 
-				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";
730 
+				if ($limit) {
731 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
732 
+				} else {
733 
+					$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";
734 
+				}
606 735 
 				try {
607 736 
 					$sth = $this->db->prepare($query);
608 737 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -610,11 +739,16 @@  discard block
 
 block discarded – undo
610 739 
 					echo "error : ".$e->getMessage();
611 740 
 				}
612 741 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
613 
-			} else $all = array();
742 
+			} else {
743 
+				$all = array();
744 
+			}
614 745 
 		} else {
615 746 
 			if ($year == '' && $month == '') {
616 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
617 
-				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";
747 
+				if ($limit) {
748 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
749 
+				} else {
750 
+					$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";
751 
+				}
618 752 
 				try {
619 753 
 					$sth = $this->db->prepare($query);
620 754 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -622,7 +756,9 @@  discard block
 
 block discarded – undo
622 756 
 					echo "error : ".$e->getMessage();
623 757 
 				}
624 758 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
625 
-			} else $all = array();
759 
+			} else {
760 
+				$all = array();
761 
+			}
626 762 
 		}
627 763 
 		if (empty($all)) {
628 764 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -641,7 +777,9 @@  discard block
 
 block discarded – undo
641 777 
 	}
642 778 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
643 779 
 		global $globalStatsFilters;
644 
-		if ($filter_name == '') $filter_name = $this->filter_name;
780 
+		if ($filter_name == '') {
781 
+			$filter_name = $this->filter_name;
782 
+		}
645 783 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
646 784 
 			$Spotter = new Spotter($this->db);
647 785 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -650,8 +788,11 @@  discard block
 
 block discarded – undo
650 788 
 				foreach ($airlines as $airline) {
651 789 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
652 790 
 				}
653 
-				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";
654 
-				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";
791 
+				if ($limit) {
792 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
793 
+				} else {
794 
+					$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";
795 
+				}
655 796 
 				try {
656 797 
 					$sth = $this->db->prepare($query);
657 798 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -659,11 +800,16 @@  discard block
 
 block discarded – undo
659 800 
 					echo "error : ".$e->getMessage();
660 801 
 				}
661 802 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 
-			} else $all = array();
803 
+			} else {
804 
+				$all = array();
805 
+			}
663 806 
 		} else {
664 807 
 			if ($year == '' && $month == '') {
665 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
666 
-				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";
808 
+				if ($limit) {
809 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
810 
+				} else {
811 
+					$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";
812 
+				}
667 813 
 				try {
668 814 
 					$sth = $this->db->prepare($query);
669 815 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -671,7 +817,9 @@  discard block
 
 block discarded – undo
671 817 
 					echo "error : ".$e->getMessage();
672 818 
 				}
673 819 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
674 
-			} else $all = array();
820 
+			} else {
821 
+				$all = array();
822 
+			}
675 823 
 		}
676 824 
 		if (empty($all)) {
677 825 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -696,7 +844,9 @@  discard block
 
 block discarded – undo
696 844 
 				$icao = $value['airport_departure_icao'];
697 845 
 				if (isset($all[$icao])) {
698 846 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
699 
-				} else $all[$icao] = $value;
847 
+				} else {
848 
+					$all[$icao] = $value;
849 
+				}
700 850 
 			}
701 851 
 			$count = array();
702 852 
 			foreach ($all as $key => $row) {
 
@@ -708,7 +858,9 @@  discard block
 
 block discarded – undo
708 858 
 	}
709 859 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
710 860 
 		global $globalStatsFilters;
711 
-		if ($filter_name == '') $filter_name = $this->filter_name;
861 
+		if ($filter_name == '') {
862 
+			$filter_name = $this->filter_name;
863 
+		}
712 864 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
713 865 
 			$Spotter = new Spotter($this->db);
714 866 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -717,8 +869,11 @@  discard block
 
 block discarded – undo
717 869 
 				foreach ($airlines as $airline) {
718 870 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
719 871 
 				}
720 
-				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";
721 
-				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";
872 
+				if ($limit) {
873 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
874 
+				} else {
875 
+					$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";
876 
+				}
722 877 
 				try {
723 878 
 					$sth = $this->db->prepare($query);
724 879 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -726,11 +881,16 @@  discard block
 
 block discarded – undo
726 881 
 					echo "error : ".$e->getMessage();
727 882 
 				}
728 883 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
729 
-			} else $all = array();
884 
+			} else {
885 
+				$all = array();
886 
+			}
730 887 
 		} else {
731 888 
 			if ($year == '' && $month == '') {
732 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
733 
-				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";
889 
+				if ($limit) {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
891 
+				} else {
892 
+					$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";
893 
+				}
734 894 
 				try {
735 895 
 					$sth = $this->db->prepare($query);
736 896 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -738,7 +898,9 @@  discard block
 
 block discarded – undo
738 898 
 					echo "error : ".$e->getMessage();
739 899 
 				}
740 900 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
741 
-			} else $all = array();
901 
+			} else {
902 
+				$all = array();
903 
+			}
742 904 
 		}
743 905 
 		if (empty($all)) {
744 906 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -763,7 +925,9 @@  discard block
 
 block discarded – undo
763 925 
 				$icao = $value['airport_arrival_icao'];
764 926 
 				if (isset($all[$icao])) {
765 927 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
766 
-				} else $all[$icao] = $value;
928 
+				} else {
929 
+					$all[$icao] = $value;
930 
+				}
767 931 
 			}
768 932 
 			$count = array();
769 933 
 			foreach ($all as $key => $row) {
 
@@ -775,7 +939,9 @@  discard block
 
 block discarded – undo
775 939 
 	}
776 940 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
777 941 
 		global $globalDBdriver, $globalStatsFilters;
778 
-		if ($filter_name == '') $filter_name = $this->filter_name;
942 
+		if ($filter_name == '') {
943 
+			$filter_name = $this->filter_name;
944 
+		}
779 945 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
780 946 
 			$Spotter = new Spotter($this->db);
781 947 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -784,20 +950,32 @@  discard block
 
 block discarded – undo
784 950 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
785 951 
 			}
786 952 
 			if ($globalDBdriver == 'mysql') {
787 
-				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";
788 
-				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";
953 
+				if ($limit) {
954 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955 
+				} else {
956 
+					$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";
957 
+				}
789 958 
 			} else {
790 
-				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";
791 
-				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";
959 
+				if ($limit) {
960 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_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";
961 
+				} else {
962 
+					$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";
963 
+				}
792 964 
 			}
793 965 
 			$query_data = array(':filter_name' => $filter_name);
794 966 
 		} else {
795 967 
 			if ($globalDBdriver == 'mysql') {
796 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
797 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
968 
+				if ($limit) {
969 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
970 
+				} else {
971 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
972 
+				}
798 973 
 			} else {
799 
-				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";
800 
-				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";
974 
+				if ($limit) {
975 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
976 
+				} else {
977 
+					$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";
978 
+				}
801 979 
 			}
802 980 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
803 981 
 		}
 
@@ -825,7 +1003,9 @@  discard block
 
 block discarded – undo
825 1003
826 1004 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
827 1005 
 		global $globalStatsFilters;
828 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1006 
+		if ($filter_name == '') {
1007 
+			$filter_name = $this->filter_name;
1008 
+		}
829 1009 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
830 1010 
 			$Spotter = new Spotter($this->db);
831 1011 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -862,7 +1042,9 @@  discard block
 
 block discarded – undo
862 1042 
 	}
863 1043 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
864 1044 
 		global $globalDBdriver, $globalStatsFilters;
865 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1045 
+		if ($filter_name == '') {
1046 
+			$filter_name = $this->filter_name;
1047 
+		}
866 1048 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
867 1049 
 			$Spotter = new Spotter($this->db);
868 1050 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -907,7 +1089,9 @@  discard block
 
 block discarded – undo
907 1089 
 	}
908 1090 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
909 1091 
 		global $globalStatsFilters;
910 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1092 
+		if ($filter_name == '') {
1093 
+			$filter_name = $this->filter_name;
1094 
+		}
911 1095 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
912 1096 
 			$Spotter = new Spotter($this->db);
913 1097 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -944,7 +1128,9 @@  discard block
 
 block discarded – undo
944 1128 
 	}
945 1129 
 	public function countAllDatesMarine($filter_name = '') {
946 1130 
 		global $globalStatsFilters;
947 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1131 
+		if ($filter_name == '') {
1132 
+			$filter_name = $this->filter_name;
1133 
+		}
948 1134 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
949 1135 
 		$query_data = array(':filter_name' => $filter_name);
950 1136 
 		try {
 
@@ -966,7 +1152,9 @@  discard block
 
 block discarded – undo
966 1152 
 	}
967 1153 
 	public function countAllDatesTracker($filter_name = '') {
968 1154 
 		global $globalStatsFilters;
969 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1155 
+		if ($filter_name == '') {
1156 
+			$filter_name = $this->filter_name;
1157 
+		}
970 1158 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
971 1159 
 		$query_data = array(':filter_name' => $filter_name);
972 1160 
 		try {
 
@@ -988,7 +1176,9 @@  discard block
 
 block discarded – undo
988 1176 
 	}
989 1177 
 	public function countAllDatesByAirlines($filter_name = '') {
990 1178 
 		global $globalStatsFilters;
991 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1179 
+		if ($filter_name == '') {
1180 
+			$filter_name = $this->filter_name;
1181 
+		}
992 1182 
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
993 1183 
 		$query_data = array('filter_name' => $filter_name);
994 1184 
 		try {
 
@@ -1010,7 +1200,9 @@  discard block
 
 block discarded – undo
1010 1200 
 	}
1011 1201 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
1012 1202 
 		global $globalStatsFilters, $globalDBdriver;
1013 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1203 
+		if ($filter_name == '') {
1204 
+			$filter_name = $this->filter_name;
1205 
+		}
1014 1206 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1015 1207 
 			$Spotter = new Spotter($this->db);
1016 1208 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1095,7 +1287,9 @@  discard block
 
 block discarded – undo
1095 1287 
 	}
1096 1288 
 	public function countAllMilitaryMonths($filter_name = '') {
1097 1289 
 		global $globalStatsFilters;
1098 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1290 
+		if ($filter_name == '') {
1291 
+			$filter_name = $this->filter_name;
1292 
+		}
1099 1293 
 		$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
1100 1294 
 		try {
1101 1295 
 			$sth = $this->db->prepare($query);
 
@@ -1116,7 +1310,9 @@  discard block
 
 block discarded – undo
1116 1310 
 	}
1117 1311 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1118 1312 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1119 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1313 
+		if ($filter_name == '') {
1314 
+			$filter_name = $this->filter_name;
1315 
+		}
1120 1316 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1121 1317 
 			$Spotter = new Spotter($this->db);
1122 1318 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1124,12 +1320,18 @@  discard block
 
 block discarded – undo
1124 1320 
 			foreach ($airlines as $airline) {
1125 1321 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1126 1322 
 			}
1127 
-			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";
1128 
-			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";
1323 
+			if ($limit) {
1324 
+				$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";
1325 
+			} else {
1326 
+				$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";
1327 
+			}
1129 1328 
 			$query_data = array(':filter_name' => $filter_name);
1130 1329 
 		} else {
1131 
-			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";
1132 
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1330 
+			if ($limit) {
1331 
+				$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";
1332 
+			} else {
1333 
+				$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";
1334 
+			}
1133 1335 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1134 1336 
 		}
1135 1337 
 		if ($orderby == 'hour') {
 
@@ -1139,7 +1341,9 @@  discard block
 
 block discarded – undo
1139 1341 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1140 1342 
 			}
1141 1343 
 		}
1142 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1344 
+		if ($orderby == 'count') {
1345 
+			$query .= " ORDER BY hour_count DESC";
1346 
+		}
1143 1347 
 		try {
1144 1348 
 			$sth = $this->db->prepare($query);
1145 1349 
 			$sth->execute($query_data);
 
@@ -1163,8 +1367,12 @@  discard block
 
 block discarded – undo
1163 1367 
 	}
1164 1368 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1165 1369 
 		global $globalStatsFilters;
1166 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1167 
-		if ($year == '') $year = date('Y');
1370 
+		if ($filter_name == '') {
1371 
+			$filter_name = $this->filter_name;
1372 
+		}
1373 
+		if ($year == '') {
1374 
+			$year = date('Y');
1375 
+		}
1168 1376 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1169 1377 
 		if (empty($all)) {
1170 1378 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1183,8 +1391,12 @@  discard block
 
 block discarded – undo
1183 1391 
 	}
1184 1392 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1185 1393 
 		global $globalStatsFilters;
1186 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1187 
-		if ($year == '') $year = date('Y');
1394 
+		if ($filter_name == '') {
1395 
+			$filter_name = $this->filter_name;
1396 
+		}
1397 
+		if ($year == '') {
1398 
+			$year = date('Y');
1399 
+		}
1188 1400 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1189 1401 
 		if (empty($all)) {
1190 1402 
 			$filters = array();
 
@@ -1200,8 +1412,12 @@  discard block
 
 block discarded – undo
1200 1412 
 	}
1201 1413 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1202 1414 
 		global $globalStatsFilters;
1203 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1204 
-		if ($year == '') $year = date('Y');
1415 
+		if ($filter_name == '') {
1416 
+			$filter_name = $this->filter_name;
1417 
+		}
1418 
+		if ($year == '') {
1419 
+			$year = date('Y');
1420 
+		}
1205 1421 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1206 1422 
 		if (empty($all)) {
1207 1423 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1220,7 +1436,9 @@  discard block
 
 block discarded – undo
1220 1436 
 	}
1221 1437 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1222 1438 
 		global $globalStatsFilters;
1223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1439 
+		if ($filter_name == '') {
1440 
+			$filter_name = $this->filter_name;
1441 
+		}
1224 1442 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1225 1443 
 			$Spotter = new Spotter($this->db);
1226 1444 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1238,7 +1456,9 @@  discard block
 
 block discarded – undo
1238 1456 
 				}
1239 1457 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1240 1458 
 				$all = $result[0]['nb'];
1241 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1459 
+			} else {
1460 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1461 
+			}
1242 1462 
 		} else {
1243 1463 
 			if ($year == '' && $month == '') {
1244 1464 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1250,7 +1470,9 @@  discard block
 
 block discarded – undo
1250 1470 
 				}
1251 1471 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1252 1472 
 				$all = $result[0]['nb'];
1253 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1473 
+			} else {
1474 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1475 
+			}
1254 1476 
 		}
1255 1477 
 		if (empty($all)) {
1256 1478 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1269,7 +1491,9 @@  discard block
 
 block discarded – undo
1269 1491 
 	}
1270 1492 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1271 1493 
 		global $globalStatsFilters;
1272 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1494 
+		if ($filter_name == '') {
1495 
+			$filter_name = $this->filter_name;
1496 
+		}
1273 1497 
 		if ($year == '' && $month == '') {
1274 1498 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1275 1499 
 			try {
 
@@ -1280,7 +1504,9 @@  discard block
 
 block discarded – undo
1280 1504 
 			}
1281 1505 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1282 1506 
 			$all = $result[0]['nb_airline'];
1283 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1507 
+		} else {
1508 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1509 
+		}
1284 1510 
 		if (empty($all)) {
1285 1511 
 			$filters = array();
1286 1512 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1295,7 +1521,9 @@  discard block
 
 block discarded – undo
1295 1521 
 	}
1296 1522 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1297 1523 
 		global $globalStatsFilters;
1298 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1524 
+		if ($filter_name == '') {
1525 
+			$filter_name = $this->filter_name;
1526 
+		}
1299 1527 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1300 1528 
 			$Spotter = new Spotter($this->db);
1301 1529 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1350,7 +1578,9 @@  discard block
 
 block discarded – undo
1350 1578 
 	}
1351 1579 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1352 1580 
 		global $globalStatsFilters;
1353 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1581 
+		if ($filter_name == '') {
1582 
+			$filter_name = $this->filter_name;
1583 
+		}
1354 1584 
 		//if ($year == '') $year = date('Y');
1355 1585 
 		if ($year == '' && $month == '') {
1356 1586 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1379,7 +1609,9 @@  discard block
 
 block discarded – undo
1379 1609 
 	}
1380 1610
1381 1611 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1382 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1612 
+		if ($filter_name == '') {
1613 
+			$filter_name = $this->filter_name;
1614 
+		}
1383 1615 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1384 1616 
 			$Spotter = new Spotter($this->db);
1385 1617 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1403,7 +1635,9 @@  discard block
 
 block discarded – undo
1403 1635 
 		return $all;
1404 1636 
 	}
1405 1637 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1406 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1638 
+		if ($filter_name == '') {
1639 
+			$filter_name = $this->filter_name;
1640 
+		}
1407 1641 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1408 1642 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1409 1643 
 		try {
 
@@ -1416,7 +1650,9 @@  discard block
 
 block discarded – undo
1416 1650 
 		return $all;
1417 1651 
 	}
1418 1652 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1419 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1653 
+		if ($filter_name == '') {
1654 
+			$filter_name = $this->filter_name;
1655 
+		}
1420 1656 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1421 1657 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422 1658 
 		try {
 
@@ -1427,7 +1663,9 @@  discard block
 
 block discarded – undo
1427 1663 
 		}
1428 1664 
 	}
1429 1665 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1430 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1666 
+		if ($filter_name == '') {
1667 
+			$filter_name = $this->filter_name;
1668 
+		}
1431 1669 
 		global $globalArchiveMonths, $globalDBdriver;
1432 1670 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1433 1671 
 			$Spotter = new Spotter($this->db);
 
@@ -1483,7 +1721,9 @@  discard block
 
 block discarded – undo
1483 1721 
 	}
1484 1722 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1485 1723 
 		global $globalArchiveMonths, $globalDBdriver;
1486 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1724 
+		if ($filter_name == '') {
1725 
+			$filter_name = $this->filter_name;
1726 
+		}
1487 1727 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1488 1728 
 			$Spotter = new Spotter($this->db);
1489 1729 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1516,7 +1756,9 @@  discard block
 
 block discarded – undo
1516 1756 
 	}
1517 1757 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1518 1758 
 		global $globalArchiveMonths, $globalDBdriver;
1519 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1759 
+		if ($filter_name == '') {
1760 
+			$filter_name = $this->filter_name;
1761 
+		}
1520 1762 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1521 1763 
 			$Spotter = new Spotter($this->db);
1522 1764 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1547,7 +1789,9 @@  discard block
 
 block discarded – undo
1547 1789 
 	}
1548 1790 
 	public function getStatsAirlineTotal($filter_name = '') {
1549 1791 
 		global $globalArchiveMonths, $globalDBdriver;
1550 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1792 
+		if ($filter_name == '') {
1793 
+			$filter_name = $this->filter_name;
1794 
+		}
1551 1795 
 		if ($globalDBdriver == 'mysql') {
1552 1796 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1553 1797 
 		} else {
 
@@ -1564,7 +1808,9 @@  discard block
 
 block discarded – undo
1564 1808 
 	}
1565 1809 
 	public function getStatsOwnerTotal($filter_name = '') {
1566 1810 
 		global $globalArchiveMonths, $globalDBdriver;
1567 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1811 
+		if ($filter_name == '') {
1812 
+			$filter_name = $this->filter_name;
1813 
+		}
1568 1814 
 		if ($globalDBdriver == 'mysql') {
1569 1815 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1570 1816 
 		} else {
 
@@ -1581,7 +1827,9 @@  discard block
 
 block discarded – undo
1581 1827 
 	}
1582 1828 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1583 1829 
 		global $globalArchiveMonths, $globalDBdriver;
1584 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1830 
+		if ($filter_name == '') {
1831 
+			$filter_name = $this->filter_name;
1832 
+		}
1585 1833 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1586 1834 
 		try {
1587 1835 
 			$sth = $this->db->prepare($query);
 
@@ -1590,12 +1838,17 @@  discard block
 
 block discarded – undo
1590 1838 
 			echo "error : ".$e->getMessage();
1591 1839 
 		}
1592 1840 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1593 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1594 
-		else return 0;
1841 
+		if (isset($all[0]['cnt'])) {
1842 
+			return $all[0]['cnt'];
1843 
+		} else {
1844 
+			return 0;
1845 
+		}
1595 1846 
 	}
1596 1847 
 	public function getStatsPilotTotal($filter_name = '') {
1597 1848 
 		global $globalArchiveMonths, $globalDBdriver;
1598 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1849 
+		if ($filter_name == '') {
1850 
+			$filter_name = $this->filter_name;
1851 
+		}
1599 1852 
 		if ($globalDBdriver == 'mysql') {
1600 1853 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1601 1854 
 		} else {
 
@@ -1612,7 +1865,9 @@  discard block
 
 block discarded – undo
1612 1865 
 	}
1613 1866 
 	public function getStatsPilot($pilot,$filter_name = '') {
1614 1867 
 		global $globalArchiveMonths, $globalDBdriver;
1615 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1868 
+		if ($filter_name == '') {
1869 
+			$filter_name = $this->filter_name;
1870 
+		}
1616 1871 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1617 1872 
 		try {
1618 1873 
 			$sth = $this->db->prepare($query);
 
@@ -1621,13 +1876,18 @@  discard block
 
 block discarded – undo
1621 1876 
 			echo "error : ".$e->getMessage();
1622 1877 
 		}
1623 1878 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1624 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1625 
-		else return 0;
1879 
+		if (isset($all[0]['cnt'])) {
1880 
+			return $all[0]['cnt'];
1881 
+		} else {
1882 
+			return 0;
1883 
+		}
1626 1884 
 	}
1627 1885
1628 1886 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1629 1887 
 		global $globalDBdriver;
1630 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1888 
+		if ($filter_name == '') {
1889 
+			$filter_name = $this->filter_name;
1890 
+		}
1631 1891 
 		if ($globalDBdriver == 'mysql') {
1632 1892 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1633 1893 
 		} else {
 
@@ -1643,7 +1903,9 @@  discard block
 
 block discarded – undo
1643 1903 
 	}
1644 1904 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1645 1905 
 		global $globalDBdriver;
1646 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1906 
+		if ($filter_name == '') {
1907 
+			$filter_name = $this->filter_name;
1908 
+		}
1647 1909 
 		if ($globalDBdriver == 'mysql') {
1648 1910 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1649 1911 
 		} else {
 
@@ -2116,27 +2378,37 @@  discard block
 
 block discarded – undo
2116 2378 
 		date_default_timezone_set('UTC');
2117 2379 
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
2118 2380 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
2119 
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
2381 
+			if ($globalDebug) {
2382 
+				echo '!!! Update Marine stats !!!'."\n";
2383 
+			}
2120 2384 
 			if (isset($last_update[0]['value'])) {
2121 2385 
 				$last_update_day = $last_update[0]['value'];
2122 
-			} else $last_update_day = '2012-12-12 12:12:12';
2386 
+			} else {
2387 
+				$last_update_day = '2012-12-12 12:12:12';
2388 
+			}
2123 2389 
 			$reset = false;
2124 2390 
 			$Marine = new Marine($this->db);
2125 2391 
 			$filtername = 'marine';
2126 2392 
 			if ($Connection->tableExists('countries')) {
2127 
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2393 
+				if ($globalDebug) {
2394 
+					echo 'Count all vessels by countries...'."\n";
2395 
+				}
2128 2396 
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2129 2397 
 				foreach ($alldata as $number) {
2130 2398 
 					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2131 2399 
 				}
2132 2400 
 			}
2133 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2401 
+			if ($globalDebug) {
2402 
+				echo 'Count all vessels by months...'."\n";
2403 
+			}
2134 2404 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2135 2405 
 			$filter_last_month = array('since_date' => $last_month);
2136 2406 
 			$alldata = $Marine->countAllMonths($filter_last_month);
2137 2407 
 			$lastyear = false;
2138 2408 
 			foreach ($alldata as $number) {
2139 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2409 
+				if ($number['year_name'] != date('Y')) {
2410 
+					$lastyear = true;
2411 
+				}
2140 2412 
 				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2141 2413 
 			}
2142 2414 
 			echo 'Marine data...'."\n";
 
@@ -2172,26 +2444,36 @@  discard block
 
 block discarded – undo
2172 2444 
 		}
2173 2445 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2174 2446 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
2175 
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
2447 
+			if ($globalDebug) {
2448 
+				echo '!!! Update tracker stats !!!'."\n";
2449 
+			}
2176 2450 
 			if (isset($last_update[0]['value'])) {
2177 2451 
 				$last_update_day = $last_update[0]['value'];
2178 
-			} else $last_update_day = '2012-12-12 12:12:12';
2452 
+			} else {
2453 
+				$last_update_day = '2012-12-12 12:12:12';
2454 
+			}
2179 2455 
 			$reset = false;
2180 2456 
 			$Tracker = new Tracker($this->db);
2181 2457 
 			if ($Connection->tableExists('countries')) {
2182 
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2458 
+				if ($globalDebug) {
2459 
+					echo 'Count all trackers by countries...'."\n";
2460 
+				}
2183 2461 
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2184 2462 
 				foreach ($alldata as $number) {
2185 2463 
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2186 2464 
 				}
2187 2465 
 			}
2188 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2466 
+			if ($globalDebug) {
2467 
+				echo 'Count all vessels by months...'."\n";
2468 
+			}
2189 2469 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2190 2470 
 			$filter_last_month = array('since_date' => $last_month);
2191 2471 
 			$alldata = $Tracker->countAllMonths($filter_last_month);
2192 2472 
 			$lastyear = false;
2193 2473 
 			foreach ($alldata as $number) {
2194 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2474 
+				if ($number['year_name'] != date('Y')) {
2475 
+					$lastyear = true;
2476 
+				}
2195 2477 
 				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2196 2478 
 			}
2197 2479 
 			echo 'Tracker data...'."\n";
 
@@ -2228,10 +2510,14 @@  discard block
 
 block discarded – undo
2228 2510
2229 2511 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
2230 2512 
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
2231 
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
2513 
+			if ($globalDebug) {
2514 
+				echo '!!! Update aicraft stats !!!'."\n";
2515 
+			}
2232 2516 
 			if (isset($last_update[0]['value'])) {
2233 2517 
 				$last_update_day = $last_update[0]['value'];
2234 
-			} else $last_update_day = '2012-12-12 12:12:12';
2518 
+			} else {
2519 
+				$last_update_day = '2012-12-12 12:12:12';
2520 
+			}
2235 2521 
 			$reset = false;
2236 2522 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
2237 2523 
 			if ($globalStatsResetYear) {
 
@@ -2240,43 +2526,63 @@  discard block
 
 block discarded – undo
2240 2526 
 			}
2241 2527 
 			$Spotter = new Spotter($this->db);
2242 2528
2243 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2529 
+			if ($globalDebug) {
2530 
+				echo 'Count all aircraft types...'."\n";
2531 
+			}
2244 2532 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2245 2533 
 			foreach ($alldata as $number) {
2246 2534 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2247 2535 
 			}
2248 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2536 
+			if ($globalDebug) {
2537 
+				echo 'Count all airlines...'."\n";
2538 
+			}
2249 2539 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2250 2540 
 			foreach ($alldata as $number) {
2251 2541 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2252 2542 
 			}
2253 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2543 
+			if ($globalDebug) {
2544 
+				echo 'Count all registrations...'."\n";
2545 
+			}
2254 2546 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2255 2547 
 			foreach ($alldata as $number) {
2256 2548 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2257 2549 
 			}
2258 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2550 
+			if ($globalDebug) {
2551 
+				echo 'Count all callsigns...'."\n";
2552 
+			}
2259 2553 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2260 2554 
 			foreach ($alldata as $number) {
2261 2555 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2262 2556 
 			}
2263 
-			if ($globalDebug) echo 'Count all owners...'."\n";
2557 
+			if ($globalDebug) {
2558 
+				echo 'Count all owners...'."\n";
2559 
+			}
2264 2560 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2265 2561 
 			foreach ($alldata as $number) {
2266 2562 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2267 2563 
 			}
2268 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2564 
+			if ($globalDebug) {
2565 
+				echo 'Count all pilots...'."\n";
2566 
+			}
2269 2567 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2270 2568 
 			foreach ($alldata as $number) {
2271 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2569 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2570 
+					$number['pilot_id'] = $number['pilot_name'];
2571 
+				}
2272 2572 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2273 2573 
 			}
2274 2574
2275 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2575 
+			if ($globalDebug) {
2576 
+				echo 'Count all departure airports...'."\n";
2577 
+			}
2276 2578 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2277 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2579 
+			if ($globalDebug) {
2580 
+				echo 'Count all detected departure airports...'."\n";
2581 
+			}
2278 2582 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2279 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2583 
+			if ($globalDebug) {
2584 
+				echo 'Order departure airports...'."\n";
2585 
+			}
2280 2586 
 			$alldata = array();
2281 2587 
 			foreach ($pall as $value) {
2282 2588 
 				$icao = $value['airport_departure_icao'];
 
@@ -2286,7 +2592,9 @@  discard block
 
 block discarded – undo
2286 2592 
 				$icao = $value['airport_departure_icao'];
2287 2593 
 				if (isset($alldata[$icao])) {
2288 2594 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2289 
-				} else $alldata[$icao] = $value;
2595 
+				} else {
2596 
+					$alldata[$icao] = $value;
2597 
+				}
2290 2598 
 			}
2291 2599 
 			$count = array();
2292 2600 
 			foreach ($alldata as $key => $row) {
 
@@ -2296,11 +2604,17 @@  discard block
 
 block discarded – undo
2296 2604 
 			foreach ($alldata as $number) {
2297 2605 
 				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);
2298 2606 
 			}
2299 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2607 
+			if ($globalDebug) {
2608 
+				echo 'Count all arrival airports...'."\n";
2609 
+			}
2300 2610 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2301 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2611 
+			if ($globalDebug) {
2612 
+				echo 'Count all detected arrival airports...'."\n";
2613 
+			}
2302 2614 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2303 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2615 
+			if ($globalDebug) {
2616 
+				echo 'Order arrival airports...'."\n";
2617 
+			}
2304 2618 
 			$alldata = array();
2305 2619 
 			foreach ($pall as $value) {
2306 2620 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2310,7 +2624,9 @@  discard block
 
 block discarded – undo
2310 2624 
 				$icao = $value['airport_arrival_icao'];
2311 2625 
 				if (isset($alldata[$icao])) {
2312 2626 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2313 
-				} else $alldata[$icao] = $value;
2627 
+				} else {
2628 
+					$alldata[$icao] = $value;
2629 
+				}
2314 2630 
 			}
2315 2631 
 			$count = array();
2316 2632 
 			foreach ($alldata as $key => $row) {
 
@@ -2321,7 +2637,9 @@  discard block
 
 block discarded – undo
2321 2637 
 				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);
2322 2638 
 			}
2323 2639 
 			if ($Connection->tableExists('countries')) {
2324 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2640 
+				if ($globalDebug) {
2641 
+					echo 'Count all flights by countries...'."\n";
2642 
+				}
2325 2643 
 				//$SpotterArchive = new SpotterArchive();
2326 2644 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2327 2645 
 				$Spotter = new Spotter($this->db);
 
@@ -2332,7 +2650,9 @@  discard block
 
 block discarded – undo
2332 2650 
 			}
2333 2651
2334 2652 
 			if (isset($globalAccidents) && $globalAccidents) {
2335 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2653 
+				if ($globalDebug) {
2654 
+					echo 'Count fatalities stats...'."\n";
2655 
+				}
2336 2656 
 				$Accident = new Accident($this->db);
2337 2657 
 				$this->deleteStatsByType('fatalities_byyear');
2338 2658 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2348,48 +2668,68 @@  discard block
 
 block discarded – undo
2348 2668
2349 2669 
 			// Add by month using getstat if month finish...
2350 2670 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2351 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2671 
+			if ($globalDebug) {
2672 
+				echo 'Count all flights by months...'."\n";
2673 
+			}
2352 2674 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2353 2675 
 			$filter_last_month = array('since_date' => $last_month);
2354 2676 
 			$Spotter = new Spotter($this->db);
2355 2677 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2356 2678 
 			$lastyear = false;
2357 2679 
 			foreach ($alldata as $number) {
2358 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2680 
+				if ($number['year_name'] != date('Y')) {
2681 
+					$lastyear = true;
2682 
+				}
2359 2683 
 				$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'])));
2360 2684 
 			}
2361 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2685 
+			if ($globalDebug) {
2686 
+				echo 'Count all military flights by months...'."\n";
2687 
+			}
2362 2688 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2363 2689 
 			foreach ($alldata as $number) {
2364 2690 
 				$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'])));
2365 2691 
 			}
2366 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2692 
+			if ($globalDebug) {
2693 
+				echo 'Count all owners by months...'."\n";
2694 
+			}
2367 2695 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2368 2696 
 			foreach ($alldata as $number) {
2369 2697 
 				$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'])));
2370 2698 
 			}
2371 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2699 
+			if ($globalDebug) {
2700 
+				echo 'Count all pilots by months...'."\n";
2701 
+			}
2372 2702 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2373 2703 
 			foreach ($alldata as $number) {
2374 2704 
 				$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'])));
2375 2705 
 			}
2376 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2706 
+			if ($globalDebug) {
2707 
+				echo 'Count all airlines by months...'."\n";
2708 
+			}
2377 2709 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2378 2710 
 			foreach ($alldata as $number) {
2379 2711 
 				$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'])));
2380 2712 
 			}
2381 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2713 
+			if ($globalDebug) {
2714 
+				echo 'Count all aircrafts by months...'."\n";
2715 
+			}
2382 2716 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2383 2717 
 			foreach ($alldata as $number) {
2384 2718 
 				$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'])));
2385 2719 
 			}
2386 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2720 
+			if ($globalDebug) {
2721 
+				echo 'Count all real arrivals by months...'."\n";
2722 
+			}
2387 2723 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2388 2724 
 			foreach ($alldata as $number) {
2389 2725 
 				$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'])));
2390 2726 
 			}
2391 
-			if ($globalDebug) echo 'Airports data...'."\n";
2392 
-			if ($globalDebug) echo '...Departure'."\n";
2727 
+			if ($globalDebug) {
2728 
+				echo 'Airports data...'."\n";
2729 
+			}
2730 
+			if ($globalDebug) {
2731 
+				echo '...Departure'."\n";
2732 
+			}
2393 2733 
 			$this->deleteStatAirport('daily');
2394 2734 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2395 2735 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2507,7 +2847,9 @@  discard block
 
 block discarded – undo
2507 2847 
 			// Count by airlines
2508 2848 
 			echo '--- Stats by airlines ---'."\n";
2509 2849 
 			if ($Connection->tableExists('countries')) {
2510 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2850 
+				if ($globalDebug) {
2851 
+					echo 'Count all flights by countries by airlines...'."\n";
2852 
+				}
2511 2853 
 				$SpotterArchive = new SpotterArchive($this->db);
2512 2854 
 				//$Spotter = new Spotter($this->db);
2513 2855 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2516,37 +2858,53 @@  discard block
 
 block discarded – undo
2516 2858 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2517 2859 
 				}
2518 2860 
 			}
2519 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2861 
+			if ($globalDebug) {
2862 
+				echo 'Count all aircraft types by airlines...'."\n";
2863 
+			}
2520 2864 
 			$Spotter = new Spotter($this->db);
2521 2865 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2522 2866 
 			foreach ($alldata as $number) {
2523 2867 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2524 2868 
 			}
2525 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2869 
+			if ($globalDebug) {
2870 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2871 
+			}
2526 2872 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2527 2873 
 			foreach ($alldata as $number) {
2528 2874 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2529 2875 
 			}
2530 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2876 
+			if ($globalDebug) {
2877 
+				echo 'Count all callsigns by airlines...'."\n";
2878 
+			}
2531 2879 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2532 2880 
 			foreach ($alldata as $number) {
2533 2881 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2534 2882 
 			}
2535 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2883 
+			if ($globalDebug) {
2884 
+				echo 'Count all owners by airlines...'."\n";
2885 
+			}
2536 2886 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2537 2887 
 			foreach ($alldata as $number) {
2538 2888 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2539 2889 
 			}
2540 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2890 
+			if ($globalDebug) {
2891 
+				echo 'Count all pilots by airlines...'."\n";
2892 
+			}
2541 2893 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2542 2894 
 			foreach ($alldata as $number) {
2543 2895 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2544 2896 
 			}
2545 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2897 
+			if ($globalDebug) {
2898 
+				echo 'Count all departure airports by airlines...'."\n";
2899 
+			}
2546 2900 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2547 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2901 
+			if ($globalDebug) {
2902 
+				echo 'Count all detected departure airports by airlines...'."\n";
2903 
+			}
2548 2904 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2549 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2905 
+			if ($globalDebug) {
2906 
+				echo 'Order detected departure airports by airlines...'."\n";
2907 
+			}
2550 2908 
 			//$alldata = array();
2551 2909 
 			foreach ($dall as $value) {
2552 2910 
 				$icao = $value['airport_departure_icao'];
 
@@ -2567,11 +2925,17 @@  discard block
 
 block discarded – undo
2567 2925 
 			foreach ($alldata as $number) {
2568 2926 
 				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);
2569 2927 
 			}
2570 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2928 
+			if ($globalDebug) {
2929 
+				echo 'Count all arrival airports by airlines...'."\n";
2930 
+			}
2571 2931 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2572 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2932 
+			if ($globalDebug) {
2933 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2934 
+			}
2573 2935 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2574 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2936 
+			if ($globalDebug) {
2937 
+				echo 'Order arrival airports by airlines...'."\n";
2938 
+			}
2575 2939 
 			//$alldata = array();
2576 2940 
 			foreach ($dall as $value) {
2577 2941 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2590,37 +2954,53 @@  discard block
 
 block discarded – undo
2590 2954 
 			}
2591 2955 
 			$alldata = $pall;
2592 2956 
 			foreach ($alldata as $number) {
2593 
-				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);
2957 
+				if ($number['airline_icao'] != '') {
2958 
+					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);
2959 
+				}
2960 
+			}
2961 
+			if ($globalDebug) {
2962 
+				echo 'Count all flights by months by airlines...'."\n";
2594 2963 
 			}
2595 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2596 2964 
 			$Spotter = new Spotter($this->db);
2597 2965 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2598 2966 
 			$lastyear = false;
2599 2967 
 			foreach ($alldata as $number) {
2600 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2968 
+				if ($number['year_name'] != date('Y')) {
2969 
+					$lastyear = true;
2970 
+				}
2601 2971 
 				$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']);
2602 2972 
 			}
2603 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2973 
+			if ($globalDebug) {
2974 
+				echo 'Count all owners by months by airlines...'."\n";
2975 
+			}
2604 2976 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2605 2977 
 			foreach ($alldata as $number) {
2606 2978 
 				$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']);
2607 2979 
 			}
2608 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2980 
+			if ($globalDebug) {
2981 
+				echo 'Count all pilots by months by airlines...'."\n";
2982 
+			}
2609 2983 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2610 2984 
 			foreach ($alldata as $number) {
2611 2985 
 				$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']);
2612 2986 
 			}
2613 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2987 
+			if ($globalDebug) {
2988 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2989 
+			}
2614 2990 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2615 2991 
 			foreach ($alldata as $number) {
2616 2992 
 				$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']);
2617 2993 
 			}
2618 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2994 
+			if ($globalDebug) {
2995 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2996 
+			}
2619 2997 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2620 2998 
 			foreach ($alldata as $number) {
2621 2999 
 				$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']);
2622 3000 
 			}
2623 
-			if ($globalDebug) echo '...Departure'."\n";
3001 
+			if ($globalDebug) {
3002 
+				echo '...Departure'."\n";
3003 
+			}
2624 3004 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2625 3005 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2626 3006 
 			foreach ($dall as $value) {
 
@@ -2643,7 +3023,9 @@  discard block
 
 block discarded – undo
2643 3023 
 			foreach ($alldata as $number) {
2644 3024 
 				$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']);
2645 3025 
 			}
2646 
-			if ($globalDebug) echo '...Arrival'."\n";
3026 
+			if ($globalDebug) {
3027 
+				echo '...Arrival'."\n";
3028 
+			}
2647 3029 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2648 3030 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2649 3031 
 			foreach ($dall as $value) {
 
@@ -2667,13 +3049,19 @@  discard block
 
 block discarded – undo
2667 3049 
 				$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']);
2668 3050 
 			}
2669 3051
2670 
-			if ($globalDebug) echo 'Flights data...'."\n";
2671 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3052 
+			if ($globalDebug) {
3053 
+				echo 'Flights data...'."\n";
3054 
+			}
3055 
+			if ($globalDebug) {
3056 
+				echo '-> countAllDatesLastMonth...'."\n";
3057 
+			}
2672 3058 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2673 3059 
 			foreach ($alldata as $number) {
2674 3060 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2675 3061 
 			}
2676 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
3062 
+			if ($globalDebug) {
3063 
+				echo '-> countAllDates...'."\n";
3064 
+			}
2677 3065 
 			//$previousdata = $this->countAllDatesByAirlines();
2678 3066 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2679 3067 
 			$values = array();
 
@@ -2686,14 +3074,18 @@  discard block
 
 block discarded – undo
2686 3074 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2687 3075 
 			}
2688 3076
2689 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
3077 
+			if ($globalDebug) {
3078 
+				echo '-> countAllHours...'."\n";
3079 
+			}
2690 3080 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2691 3081 
 			foreach ($alldata as $number) {
2692 3082 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2693 3083 
 			}
2694 3084
2695 3085 
 			// Stats by filters
2696 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
3086 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
3087 
+				$globalStatsFilters = array();
3088 
+			}
2697 3089 
 			foreach ($globalStatsFilters as $name => $filter) {
2698 3090 
 				if (!empty($filter)) {
2699 3091 
 					//$filter_name = $filter['name'];
 
@@ -2701,7 +3093,9 @@  discard block
 
 block discarded – undo
2701 3093 
 					$reset = false;
2702 3094 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2703 3095 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2704 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3096 
+						if ($globalDebug) {
3097 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3098 
+						}
2705 3099 
 						$this->deleteOldStats($filter_name);
2706 3100 
 						unset($last_update);
2707 3101 
 					}
 
@@ -2718,39 +3112,55 @@  discard block
 
 block discarded – undo
2718 3112 
 						$reset = true;
2719 3113 
 					}
2720 3114 
 					// Count by filter
2721 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3115 
+					if ($globalDebug) {
3116 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
3117 
+					}
2722 3118 
 					$Spotter = new Spotter($this->db);
2723 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3119 
+					if ($globalDebug) {
3120 
+						echo 'Count all aircraft types...'."\n";
3121 
+					}
2724 3122 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2725 3123 
 					foreach ($alldata as $number) {
2726 3124 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2727 3125 
 					}
2728 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
3126 
+					if ($globalDebug) {
3127 
+						echo 'Count all airlines...'."\n";
3128 
+					}
2729 3129 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2730 3130 
 					foreach ($alldata as $number) {
2731 3131 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2732 3132 
 					}
2733 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3133 
+					if ($globalDebug) {
3134 
+						echo 'Count all aircraft registrations...'."\n";
3135 
+					}
2734 3136 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2735 3137 
 					foreach ($alldata as $number) {
2736 3138 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2737 3139 
 					}
2738 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
3140 
+					if ($globalDebug) {
3141 
+						echo 'Count all callsigns...'."\n";
3142 
+					}
2739 3143 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2740 3144 
 					foreach ($alldata as $number) {
2741 3145 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2742 3146 
 					}
2743 
-					if ($globalDebug) echo 'Count all owners...'."\n";
3147 
+					if ($globalDebug) {
3148 
+						echo 'Count all owners...'."\n";
3149 
+					}
2744 3150 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2745 3151 
 					foreach ($alldata as $number) {
2746 3152 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2747 3153 
 					}
2748 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
3154 
+					if ($globalDebug) {
3155 
+						echo 'Count all pilots...'."\n";
3156 
+					}
2749 3157 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2750 3158 
 					foreach ($alldata as $number) {
2751 3159 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2752 3160 
 					}
2753 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
3161 
+					if ($globalDebug) {
3162 
+						echo 'Count departure airports...'."\n";
3163 
+					}
2754 3164 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2755 3165 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2756 3166 
 					$alldata = array();
 
@@ -2762,7 +3172,9 @@  discard block
 
 block discarded – undo
2762 3172 
 						$icao = $value['airport_departure_icao'];
2763 3173 
 						if (isset($alldata[$icao])) {
2764 3174 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2765 
-						} else $alldata[$icao] = $value;
3175 
+						} else {
3176 
+							$alldata[$icao] = $value;
3177 
+						}
2766 3178 
 					}
2767 3179 
 					$count = array();
2768 3180 
 					foreach ($alldata as $key => $row) {
 
@@ -2772,7 +3184,9 @@  discard block
 
 block discarded – undo
2772 3184 
 					foreach ($alldata as $number) {
2773 3185 
 						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);
2774 3186 
 					}
2775 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3187 
+					if ($globalDebug) {
3188 
+						echo 'Count all arrival airports...'."\n";
3189 
+					}
2776 3190 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2777 3191 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2778 3192 
 					$alldata = array();
 
@@ -2784,7 +3198,9 @@  discard block
 
 block discarded – undo
2784 3198 
 						$icao = $value['airport_arrival_icao'];
2785 3199 
 						if (isset($alldata[$icao])) {
2786 3200 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2787 
-						} else $alldata[$icao] = $value;
3201 
+						} else {
3202 
+							$alldata[$icao] = $value;
3203 
+						}
2788 3204 
 					}
2789 3205 
 					$count = array();
2790 3206 
 					foreach ($alldata as $key => $row) {
 
@@ -2794,35 +3210,49 @@  discard block
 
 block discarded – undo
2794 3210 
 					foreach ($alldata as $number) {
2795 3211 
 						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);
2796 3212 
 					}
2797 
-					if ($globalDebug) echo 'Count all months...'."\n";
3213 
+					if ($globalDebug) {
3214 
+						echo 'Count all months...'."\n";
3215 
+					}
2798 3216 
 					$Spotter = new Spotter($this->db);
2799 3217 
 					$alldata = $Spotter->countAllMonths($filter);
2800 3218 
 					$lastyear = false;
2801 3219 
 					foreach ($alldata as $number) {
2802 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
3220 
+						if ($number['year_name'] != date('Y')) {
3221 
+							$lastyear = true;
3222 
+						}
2803 3223 
 						$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);
2804 3224 
 					}
2805 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
3225 
+					if ($globalDebug) {
3226 
+						echo 'Count all owners by months...'."\n";
3227 
+					}
2806 3228 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2807 3229 
 					foreach ($alldata as $number) {
2808 3230 
 						$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);
2809 3231 
 					}
2810 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3232 
+					if ($globalDebug) {
3233 
+						echo 'Count all pilots by months...'."\n";
3234 
+					}
2811 3235 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2812 3236 
 					foreach ($alldata as $number) {
2813 3237 
 						$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);
2814 3238 
 					}
2815 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
3239 
+					if ($globalDebug) {
3240 
+						echo 'Count all military by months...'."\n";
3241 
+					}
2816 3242 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2817 3243 
 					foreach ($alldata as $number) {
2818 3244 
 						$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);
2819 3245 
 					}
2820 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3246 
+					if ($globalDebug) {
3247 
+						echo 'Count all aircrafts by months...'."\n";
3248 
+					}
2821 3249 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2822 3250 
 				    	foreach ($alldata as $number) {
2823 3251 
 			    			$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);
2824 3252 
 					}
2825 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3253 
+					if ($globalDebug) {
3254 
+						echo 'Count all real arrivals by months...'."\n";
3255 
+					}
2826 3256 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2827 3257 
 					foreach ($alldata as $number) {
2828 3258 
 						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
Please login to merge, or discard this patch.
live-czml.php 1 patch
Braces   +116 added lines, -42 removed lines patch added patch discarded remove patch 
@@ -8,8 +8,12 @@  discard block
 
 block discarded – undo
8 8 
 }
9 9 
 $tracker = false;
10 10 
 $marine = false;
11 
-if (isset($_GET['tracker'])) $tracker = true;
12 
-if (isset($_GET['marine'])) $marine = true;
11 
+if (isset($_GET['tracker'])) {
12 
+	$tracker = true;
13 
+}
14 
+if (isset($_GET['marine'])) {
15 
+	$marine = true;
16 
+}
13 17 
 if ($tracker) {
14 18 
 	require_once('require/class.Tracker.php');
15 19 
 	require_once('require/class.TrackerLive.php');
 
@@ -66,23 +70,46 @@  discard block
 
 block discarded – undo
66 70 
 }
67 71 
 header('Content-Type: text/javascript');
68 72
69 
-if (!isset($globalJsonCompress)) $compress = true;
70 
-else $compress = $globalJsonCompress;
73 
+if (!isset($globalJsonCompress)) {
74 
+	$compress = true;
75 
+} else {
76 
+	$compress = $globalJsonCompress;
77 
+}
71 78
72 79 
 $from_archive = false;
73 80 
 $min = false;
74 81 
 $allhistory = false;
75 82 
 $filter['source'] = array();
76 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
77 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
78 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
79 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
80 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
81 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
82 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
83 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
84 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
85 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
83 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
84 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
85 
+}
86 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
87 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
88 
+}
89 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
90 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
91 
+}
92 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
93 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
94 
+}
95 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
96 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
97 
+}
98 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
99 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
100 
+}
101 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
102 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
103 
+}
104 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
105 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
106 
+}
107 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
108 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
109 
+}
110 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
111 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
112 
+}
86 113 
 /*
87 114 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
88 115 
 	$min = true;
 
@@ -179,8 +206,12 @@  discard block
 
 block discarded – undo
179 206 
 	} else {
180 207 
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
181 208 
 	}
182 
-	if ($flightcnt == '') $flightcnt = 0;
183 
-} else $flightcnt = 0;
209 
+	if ($flightcnt == '') {
210 
+		$flightcnt = 0;
211 
+	}
212 
+	} else {
213 
+	$flightcnt = 0;
214 
+}
184 215
185 216 
 $sqltime = round(microtime(true)-$begintime,2);
186 217 
 $minitime = time();
 
@@ -216,7 +247,9 @@  discard block
 
 block discarded – undo
216 247 
 $prev_flightaware_id = '';
217 248 
 $speed = 1;
218 249 
 $gltf2 = false;
219 
-if (isset($archivespeed)) $speed = $archivespeed;
250 
+if (isset($archivespeed)) {
251 
+	$speed = $archivespeed;
252 
+}
220 253 
 $output = '[';
221 254 
 if ($tracker) {
222 255 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -252,9 +285,13 @@  discard block
 
 block discarded – undo
252 285 
 			$image = "images/placeholder_thumb.png";
253 286 
 		}
254 287
255 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
256 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
257 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
288 
+                if (isset($spotter_item['flightaware_id'])) {
289 
+                	$id = $spotter_item['flightaware_id'];
290 
+                } elseif (isset($spotter_item['famtrackid'])) {
291 
+                	$id = $spotter_item['famtrackid'];
292 
+                } elseif (isset($spotter_item['fammarine_id'])) {
293 
+                	$id = $spotter_item['fammarine_id'];
294 
+                }
258 295 
                 if ($prev_flightaware_id != $id) {
259 296 
 			if ($prev_flightaware_id != '') {
260 297 
 				/*
 
@@ -301,7 +338,9 @@  discard block
 
 block discarded – undo
301 338 
 						}
302 339 
 					}
303 340 
 				}
304 
-				if ($ident != '') $output.= '"ident": "'.$ident.'",';
341 
+				if ($ident != '') {
342 
+					$output.= '"ident": "'.$ident.'",';
343 
+				}
305 344 
 				$output.= '"gltf2": %gltf2%,';
306 345 
 				$output.= '"type": "flight"';
307 346 
 			}
 
@@ -332,7 +371,9 @@  discard block
 
 block discarded – undo
332 371 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
333 372 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
334 373 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
335 
-						} else $aircraft_shadow = '';
374 
+						} else {
375 
+							$aircraft_shadow = '';
376 
+						}
336 377 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
337 378 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
338 379 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -340,7 +381,9 @@  discard block
 
 block discarded – undo
340 381 
 						}
341 382 
 						$output .= '},';
342 383 
 					}
343 
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
384 
+				} else {
385 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAfCAYAAACVgY94AAAACXBIWXMAAC4jAAAuIwF4pT92AAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAA7VJREFUeNrEl2uIlWUQx39nXUu0m2uQbZYrbabdLKMs/VBkmHQjioqFIhBS+hKEQpQRgVAf2u5RQkGBRUllRH4I2e5ZUBJlEZVt5i0tTfHStrZ6fn35L70d9n7Obg88vOedmWfmf2bmmZkXlRrtq9V16mZ1iVqqhd5agXvQf1c5zw/V8dXqrqO6dQKwBrgdWApsCb0VqAc2AnOrMVANwIsD4BLgTOBPYB2wHJgEzAG+ANqAu4ZsZYiuX5QwfqI2hvaNulA9J7zLQn8o76vUuuHOwXHqSzH4aIF+TWjnBkSH+nCBf716SP1KPWO4AJ6ltgfIjRW8p9U/1KPz/ry6RT2mIDNF3Zjz19Ya4G1R/J16dgWvQd2pPlXhMdVZPUTgxfCW1wJgXUJpQlvfg8zs8K8r0Caom9QHetG7NGfa1ElDBThRXRtFd/Qh16puKIS3e7+clBjdy7kL1b3q4fzJQQGck5z6Nb97kxujblWf64HXov7Vl/E4YXWccP9AAd6dAx+ox/WTArNzY1t64B0f8K0DyLXuUvRGZfcpCo1VX4tg6wB76WMB0dALf526foAX8cqUot2pGP8B2Kz+krBeNYjS8636dh/8Beo2deoA9TWp76pd6g0q9cDNwKvAD8A84EfglLRBe2g+JWAfcEF68bPABOCoAl/gIPA5MA64FVgGnNhP292W3r0SeB1YVlJXAjcBP8XwyQUj9AKwAzg2+/fQSsBhoJxBAaALaIzenZGnD911wA7gEDAD2FFSpwOzgDHZ5T7+ZSlGd2d6AXgi5+qAn+O5U0PbBVwKtAD3AHuB8f3YGBUdncCGoQ4LE9XtGRqK9LnduVPRIu2BPqwD65IYbS7Qpql7Ql9YoJcy9bwzkgPrfOCj5G33+h54E/g0PAr5thq4ApgyEgNrc27aWwVaPTA1QJ4BjgTGFvhteV40EgPrgvTP7qlmZqFnl9WD+b2posN83E/NrEkOjlI/U1fkfUYa/pe5IE3qZPW8jFOqiyN7p3pAPX04c7AxYSoDDcAjKT2LgLXA6IR2M3Bviv59wDTgQGTPH84Qd8+HXfHcoUws2zM0HMjuUPep+xP2PWpnwtw0GJsldbBpewQwE/gbeDyt7H1gcW53O7AC+A3Yn6+/W+Ld9SnWA15DAVhc8xK2TuA9YHrCuhV4EngFuBx4YagG6qv8cF+T52kB2Zy+e1I8taUacNV+uBdXO7ABmJwJpwx8XQvF9TUCWM64tiQhbq/oMv+7BwFWpQzNT8vbVQul/wwAGzzdmXU1xuUAAAAASUVORK5CYII=","scale" : 0.5},';
386 
+				}
344 387 
 			} elseif ($one3dmodel) {
345 388 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
346 389 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -380,7 +423,9 @@  discard block
 
 block discarded – undo
380 423 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
381 424 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
382 425 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
383 
-						} else $aircraft_shadow = '';
426 
+						} else {
427 
+							$aircraft_shadow = '';
428 
+						}
384 429 
 						if ($aircraft_shadow != '') {
385 430 
 							if (isset($modelsdb[$aircraft_shadow])) {
386 431 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -517,7 +562,9 @@  discard block
 
 block discarded – undo
517 562 
 								}
518 563 
 								$output .= '},';
519 564 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
520 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
565 
+								if ($spotter_item['aircraft_icao'] != '') {
566 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
567 
+								}
521 568 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
522 569 
 							}
523 570 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -539,7 +586,9 @@  discard block
 
 block discarded – undo
539 586 
 							}
540 587 
 							$output .= '},';
541 588 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
542 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
589 
+							if ($spotter_item['aircraft_icao'] != '') {
590 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
591 
+							}
543 592 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
544 593 
 						}
545 594 
 					} else {
 
@@ -552,7 +601,9 @@  discard block
 
 block discarded – undo
552 601 
 						}
553 602 
 						$output .= '},';
554 603 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
555 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
604 
+						if ($spotter_item['aircraft_icao'] != '') {
605 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
606 
+						}
556 607 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
557 608 
 					}
558 609 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -656,8 +707,11 @@  discard block
 
 block discarded – undo
656 707 
 					$output .= '},';
657 708 
 				}
658 709 
 			}
659 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
660 
-			else $output = str_replace('%onground%','false',$output);
710 
+			if (isset($onground) && $onground) {
711 
+				$output = str_replace('%onground%','true',$output);
712 
+			} else {
713 
+				$output = str_replace('%onground%','false',$output);
714 
+			}
661 715
662 716 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
663 717 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -670,8 +724,12 @@  discard block
 
 block discarded – undo
670 724 
 	//		$output .= '"interpolationDegree" : 5,';
671 725 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
672 726 
 			$output .= '"cartographicDegrees": [';
673 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
674 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
727 
+			if ($minitime > strtotime($spotter_item['date'])) {
728 
+				$minitime = strtotime($spotter_item['date']);
729 
+			}
730 
+			if ($maxitime < strtotime($spotter_item['date'])) {
731 
+				$maxitime = strtotime($spotter_item['date']);
732 
+			}
675 733 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
676 734 
 			$output .= $spotter_item['longitude'].', ';
677 735 
 			$output .= $spotter_item['latitude'];
 
@@ -694,7 +752,9 @@  discard block
 
 block discarded – undo
694 752 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
695 753 
 					$prevalt = round($spotter_item['altitude']*30.48);
696 754 
 				}
697 
-			} else $output .= ', 0';
755 
+			} else {
756 
+				$output .= ', 0';
757 
+			}
698 758 
 			//$orientation = '"orientation" : { ';
699 759 
 			//$orientation .= '"unitQuaternion": [';
700 760 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -702,13 +762,18 @@  discard block
 
 block discarded – undo
702 762 
 		} else {
703 763 
 			$nblatlong = $nblatlong+1;
704 764 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
705 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
765 
+			if ($maxitime < strtotime($spotter_item['date'])) {
766 
+				$maxitime = strtotime($spotter_item['date']);
767 
+			}
706 768 
 			if ($spotter_item['ground_speed'] == 0) {
707 769 
 				$output .= $prevlong.', ';
708 770 
 				$output .= $prevlat;
709 771 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
710 
-				if (!$marine) $output .= ', '.$prevalt;
711 
-				else $output .= ', 0';
772 
+				if (!$marine) {
773 
+					$output .= ', '.$prevalt;
774 
+				} else {
775 
+					$output .= ', 0';
776 
+				}
712 777 
 			} else {
713 778 
 				$output .= $spotter_item['longitude'].', ';
714 779 
 				$output .= $spotter_item['latitude'];
 
@@ -721,14 +786,17 @@  discard block
 
 block discarded – undo
721 786 
 							$output .= ', 0';
722 787 
 						}
723 788 
 					} else {
724 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
725 
-						elseif ($tracker) {
789 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
790 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
791 
+						} elseif ($tracker) {
726 792 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
727 793 
 						} else {
728 794 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
729 795 
 						}
730 796 
 					}
731 
-				} else $output .= ', 0';
797 
+				} else {
798 
+					$output .= ', 0';
799 
+				}
732 800 
 			}
733 801 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
734 802 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -747,11 +815,17 @@  discard block
 
 block discarded – undo
747 815 
 		} else {
748 816 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
749 817 
 		}
818 
+	} else {
819 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
750 820 
 	}
751 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
752 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
821 
+	} else {
822 
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
823 
+}
753 824 
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
754 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
755 
-else $output = str_replace('%gltf2%','false',$output);
825 
+if ($gltf2) {
826 
+	$output = str_replace('%gltf2%','true',$output);
827 
+} else {
828 
+	$output = str_replace('%gltf2%','false',$output);
829 
+}
756 830 
 print $output;
757 831 
 ?>
Please login to merge, or discard this patch.
install/class.update_db.php 1 patch
Braces   +1151 added lines, -399 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,9 @@  discard block
 
 block discarded – undo
26 26 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
27 27 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
28 28 
 		curl_setopt($ch, CURLOPT_TIMEOUT, 20);
29 
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
29 
+		if ($referer != '') {
30 
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
31 
+		}
30 32 
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
31 33 
 		curl_setopt($ch, CURLOPT_FILE, $fp);
32 34 
 		curl_exec($ch);
 
@@ -37,12 +39,16 @@  discard block
 
 block discarded – undo
37 39 
 	public static function gunzip($in_file,$out_file_name = '') {
38 40 
 		//echo $in_file.' -> '.$out_file_name."\n";
39 41 
 		$buffer_size = 4096; // read 4kb at a time
40 
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
42 
+		if ($out_file_name == '') {
43 
+			$out_file_name = str_replace('.gz', '', $in_file);
44 
+		}
41 45 
 		if ($in_file != '' && file_exists($in_file)) {
42 46 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
43 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
44 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
45 
-			else {
47 
+			if (function_exists('gzopen')) {
48 
+				$file = gzopen($in_file,'rb');
49 
+			} elseif (function_exists('gzopen64')) {
50 
+				$file = gzopen64($in_file,'rb');
51 
+			} else {
46 52 
 				echo 'gzopen not available';
47 53 
 				die;
48 54 
 			}
 
@@ -63,8 +69,12 @@  discard block
 
 block discarded – undo
63 69 
 			if ($res === TRUE) {
64 70 
 				$zip->extractTo($path);
65 71 
 				$zip->close();
66 
-			} else return false;
67 
-		} else return false;
72 
+			} else {
73 
+				return false;
74 
+			}
75 
+		} else {
76 
+			return false;
77 
+		}
68 78 
 	}
69 79
70 80 
 	public static function connect_sqlite($database) {
 
@@ -79,7 +89,9 @@  discard block
 
 block discarded – undo
79 89 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
80 90 
 		global $globalDebug, $globalTransaction;
81 91 
 		//$query = 'TRUNCATE TABLE routes';
82 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
92 
+		if ($globalDebug) {
93 
+			echo " - Delete previous routes from DB -";
94 
+		}
83 95 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
84 96 
 		$Connection = new Connection();
85 97 
 		try {
 
@@ -90,7 +102,9 @@  discard block
 
 block discarded – undo
90 102 
                         return "error : ".$e->getMessage();
91 103 
                 }
92 104
93 
-    		if ($globalDebug) echo " - Add routes to DB -";
105 
+    		if ($globalDebug) {
106 
+    			echo " - Add routes to DB -";
107 
+    		}
94 108 
     		update_db::connect_sqlite($database_file);
95 109 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
96 110 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 
@@ -105,15 +119,21 @@  discard block
 
 block discarded – undo
105 119 
 		$Connection = new Connection();
106 120 
 		$sth_dest = $Connection->db->prepare($query_dest);
107 121 
 		try {
108 
-			if ($globalTransaction) $Connection->db->beginTransaction();
122 
+			if ($globalTransaction) {
123 
+				$Connection->db->beginTransaction();
124 
+			}
109 125 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
110 126 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
111 127 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
112 128 
 				$sth_dest->execute($query_dest_values);
113 129 
             		}
114 
-			if ($globalTransaction) $Connection->db->commit();
130 
+			if ($globalTransaction) {
131 
+				$Connection->db->commit();
132 
+			}
115 133 
 		} catch(PDOException $e) {
116 
-			if ($globalTransaction) $Connection->db->rollBack();
134 
+			if ($globalTransaction) {
135 
+				$Connection->db->rollBack();
136 
+			}
117 137 
 			return "error : ".$e->getMessage();
118 138 
 		}
119 139 
                 return '';
 
@@ -121,7 +141,9 @@  discard block
 
 block discarded – undo
121 141 
 	public static function retrieve_route_oneworld($database_file) {
122 142 
 		global $globalDebug, $globalTransaction;
123 143 
 		//$query = 'TRUNCATE TABLE routes';
124 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
144 
+		if ($globalDebug) {
145 
+			echo " - Delete previous routes from DB -";
146 
+		}
125 147 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
126 148 
 		$Connection = new Connection();
127 149 
 		try {
 
@@ -132,14 +154,18 @@  discard block
 
 block discarded – undo
132 154 
                         return "error : ".$e->getMessage();
133 155 
                 }
134 156
135 
-    		if ($globalDebug) echo " - Add routes to DB -";
157 
+    		if ($globalDebug) {
158 
+    			echo " - Add routes to DB -";
159 
+    		}
136 160 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
137 161 
 		$Spotter = new Spotter();
138 162 
 		if ($fh = fopen($database_file,"r")) {
139 163 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
140 164 
 			$Connection = new Connection();
141 165 
 			$sth_dest = $Connection->db->prepare($query_dest);
142 
-			if ($globalTransaction) $Connection->db->beginTransaction();
166 
+			if ($globalTransaction) {
167 
+				$Connection->db->beginTransaction();
168 
+			}
143 169 
 			while (!feof($fh)) {
144 170 
 				$line = fgetcsv($fh,9999,',');
145 171 
 				if ($line[0] != '') {
 
@@ -148,13 +174,17 @@  discard block
 
 block discarded – undo
148 174 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
149 175 
 							$sth_dest->execute($query_dest_values);
150 176 
 						} catch(PDOException $e) {
151 
-							if ($globalTransaction) $Connection->db->rollBack();
177 
+							if ($globalTransaction) {
178 
+								$Connection->db->rollBack();
179 
+							}
152 180 
 							return "error : ".$e->getMessage();
153 181 
 						}
154 182 
 					}
155 183 
 				}
156 184 
 			}
157 
-			if ($globalTransaction) $Connection->db->commit();
185 
+			if ($globalTransaction) {
186 
+				$Connection->db->commit();
187 
+			}
158 188 
 		}
159 189 
                 return '';
160 190 
 	}
 
@@ -162,7 +192,9 @@  discard block
 
 block discarded – undo
162 192 
 	public static function retrieve_route_skyteam($database_file) {
163 193 
 		global $globalDebug, $globalTransaction;
164 194 
 		//$query = 'TRUNCATE TABLE routes';
165 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
195 
+		if ($globalDebug) {
196 
+			echo " - Delete previous routes from DB -";
197 
+		}
166 198 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
167 199 
 		$Connection = new Connection();
168 200 
 		try {
 
@@ -173,7 +205,9 @@  discard block
 
 block discarded – undo
173 205 
                         return "error : ".$e->getMessage();
174 206 
                 }
175 207
176 
-    		if ($globalDebug) echo " - Add routes to DB -";
208 
+    		if ($globalDebug) {
209 
+    			echo " - Add routes to DB -";
210 
+    		}
177 211
178 212 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
179 213 
 		$Spotter = new Spotter();
 
@@ -182,7 +216,9 @@  discard block
 
 block discarded – undo
182 216 
 			$Connection = new Connection();
183 217 
 			$sth_dest = $Connection->db->prepare($query_dest);
184 218 
 			try {
185 
-				if ($globalTransaction) $Connection->db->beginTransaction();
219 
+				if ($globalTransaction) {
220 
+					$Connection->db->beginTransaction();
221 
+				}
186 222 
 				while (!feof($fh)) {
187 223 
 					$line = fgetcsv($fh,9999,',');
188 224 
 					if ($line[0] != '') {
 
@@ -193,9 +229,13 @@  discard block
 
 block discarded – undo
193 229 
 						}
194 230 
 					}
195 231 
 				}
196 
-				if ($globalTransaction) $Connection->db->commit();
232 
+				if ($globalTransaction) {
233 
+					$Connection->db->commit();
234 
+				}
197 235 
 			} catch(PDOException $e) {
198 
-				if ($globalTransaction) $Connection->db->rollBack();
236 
+				if ($globalTransaction) {
237 
+					$Connection->db->rollBack();
238 
+				}
199 239 
 				return "error : ".$e->getMessage();
200 240 
 			}
201 241 
 		}
 
@@ -238,11 +278,16 @@  discard block
 
 block discarded – undo
238 278 
 		$sth_dest = $Connection->db->prepare($query_dest);
239 279 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
240 280 
 		try {
241 
-			if ($globalTransaction) $Connection->db->beginTransaction();
281 
+			if ($globalTransaction) {
282 
+				$Connection->db->beginTransaction();
283 
+			}
242 284 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
243 285 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
244 
-				if ($values['UserString4'] == 'M') $type = 'military';
245 
-				else $type = null;
286 
+				if ($values['UserString4'] == 'M') {
287 
+					$type = 'military';
288 
+				} else {
289 
+					$type = null;
290 
+				}
246 291 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
247 292 
 				$sth_dest->execute($query_dest_values);
248 293 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
 
@@ -250,7 +295,9 @@  discard block
 
 block discarded – undo
250 295 
 				    $sth_dest_owner->execute($query_dest_owner_values);
251 296 
 				}
252 297 
             		}
253 
-			if ($globalTransaction) $Connection->db->commit();
298 
+			if ($globalTransaction) {
299 
+				$Connection->db->commit();
300 
+			}
254 301 
 		} catch(PDOException $e) {
255 302 
 			return "error : ".$e->getMessage();
256 303 
 		}
 
@@ -287,7 +334,9 @@  discard block
 
 block discarded – undo
287 334 
 			$Connection = new Connection();
288 335 
 			$sth_dest = $Connection->db->prepare($query_dest);
289 336 
 			try {
290 
-				if ($globalTransaction) $Connection->db->beginTransaction();
337 
+				if ($globalTransaction) {
338 
+					$Connection->db->beginTransaction();
339 
+				}
291 340 
             			while (!feof($fh)) {
292 341 
             				$values = array();
293 342 
             				$line = $Common->hex2str(fgets($fh,9999));
 
@@ -298,7 +347,9 @@  discard block
 
 block discarded – undo
298 347 
             				// Check if we can find ICAO, else set it to GLID
299 348 
             				$aircraft_name_split = explode(' ',$aircraft_name);
300 349 
             				$search_more = '';
301 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
350 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
351 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
352 
+            				}
302 353 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
303 354 
             				$sth_search = $Connection->db->prepare($query_search);
304 355 
 					try {
 
@@ -311,7 +362,9 @@  discard block
 
 block discarded – undo
311 362 
 					} catch(PDOException $e) {
312 363 
 						return "error : ".$e->getMessage();
313 364 
 					}
314 
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
365 
+					if (!isset($values['ICAOTypeCode'])) {
366 
+						$values['ICAOTypeCode'] = 'GLID';
367 
+					}
315 368 
 					// Add data to db
316 369 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
317 370 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 
@@ -320,7 +373,9 @@  discard block
 
 block discarded – undo
320 373 
 						$sth_dest->execute($query_dest_values);
321 374 
 					}
322 375 
 				}
323 
-				if ($globalTransaction) $Connection->db->commit();
376 
+				if ($globalTransaction) {
377 
+					$Connection->db->commit();
378 
+				}
324 379 
 			} catch(PDOException $e) {
325 380 
 				return "error : ".$e->getMessage();
326 381 
 			}
 
@@ -356,7 +411,9 @@  discard block
 
 block discarded – undo
356 411 
 			$Connection = new Connection();
357 412 
 			$sth_dest = $Connection->db->prepare($query_dest);
358 413 
 			try {
359 
-				if ($globalTransaction) $Connection->db->beginTransaction();
414 
+				if ($globalTransaction) {
415 
+					$Connection->db->beginTransaction();
416 
+				}
360 417 
 				$tmp = fgetcsv($fh,9999,',',"'");
361 418 
             			while (!feof($fh)) {
362 419 
             				$line = fgetcsv($fh,9999,',',"'");
 
@@ -370,13 +427,17 @@  discard block
 
 block discarded – undo
370 427 
             				// Check if we can find ICAO, else set it to GLID
371 428 
             				$aircraft_name_split = explode(' ',$aircraft_name);
372 429 
             				$search_more = '';
373 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
430 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
431 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
432 
+            				}
374 433 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
375 434 
             				$sth_search = $Connection->db->prepare($query_search);
376 435 
 					try {
377 436 
                                     		$sth_search->execute();
378 437 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
379 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
438 
+	            				if (isset($result['icao']) && $result['icao'] != '') {
439 
+	            					$values['ICAOTypeCode'] = $result['icao'];
440 
+	            				}
380 441 
 					} catch(PDOException $e) {
381 442 
 						return "error : ".$e->getMessage();
382 443 
 					}
 
@@ -389,7 +450,9 @@  discard block
 
 block discarded – undo
389 450 
 						$sth_dest->execute($query_dest_values);
390 451 
 					}
391 452 
 				}
392 
-				if ($globalTransaction) $Connection->db->commit();
453 
+				if ($globalTransaction) {
454 
+					$Connection->db->commit();
455 
+				}
393 456 
 			} catch(PDOException $e) {
394 457 
 				return "error : ".$e->getMessage();
395 458 
 			}
 
@@ -428,7 +491,9 @@  discard block
 
 block discarded – undo
428 491 
 			$sth_dest = $Connection->db->prepare($query_dest);
429 492 
 			$sth_modes = $Connection->db->prepare($query_modes);
430 493 
 			try {
431 
-				if ($globalTransaction) $Connection->db->beginTransaction();
494 
+				if ($globalTransaction) {
495 
+					$Connection->db->beginTransaction();
496 
+				}
432 497 
 				$tmp = fgetcsv($fh,9999,',','"');
433 498 
             			while (!feof($fh)) {
434 499 
             				$line = fgetcsv($fh,9999,',','"');
 
@@ -438,16 +503,22 @@  discard block
 
 block discarded – undo
438 503 
             				    $values['registration'] = $line[0];
439 504 
             				    $values['base'] = $line[4];
440 505 
             				    $values['owner'] = $line[5];
441 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
442 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
506 
+            				    if ($line[6] == '') {
507 
+            				    	$values['date_first_reg'] = null;
508 
+            				    } else {
509 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
510 
+					    }
443 511 
 					    $values['cancel'] = $line[7];
444 512 
 					} elseif ($country == 'EI') {
445 513 
 					    // TODO : add modeS & reg to aircraft_modes
446 514 
             				    $values['registration'] = $line[0];
447 515 
             				    $values['base'] = $line[3];
448 516 
             				    $values['owner'] = $line[2];
449 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
450 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
517 
+            				    if ($line[1] == '') {
518 
+            				    	$values['date_first_reg'] = null;
519 
+            				    } else {
520 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
521 
+					    }
451 522 
 					    $values['cancel'] = '';
452 523 
 					    $values['modes'] = $line[7];
453 524 
 					    $values['icao'] = $line[8];
 
@@ -466,16 +537,22 @@  discard block
 
 block discarded – undo
466 537 
             				    $values['registration'] = $line[3];
467 538 
             				    $values['base'] = null;
468 539 
             				    $values['owner'] = $line[5];
469 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
470 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
540 
+            				    if ($line[18] == '') {
541 
+            				    	$values['date_first_reg'] = null;
542 
+            				    } else {
543 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
544 
+					    }
471 545 
 					    $values['cancel'] = '';
472 546 
 					} elseif ($country == 'VH') {
473 547 
 					    // TODO : add modeS & reg to aircraft_modes
474 548 
             				    $values['registration'] = $line[0];
475 549 
             				    $values['base'] = null;
476 550 
             				    $values['owner'] = $line[12];
477 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
478 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
551 
+            				    if ($line[28] == '') {
552 
+            				    	$values['date_first_reg'] = null;
553 
+            				    } else {
554 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
555 
+					    }
479 556
480 557 
 					    $values['cancel'] = $line[39];
481 558 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -494,29 +571,41 @@  discard block
 
 block discarded – undo
494 571 
             				    $values['registration'] = $line[0];
495 572 
             				    $values['base'] = null;
496 573 
             				    $values['owner'] = $line[8];
497 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
498 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
574 
+            				    if ($line[7] == '') {
575 
+            				    	$values['date_first_reg'] = null;
576 
+            				    } else {
577 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
578 
+					    }
499 579 
 					    $values['cancel'] = '';
500 580 
 					} elseif ($country == 'PP') {
501 581 
             				    $values['registration'] = $line[0];
502 582 
             				    $values['base'] = null;
503 583 
             				    $values['owner'] = $line[4];
504 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
505 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
584 
+            				    if ($line[6] == '') {
585 
+            				    	$values['date_first_reg'] = null;
586 
+            				    } else {
587 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
588 
+					    }
506 589 
 					    $values['cancel'] = $line[7];
507 590 
 					} elseif ($country == 'E7') {
508 591 
             				    $values['registration'] = $line[0];
509 592 
             				    $values['base'] = null;
510 593 
             				    $values['owner'] = $line[4];
511 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
512 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
594 
+            				    if ($line[5] == '') {
595 
+            				    	$values['date_first_reg'] = null;
596 
+            				    } else {
597 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
598 
+					    }
513 599 
 					    $values['cancel'] = '';
514 600 
 					} elseif ($country == '8Q') {
515 601 
             				    $values['registration'] = $line[0];
516 602 
             				    $values['base'] = null;
517 603 
             				    $values['owner'] = $line[3];
518 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
519 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
604 
+            				    if ($line[7] == '') {
605 
+            				    	$values['date_first_reg'] = null;
606 
+            				    } else {
607 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
608 
+					    }
520 609 
 					    $values['cancel'] = '';
521 610 
 					} elseif ($country == 'ZK') {
522 611 
             				    $values['registration'] = $line[0];
 
@@ -561,7 +650,9 @@  discard block
 
 block discarded – undo
561 650 
 						$sth_modes->execute($query_modes_values);
562 651 
 					}
563 652 
 				}
564 
-				if ($globalTransaction) $Connection->db->commit();
653 
+				if ($globalTransaction) {
654 
+					$Connection->db->commit();
655 
+				}
565 656 
 			} catch(PDOException $e) {
566 657 
 				return "error : ".$e->getMessage();
567 658 
 			}
 
@@ -697,25 +788,45 @@  discard block
 
 block discarded – undo
697 788 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
698 789 
 		$Connection = new Connection();
699 790 
 		$sth_dest = $Connection->db->prepare($query_dest);
700 
-		if ($globalTransaction) $Connection->db->beginTransaction();
791 
+		if ($globalTransaction) {
792 
+			$Connection->db->beginTransaction();
793 
+		}
701 794
702 795 
 		$i = 0;
703 796 
 		while($row = sparql_fetch_array($result))
704 797 
 		{
705 798 
 			if ($i >= 1) {
706 799 
 			//print_r($row);
707 
-			if (!isset($row['iata'])) $row['iata'] = '';
708 
-			if (!isset($row['icao'])) $row['icao'] = '';
709 
-			if (!isset($row['type'])) $row['type'] = '';
710 
-			if (!isset($row['altitude'])) $row['altitude'] = '';
800 
+			if (!isset($row['iata'])) {
801 
+				$row['iata'] = '';
802 
+			}
803 
+			if (!isset($row['icao'])) {
804 
+				$row['icao'] = '';
805 
+			}
806 
+			if (!isset($row['type'])) {
807 
+				$row['type'] = '';
808 
+			}
809 
+			if (!isset($row['altitude'])) {
810 
+				$row['altitude'] = '';
811 
+			}
711 812 
 			if (isset($row['city_bis'])) {
712 813 
 				$row['city'] = $row['city_bis'];
713 814 
 			}
714 
-			if (!isset($row['city'])) $row['city'] = '';
715 
-			if (!isset($row['country'])) $row['country'] = '';
716 
-			if (!isset($row['homepage'])) $row['homepage'] = '';
717 
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
718 
-			if (!isset($row['name'])) continue;
815 
+			if (!isset($row['city'])) {
816 
+				$row['city'] = '';
817 
+			}
818 
+			if (!isset($row['country'])) {
819 
+				$row['country'] = '';
820 
+			}
821 
+			if (!isset($row['homepage'])) {
822 
+				$row['homepage'] = '';
823 
+			}
824 
+			if (!isset($row['wikipedia_page'])) {
825 
+				$row['wikipedia_page'] = '';
826 
+			}
827 
+			if (!isset($row['name'])) {
828 
+				continue;
829 
+			}
719 830 
 			if (!isset($row['image'])) {
720 831 
 				$row['image'] = '';
721 832 
 				$row['image_thumb'] = '';
 
@@ -771,7 +882,9 @@  discard block
 
 block discarded – undo
771 882
772 883 
 			$i++;
773 884 
 		}
774 
-		if ($globalTransaction) $Connection->db->commit();
885 
+		if ($globalTransaction) {
886 
+			$Connection->db->commit();
887 
+		}
775 888 
 		/*
776 889 
 		echo "Delete duplicate rows...\n";
777 890 
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
 
@@ -814,7 +927,9 @@  discard block
 
 block discarded – undo
814 927 
 		$delimiter = ',';
815 928 
 		$out_file = $tmp_dir.'airports.csv';
816 929 
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
817 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
930 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
931 
+			return FALSE;
932 
+		}
818 933 
 		echo "Add data from ourairports.com...\n";
819 934
820 935 
 		$header = NULL;
 
@@ -824,8 +939,9 @@  discard block
 
 block discarded – undo
824 939 
 			//$Connection->db->beginTransaction();
825 940 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
826 941 
 			{
827 
-				if(!$header) $header = $row;
828 
-				else {
942 
+				if(!$header) {
943 
+					$header = $row;
944 
+				} else {
829 945 
 					$data = array();
830 946 
 					$data = array_combine($header, $row);
831 947 
 					try {
 
@@ -866,7 +982,9 @@  discard block
 
 block discarded – undo
866 982 
 		echo "Download data from another free database...\n";
867 983 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
868 984 
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
869 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
985 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
986 
+			return FALSE;
987 
+		}
870 988 
 		update_db::unzip($out_file);
871 989 
 		$header = NULL;
872 990 
 		echo "Add data from another free database...\n";
 
@@ -877,8 +995,9 @@  discard block
 
 block discarded – undo
877 995 
 			//$Connection->db->beginTransaction();
878 996 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
879 997 
 			{
880 
-				if(!$header) $header = $row;
881 
-				else {
998 
+				if(!$header) {
999 
+					$header = $row;
1000 
+				} else {
882 1001 
 					$data = $row;
883 1002
884 1003 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
 
@@ -1047,7 +1166,9 @@  discard block
 
 block discarded – undo
1047 1166 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1048 1167 
 		{
1049 1168 
 			$i = 0;
1050 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1169 
+			if ($globalTransaction) {
1170 
+				$Connection->db->beginTransaction();
1171 
+			}
1051 1172 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1052 1173 
 			{
1053 1174 
 				if ($i > 0) {
 
@@ -1060,7 +1181,9 @@  discard block
 
 block discarded – undo
1060 1181 
 					}
1061 1182 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1062 1183 
 					if (!empty($result_search)) {
1063 
-						if ($globalDebug) echo '.';
1184 
+						if ($globalDebug) {
1185 
+							echo '.';
1186 
+						}
1064 1187 
 							//if ($globalDBdriver == 'mysql') {
1065 1188 
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1066 1189 
 							//} else {
 
@@ -1082,8 +1205,12 @@  discard block
 
 block discarded – undo
1082 1205 
 						}
1083 1206 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1084 1207 
 						if (!empty($result_search_mfr)) {
1085 
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1086 
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1208 
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1209 
+								$data[16] = $data[23];
1210 
+							}
1211 
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1212 
+								$data[16] = $data[15];
1213 
+							}
1087 1214 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1088 1215 
 							try {
1089 1216 
 								$sthf = $Connection->db->prepare($queryf);
 
@@ -1094,7 +1221,9 @@  discard block
 
 block discarded – undo
1094 1221 
 						}
1095 1222 
 					}
1096 1223 
 					if (strtotime($data[29]) > time()) {
1097 
-						if ($globalDebug) echo 'i';
1224 
+						if ($globalDebug) {
1225 
+							echo 'i';
1226 
+						}
1098 1227 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1099 1228 
 						try {
1100 1229 
 							$sth = $Connection->db->prepare($query);
 
@@ -1105,13 +1234,19 @@  discard block
 
 block discarded – undo
1105 1234 
 					}
1106 1235 
 				}
1107 1236 
 				if ($i % 90 == 0) {
1108 
-					if ($globalTransaction) $Connection->db->commit();
1109 
-					if ($globalTransaction) $Connection->db->beginTransaction();
1237 
+					if ($globalTransaction) {
1238 
+						$Connection->db->commit();
1239 
+					}
1240 
+					if ($globalTransaction) {
1241 
+						$Connection->db->beginTransaction();
1242 
+					}
1110 1243 
 				}
1111 1244 
 				$i++;
1112 1245 
 			}
1113 1246 
 			fclose($handle);
1114 
-			if ($globalTransaction) $Connection->db->commit();
1247 
+			if ($globalTransaction) {
1248 
+				$Connection->db->commit();
1249 
+			}
1115 1250 
 		}
1116 1251 
 		return '';
1117 1252 
 	}
 
@@ -1131,11 +1266,15 @@  discard block
 
 block discarded – undo
1131 1266 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
1132 1267 
 		{
1133 1268 
 			$i = 0;
1134 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1269 
+			if ($globalTransaction) {
1270 
+				$Connection->db->beginTransaction();
1271 
+			}
1135 1272 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1136 1273 
 			{
1137 1274 
 				if ($i > 0) {
1138 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1275 
+					if ($data[1] == 'NULL') {
1276 
+						$data[1] = $data[0];
1277 
+					}
1139 1278 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1140 1279 
 					try {
1141 1280 
 						$sth = $Connection->db->prepare($query);
 
@@ -1147,7 +1286,9 @@  discard block
 
 block discarded – undo
1147 1286 
 				$i++;
1148 1287 
 			}
1149 1288 
 			fclose($handle);
1150 
-			if ($globalTransaction) $Connection->db->commit();
1289 
+			if ($globalTransaction) {
1290 
+				$Connection->db->commit();
1291 
+			}
1151 1292 
 		}
1152 1293 
 		return '';
1153 1294 
 	}
 
@@ -1179,11 +1320,15 @@  discard block
 
 block discarded – undo
1179 1320 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
1180 1321 
 		{
1181 1322 
 			$i = 0;
1182 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1323 
+			if ($globalTransaction) {
1324 
+				$Connection->db->beginTransaction();
1325 
+			}
1183 1326 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1184 1327 
 			{
1185 1328 
 				if ($i > 0) {
1186 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1329 
+					if ($data[1] == 'NULL') {
1330 
+						$data[1] = $data[0];
1331 
+					}
1187 1332 
 					$query = 'INSERT INTO airlines (airline_id,name,alias,iata,icao,callsign,country,active,type,home_link,wikipedia_link,alliance,ban_eu) VALUES (0,:name,:alias,:iata,:icao,:callsign,:country,:active,:type,:home,:wikipedia_link,:alliance,:ban_eu)';
1188 1333 
 					try {
1189 1334 
 						$sth = $Connection->db->prepare($query);
 
@@ -1195,7 +1340,9 @@  discard block
 
 block discarded – undo
1195 1340 
 				$i++;
1196 1341 
 			}
1197 1342 
 			fclose($handle);
1198 
-			if ($globalTransaction) $Connection->db->commit();
1343 
+			if ($globalTransaction) {
1344 
+				$Connection->db->commit();
1345 
+			}
1199 1346 
 		}
1200 1347 
 		/*
1201 1348 
 		$query = "UNLOCK TABLES";
 
@@ -1225,7 +1372,9 @@  discard block
 
 block discarded – undo
1225 1372 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1226 1373 
 		{
1227 1374 
 			$i = 0;
1228 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1375 
+			if ($globalTransaction) {
1376 
+				$Connection->db->beginTransaction();
1377 
+			}
1229 1378 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1230 1379 
 			{
1231 1380 
 				if ($i > 0) {
 
@@ -1241,7 +1390,9 @@  discard block
 
 block discarded – undo
1241 1390 
 				$i++;
1242 1391 
 			}
1243 1392 
 			fclose($handle);
1244 
-			if ($globalTransaction) $Connection->db->commit();
1393 
+			if ($globalTransaction) {
1394 
+				$Connection->db->commit();
1395 
+			}
1245 1396 
 		}
1246 1397 
 		return '';
1247 1398 
         }
 
@@ -1261,7 +1412,9 @@  discard block
 
 block discarded – undo
1261 1412 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
1262 1413 
 		{
1263 1414 
 			$i = 0;
1264 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1415 
+			if ($globalTransaction) {
1416 
+				$Connection->db->beginTransaction();
1417 
+			}
1265 1418 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1266 1419 
 			{
1267 1420 
 				if ($i > 0) {
 
@@ -1270,13 +1423,17 @@  discard block
 
 block discarded – undo
1270 1423 
 						$sth = $Connection->db->prepare($query);
1271 1424 
 						$sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam'));
1272 1425 
 					} catch(PDOException $e) {
1273 
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1426 
+						if ($globalDebug) {
1427 
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
1428 
+						}
1274 1429 
 					}
1275 1430 
 				}
1276 1431 
 				$i++;
1277 1432 
 			}
1278 1433 
 			fclose($handle);
1279 
-			if ($globalTransaction) $Connection->db->commit();
1434 
+			if ($globalTransaction) {
1435 
+				$Connection->db->commit();
1436 
+			}
1280 1437 
 		}
1281 1438 
 		return '';
1282 1439 
         }
 
@@ -1301,7 +1458,9 @@  discard block
 
 block discarded – undo
1301 1458 
 			$i = 0;
1302 1459 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1303 1460 
 			//$Connection->db->beginTransaction();
1304 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1461 
+			if ($globalTransaction) {
1462 
+				$Connection->db->beginTransaction();
1463 
+			}
1305 1464 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1306 1465 
 			{
1307 1466 
 				if ($i > 0) {
 
@@ -1317,7 +1476,9 @@  discard block
 
 block discarded – undo
1317 1476 
 				$i++;
1318 1477 
 			}
1319 1478 
 			fclose($handle);
1320 
-			if ($globalTransaction) $Connection->db->commit();
1479 
+			if ($globalTransaction) {
1480 
+				$Connection->db->commit();
1481 
+			}
1321 1482 
 		}
1322 1483 
 		return '';
1323 1484 
         }
 
@@ -1337,7 +1498,9 @@  discard block
 
 block discarded – undo
1337 1498 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
1338 1499 
 		{
1339 1500 
 			$i = 0;
1340 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1501 
+			if ($globalTransaction) {
1502 
+				$Connection->db->beginTransaction();
1503 
+			}
1341 1504 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1342 1505 
 			{
1343 1506 
 				if ($i > 0) {
 
@@ -1354,7 +1517,9 @@  discard block
 
 block discarded – undo
1354 1517 
 				$i++;
1355 1518 
 			}
1356 1519 
 			fclose($handle);
1357 
-			if ($globalTransaction) $Connection->db->commit();
1520 
+			if ($globalTransaction) {
1521 
+				$Connection->db->commit();
1522 
+			}
1358 1523 
 		}
1359 1524 
 		return '';
1360 1525 
 	}
 
@@ -1373,7 +1538,9 @@  discard block
 
 block discarded – undo
1373 1538 
 		$Connection = new Connection();
1374 1539 
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1375 1540 
 		{
1376 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1541 
+			if ($globalTransaction) {
1542 
+				$Connection->db->beginTransaction();
1543 
+			}
1377 1544 
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1378 1545 
 			{
1379 1546 
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
 
@@ -1388,7 +1555,9 @@  discard block
 
 block discarded – undo
1388 1555 
 				}
1389 1556 
 			}
1390 1557 
 			fclose($handle);
1391 
-			if ($globalTransaction) $Connection->db->commit();
1558 
+			if ($globalTransaction) {
1559 
+				$Connection->db->commit();
1560 
+			}
1392 1561 
 		}
1393 1562 
 		return '';
1394 1563 
         }
 
@@ -1464,9 +1633,14 @@  discard block
 
 block discarded – undo
1464 1633 
 				if ($i > 0 && $data[0] != '') {
1465 1634 
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
1466 1635 
 					$period = str_replace(',','',$data[14]);
1467 
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
1468 
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
1469 
-					else $launch_date = NULL;
1636 
+					if (!empty($period) && strpos($period,'days')) {
1637 
+						$period = str_replace(' days','',$period)*24*60;
1638 
+					}
1639 
+					if ($data[18] != '') {
1640 
+						$launch_date = date('Y-m-d',strtotime($data[18]));
1641 
+					} else {
1642 
+						$launch_date = NULL;
1643 
+					}
1470 1644 
 					$data = array_map(function($value) {
1471 1645 
 						return trim($value) === '' ? null : $value;
1472 1646 
 					}, $data);
 
@@ -1829,7 +2003,9 @@  discard block
 
 block discarded – undo
1829 2003 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1830 2004 
 		{
1831 2005 
 			$i = 0;
1832 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2006 
+			if ($globalTransaction) {
2007 
+				$Connection->db->beginTransaction();
2008 
+			}
1833 2009 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1834 2010 
 			{
1835 2011 
 				$i++;
 
@@ -1857,7 +2033,9 @@  discard block
 
 block discarded – undo
1857 2033 
 				}
1858 2034 
 			}
1859 2035 
 			fclose($handle);
1860 
-			if ($globalTransaction) $Connection->db->commit();
2036 
+			if ($globalTransaction) {
2037 
+				$Connection->db->commit();
2038 
+			}
1861 2039 
 		}
1862 2040 
 		return '';
1863 2041 
 	}
 
@@ -1900,7 +2078,9 @@  discard block
 
 block discarded – undo
1900 2078 
 		$Connection = new Connection();
1901 2079 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1902 2080 
 		{
1903 
-			if ($globalTransaction) $Connection->db->beginTransaction();
2081 
+			if ($globalTransaction) {
2082 
+				$Connection->db->beginTransaction();
2083 
+			}
1904 2084 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1905 2085 
 			{
1906 2086 
 				if(count($row) > 1) {
 
@@ -1914,7 +2094,9 @@  discard block
 
 block discarded – undo
1914 2094 
 				}
1915 2095 
 			}
1916 2096 
 			fclose($handle);
1917 
-			if ($globalTransaction) $Connection->db->commit();
2097 
+			if ($globalTransaction) {
2098 
+				$Connection->db->commit();
2099 
+			}
1918 2100 
 		}
1919 2101 
 		return '';
1920 2102 
         }
 
@@ -1934,8 +2116,9 @@  discard block
 
 block discarded – undo
1934 2116 
 	        }
1935 2117
1936 2118
1937 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1938 
-		else {
2119 
+		if ($globalDBdriver == 'mysql') {
2120 
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
2121 
+		} else {
1939 2122 
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1940 2123 
 			$query = "CREATE EXTENSION postgis";
1941 2124 
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
 
@@ -1954,7 +2137,9 @@  discard block
 
 block discarded – undo
1954 2137 
 		global $tmp_dir, $globalDebug;
1955 2138 
 		include_once('class.create_db.php');
1956 2139 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1957 
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
2140 
+		if ($globalDebug) {
2141 
+			echo "NOTAM from FlightAirMap website : Download...";
2142 
+		}
1958 2143 
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
1959 2144 
 		$error = '';
1960 2145 
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
 
@@ -1964,20 +2149,34 @@  discard block
 
 block discarded – undo
1964 2149 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1965 2150 
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
1966 2151 
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
1967 
-						if ($globalDebug) echo "Gunzip...";
2152 
+						if ($globalDebug) {
2153 
+							echo "Gunzip...";
2154 
+						}
1968 2155 
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
1969 
-						if ($globalDebug) echo "Add to DB...";
2156 
+						if ($globalDebug) {
2157 
+							echo "Add to DB...";
2158 
+						}
1970 2159 
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
1971 2160 
 						$NOTAM = new NOTAM();
1972 2161 
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1973 2162 
 						update_db::insert_notam_version($notam_md5);
1974 
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
1975 
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1976 
-			} elseif ($globalDebug) echo "No new version.";
1977 
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2163 
+					} else {
2164 
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
2165 
+					}
2166 
+				} else {
2167 
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
2168 
+				}
2169 
+			} elseif ($globalDebug) {
2170 
+				echo "No new version.";
2171 
+			}
2172 
+		} else {
2173 
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
2174 
+		}
1978 2175 
 		if ($error != '') {
1979 2176 
 			return $error;
1980 
-		} elseif ($globalDebug) echo "Done\n";
2177 
+		} elseif ($globalDebug) {
2178 
+			echo "Done\n";
2179 
+		}
1981 2180 
 		return '';
1982 2181 
 	}
1983 2182 
 
@@ -2032,68 +2231,114 @@  discard block
 
 block discarded – undo
2032 2231 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
2033 2232 
 		if (extension_loaded('zip')) {
2034 2233 
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
2035 
-				if ($globalDebug) echo "Unzip...";
2234 
+				if ($globalDebug) {
2235 
+					echo "Unzip...";
2236 
+				}
2036 2237 
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
2037 
-				if ($globalDebug) echo "Add to DB...";
2238 
+				if ($globalDebug) {
2239 
+					echo "Add to DB...";
2240 
+				}
2038 2241 
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
2039 
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
2242 
+				if ($globalDebug) {
2243 
+					echo "Copy airlines logos to airlines images directory...";
2244 
+				}
2040 2245 
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
2041 
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
2042 
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2043 
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2044 
-		} else $error = "ZIP module not loaded but required for IVAO.";
2246 
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
2247 
+						$error = "Failed to copy airlines logo.";
2248 
+					}
2249 
+				} else {
2250 
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
2251 
+				}
2252 
+			} else {
2253 
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
2254 
+			}
2255 
+		} else {
2256 
+			$error = "ZIP module not loaded but required for IVAO.";
2257 
+		}
2045 2258 
 		if ($error != '') {
2046 2259 
 			return $error;
2047 
-		} elseif ($globalDebug) echo "Done\n";
2260 
+		} elseif ($globalDebug) {
2261 
+			echo "Done\n";
2262 
+		}
2048 2263 
 		return '';
2049 2264 
 	}
2050 2265
2051 2266 
 	public static function update_routes() {
2052 2267 
 		global $tmp_dir, $globalDebug;
2053 2268 
 		$error = '';
2054 
-		if ($globalDebug) echo "Routes : Download...";
2269 
+		if ($globalDebug) {
2270 
+			echo "Routes : Download...";
2271 
+		}
2055 2272 
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
2056 2273 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
2057 
-			if ($globalDebug) echo "Gunzip...";
2274 
+			if ($globalDebug) {
2275 
+				echo "Gunzip...";
2276 
+			}
2058 2277 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
2059 
-			if ($globalDebug) echo "Add to DB...";
2278 
+			if ($globalDebug) {
2279 
+				echo "Add to DB...";
2280 
+			}
2060 2281 
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
2061 
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2282 
+		} else {
2283 
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
2284 
+		}
2062 2285 
 		if ($error != '') {
2063 2286 
 			return $error;
2064 
-		} elseif ($globalDebug) echo "Done\n";
2287 
+		} elseif ($globalDebug) {
2288 
+			echo "Done\n";
2289 
+		}
2065 2290 
 		return '';
2066 2291 
 	}
2067 2292 
 	public static function update_oneworld() {
2068 2293 
 		global $tmp_dir, $globalDebug;
2069 2294 
 		$error = '';
2070 
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
2295 
+		if ($globalDebug) {
2296 
+			echo "Schedules Oneworld : Download...";
2297 
+		}
2071 2298 
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
2072 2299 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
2073 
-			if ($globalDebug) echo "Gunzip...";
2300 
+			if ($globalDebug) {
2301 
+				echo "Gunzip...";
2302 
+			}
2074 2303 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
2075 
-			if ($globalDebug) echo "Add to DB...";
2304 
+			if ($globalDebug) {
2305 
+				echo "Add to DB...";
2306 
+			}
2076 2307 
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
2077 
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2308 
+		} else {
2309 
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
2310 
+		}
2078 2311 
 		if ($error != '') {
2079 2312 
 			return $error;
2080 
-		} elseif ($globalDebug) echo "Done\n";
2313 
+		} elseif ($globalDebug) {
2314 
+			echo "Done\n";
2315 
+		}
2081 2316 
 		return '';
2082 2317 
 	}
2083 2318 
 	public static function update_skyteam() {
2084 2319 
 		global $tmp_dir, $globalDebug;
2085 2320 
 		$error = '';
2086 
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
2321 
+		if ($globalDebug) {
2322 
+			echo "Schedules Skyteam : Download...";
2323 
+		}
2087 2324 
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
2088 2325 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
2089 
-			if ($globalDebug) echo "Gunzip...";
2326 
+			if ($globalDebug) {
2327 
+				echo "Gunzip...";
2328 
+			}
2090 2329 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
2091 
-			if ($globalDebug) echo "Add to DB...";
2330 
+			if ($globalDebug) {
2331 
+				echo "Add to DB...";
2332 
+			}
2092 2333 
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
2093 
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2334 
+		} else {
2335 
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
2336 
+		}
2094 2337 
 		if ($error != '') {
2095 2338 
 			return $error;
2096 
-		} elseif ($globalDebug) echo "Done\n";
2339 
+		} elseif ($globalDebug) {
2340 
+			echo "Done\n";
2341 
+		}
2097 2342 
 		return '';
2098 2343 
 	}
2099 2344 
 	public static function update_ModeS() {
 
@@ -2110,340 +2355,590 @@  discard block
 
 block discarded – undo
2110 2355 
 			exit;
2111 2356 
 		} elseif ($globalDebug) echo "Done\n";
2112 2357 
 */
2113 
-		if ($globalDebug) echo "Modes : Download...";
2114 
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2358 
+		if ($globalDebug) {
2359 
+			echo "Modes : Download...";
2360 
+		}
2361 
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
2115 2362 
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
2116 2363
2117 2364 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
2118 2365 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
2119 
-			if ($globalDebug) echo "Unzip...";
2120 
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2366 
+			if ($globalDebug) {
2367 
+				echo "Unzip...";
2368 
+			}
2369 
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
2121 2370 
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
2122 
-			if ($globalDebug) echo "Add to DB...";
2371 
+			if ($globalDebug) {
2372 
+				echo "Add to DB...";
2373 
+			}
2123 2374 
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
2124 2375 
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
2125 
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2376 
+		} else {
2377 
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
2378 
+		}
2126 2379 
 		if ($error != '') {
2127 2380 
 			return $error;
2128 
-		} elseif ($globalDebug) echo "Done\n";
2381 
+		} elseif ($globalDebug) {
2382 
+			echo "Done\n";
2383 
+		}
2129 2384 
 		return '';
2130 2385 
 	}
2131 2386
2132 2387 
 	public static function update_ModeS_faa() {
2133 2388 
 		global $tmp_dir, $globalDebug;
2134 
-		if ($globalDebug) echo "Modes FAA: Download...";
2389 
+		if ($globalDebug) {
2390 
+			echo "Modes FAA: Download...";
2391 
+		}
2135 2392 
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
2136 2393 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
2137 
-			if ($globalDebug) echo "Unzip...";
2394 
+			if ($globalDebug) {
2395 
+				echo "Unzip...";
2396 
+			}
2138 2397 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
2139 
-			if ($globalDebug) echo "Add to DB...";
2398 
+			if ($globalDebug) {
2399 
+				echo "Add to DB...";
2400 
+			}
2140 2401 
 			$error = update_db::modes_faa();
2141 
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2402 
+		} else {
2403 
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
2404 
+		}
2142 2405 
 		if ($error != '') {
2143 2406 
 			return $error;
2144 
-		} elseif ($globalDebug) echo "Done\n";
2407 
+		} elseif ($globalDebug) {
2408 
+			echo "Done\n";
2409 
+		}
2145 2410 
 		return '';
2146 2411 
 	}
2147 2412
2148 2413 
 	public static function update_ModeS_flarm() {
2149 2414 
 		global $tmp_dir, $globalDebug;
2150 
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
2415 
+		if ($globalDebug) {
2416 
+			echo "Modes Flarmnet: Download...";
2417 
+		}
2151 2418 
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
2152 2419 
 		if (file_exists($tmp_dir.'data.fln')) {
2153 
-			if ($globalDebug) echo "Add to DB...";
2420 
+			if ($globalDebug) {
2421 
+				echo "Add to DB...";
2422 
+			}
2154 2423 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
2155 
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2424 
+		} else {
2425 
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
2426 
+		}
2156 2427 
 		if ($error != '') {
2157 2428 
 			return $error;
2158 
-		} elseif ($globalDebug) echo "Done\n";
2429 
+		} elseif ($globalDebug) {
2430 
+			echo "Done\n";
2431 
+		}
2159 2432 
 		return '';
2160 2433 
 	}
2161 2434
2162 2435 
 	public static function update_ModeS_ogn() {
2163 2436 
 		global $tmp_dir, $globalDebug;
2164 
-		if ($globalDebug) echo "Modes OGN: Download...";
2437 
+		if ($globalDebug) {
2438 
+			echo "Modes OGN: Download...";
2439 
+		}
2165 2440 
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
2166 2441 
 		if (file_exists($tmp_dir.'ogn.csv')) {
2167 
-			if ($globalDebug) echo "Add to DB...";
2442 
+			if ($globalDebug) {
2443 
+				echo "Add to DB...";
2444 
+			}
2168 2445 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
2169 
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2446 
+		} else {
2447 
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
2448 
+		}
2170 2449 
 		if ($error != '') {
2171 2450 
 			return $error;
2172 
-		} elseif ($globalDebug) echo "Done\n";
2451 
+		} elseif ($globalDebug) {
2452 
+			echo "Done\n";
2453 
+		}
2173 2454 
 		return '';
2174 2455 
 	}
2175 2456
2176 2457 
 	public static function update_owner() {
2177 2458 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
2178 2459
2179 
-		if ($globalDebug) echo "Owner France: Download...";
2460 
+		if ($globalDebug) {
2461 
+			echo "Owner France: Download...";
2462 
+		}
2180 2463 
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
2181 2464 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
2182 
-			if ($globalDebug) echo "Add to DB...";
2465 
+			if ($globalDebug) {
2466 
+				echo "Add to DB...";
2467 
+			}
2183 2468 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
2184 
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2469 
+		} else {
2470 
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
2471 
+		}
2185 2472 
 		if ($error != '') {
2186 2473 
 			return $error;
2187 
-		} elseif ($globalDebug) echo "Done\n";
2474 
+		} elseif ($globalDebug) {
2475 
+			echo "Done\n";
2476 
+		}
2188 2477
2189 
-		if ($globalDebug) echo "Owner Ireland: Download...";
2478 
+		if ($globalDebug) {
2479 
+			echo "Owner Ireland: Download...";
2480 
+		}
2190 2481 
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
2191 2482 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
2192 
-			if ($globalDebug) echo "Add to DB...";
2483 
+			if ($globalDebug) {
2484 
+				echo "Add to DB...";
2485 
+			}
2193 2486 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
2194 
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2487 
+		} else {
2488 
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
2489 
+		}
2195 2490 
 		if ($error != '') {
2196 2491 
 			return $error;
2197 
-		} elseif ($globalDebug) echo "Done\n";
2198 
-		if ($globalDebug) echo "Owner Switzerland: Download...";
2492 
+		} elseif ($globalDebug) {
2493 
+			echo "Done\n";
2494 
+		}
2495 
+		if ($globalDebug) {
2496 
+			echo "Owner Switzerland: Download...";
2497 
+		}
2199 2498 
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
2200 2499 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
2201 
-			if ($globalDebug) echo "Add to DB...";
2500 
+			if ($globalDebug) {
2501 
+				echo "Add to DB...";
2502 
+			}
2202 2503 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
2203 
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2504 
+		} else {
2505 
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
2506 
+		}
2204 2507 
 		if ($error != '') {
2205 2508 
 			return $error;
2206 
-		} elseif ($globalDebug) echo "Done\n";
2207 
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2509 
+		} elseif ($globalDebug) {
2510 
+			echo "Done\n";
2511 
+		}
2512 
+		if ($globalDebug) {
2513 
+			echo "Owner Czech Republic: Download...";
2514 
+		}
2208 2515 
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
2209 2516 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
2210 
-			if ($globalDebug) echo "Add to DB...";
2517 
+			if ($globalDebug) {
2518 
+				echo "Add to DB...";
2519 
+			}
2211 2520 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
2212 
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2521 
+		} else {
2522 
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2523 
+		}
2213 2524 
 		if ($error != '') {
2214 2525 
 			return $error;
2215 
-		} elseif ($globalDebug) echo "Done\n";
2216 
-		if ($globalDebug) echo "Owner Australia: Download...";
2526 
+		} elseif ($globalDebug) {
2527 
+			echo "Done\n";
2528 
+		}
2529 
+		if ($globalDebug) {
2530 
+			echo "Owner Australia: Download...";
2531 
+		}
2217 2532 
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
2218 2533 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
2219 
-			if ($globalDebug) echo "Add to DB...";
2534 
+			if ($globalDebug) {
2535 
+				echo "Add to DB...";
2536 
+			}
2220 2537 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
2221 
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2538 
+		} else {
2539 
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2540 
+		}
2222 2541 
 		if ($error != '') {
2223 2542 
 			return $error;
2224 
-		} elseif ($globalDebug) echo "Done\n";
2225 
-		if ($globalDebug) echo "Owner Austria: Download...";
2543 
+		} elseif ($globalDebug) {
2544 
+			echo "Done\n";
2545 
+		}
2546 
+		if ($globalDebug) {
2547 
+			echo "Owner Austria: Download...";
2548 
+		}
2226 2549 
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
2227 2550 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
2228 
-			if ($globalDebug) echo "Add to DB...";
2551 
+			if ($globalDebug) {
2552 
+				echo "Add to DB...";
2553 
+			}
2229 2554 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
2230 
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2555 
+		} else {
2556 
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2557 
+		}
2231 2558 
 		if ($error != '') {
2232 2559 
 			return $error;
2233 
-		} elseif ($globalDebug) echo "Done\n";
2234 
-		if ($globalDebug) echo "Owner Chile: Download...";
2560 
+		} elseif ($globalDebug) {
2561 
+			echo "Done\n";
2562 
+		}
2563 
+		if ($globalDebug) {
2564 
+			echo "Owner Chile: Download...";
2565 
+		}
2235 2566 
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
2236 2567 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
2237 
-			if ($globalDebug) echo "Add to DB...";
2568 
+			if ($globalDebug) {
2569 
+				echo "Add to DB...";
2570 
+			}
2238 2571 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
2239 
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2572 
+		} else {
2573 
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2574 
+		}
2240 2575 
 		if ($error != '') {
2241 2576 
 			return $error;
2242 
-		} elseif ($globalDebug) echo "Done\n";
2243 
-		if ($globalDebug) echo "Owner Colombia: Download...";
2577 
+		} elseif ($globalDebug) {
2578 
+			echo "Done\n";
2579 
+		}
2580 
+		if ($globalDebug) {
2581 
+			echo "Owner Colombia: Download...";
2582 
+		}
2244 2583 
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
2245 2584 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
2246 
-			if ($globalDebug) echo "Add to DB...";
2585 
+			if ($globalDebug) {
2586 
+				echo "Add to DB...";
2587 
+			}
2247 2588 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
2248 
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2589 
+		} else {
2590 
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2591 
+		}
2249 2592 
 		if ($error != '') {
2250 2593 
 			return $error;
2251 
-		} elseif ($globalDebug) echo "Done\n";
2252 
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2594 
+		} elseif ($globalDebug) {
2595 
+			echo "Done\n";
2596 
+		}
2597 
+		if ($globalDebug) {
2598 
+			echo "Owner Bosnia Herzegobina: Download...";
2599 
+		}
2253 2600 
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
2254 2601 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
2255 
-			if ($globalDebug) echo "Add to DB...";
2602 
+			if ($globalDebug) {
2603 
+				echo "Add to DB...";
2604 
+			}
2256 2605 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
2257 
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2606 
+		} else {
2607 
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2608 
+		}
2258 2609 
 		if ($error != '') {
2259 2610 
 			return $error;
2260 
-		} elseif ($globalDebug) echo "Done\n";
2261 
-		if ($globalDebug) echo "Owner Brazil: Download...";
2611 
+		} elseif ($globalDebug) {
2612 
+			echo "Done\n";
2613 
+		}
2614 
+		if ($globalDebug) {
2615 
+			echo "Owner Brazil: Download...";
2616 
+		}
2262 2617 
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
2263 2618 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
2264 
-			if ($globalDebug) echo "Add to DB...";
2619 
+			if ($globalDebug) {
2620 
+				echo "Add to DB...";
2621 
+			}
2265 2622 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
2266 
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2623 
+		} else {
2624 
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2625 
+		}
2267 2626 
 		if ($error != '') {
2268 2627 
 			return $error;
2269 
-		} elseif ($globalDebug) echo "Done\n";
2270 
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2628 
+		} elseif ($globalDebug) {
2629 
+			echo "Done\n";
2630 
+		}
2631 
+		if ($globalDebug) {
2632 
+			echo "Owner Cayman Islands: Download...";
2633 
+		}
2271 2634 
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
2272 2635 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
2273 
-			if ($globalDebug) echo "Add to DB...";
2636 
+			if ($globalDebug) {
2637 
+				echo "Add to DB...";
2638 
+			}
2274 2639 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
2275 
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2640 
+		} else {
2641 
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2642 
+		}
2276 2643 
 		if ($error != '') {
2277 2644 
 			return $error;
2278 
-		} elseif ($globalDebug) echo "Done\n";
2279 
-		if ($globalDebug) echo "Owner Croatia: Download...";
2645 
+		} elseif ($globalDebug) {
2646 
+			echo "Done\n";
2647 
+		}
2648 
+		if ($globalDebug) {
2649 
+			echo "Owner Croatia: Download...";
2650 
+		}
2280 2651 
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
2281 2652 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
2282 
-			if ($globalDebug) echo "Add to DB...";
2653 
+			if ($globalDebug) {
2654 
+				echo "Add to DB...";
2655 
+			}
2283 2656 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
2284 
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2657 
+		} else {
2658 
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2659 
+		}
2285 2660 
 		if ($error != '') {
2286 2661 
 			return $error;
2287 
-		} elseif ($globalDebug) echo "Done\n";
2288 
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2662 
+		} elseif ($globalDebug) {
2663 
+			echo "Done\n";
2664 
+		}
2665 
+		if ($globalDebug) {
2666 
+			echo "Owner Luxembourg: Download...";
2667 
+		}
2289 2668 
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
2290 2669 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
2291 
-			if ($globalDebug) echo "Add to DB...";
2670 
+			if ($globalDebug) {
2671 
+				echo "Add to DB...";
2672 
+			}
2292 2673 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
2293 
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2674 
+		} else {
2675 
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2676 
+		}
2294 2677 
 		if ($error != '') {
2295 2678 
 			return $error;
2296 
-		} elseif ($globalDebug) echo "Done\n";
2297 
-		if ($globalDebug) echo "Owner Maldives: Download...";
2679 
+		} elseif ($globalDebug) {
2680 
+			echo "Done\n";
2681 
+		}
2682 
+		if ($globalDebug) {
2683 
+			echo "Owner Maldives: Download...";
2684 
+		}
2298 2685 
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
2299 2686 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
2300 
-			if ($globalDebug) echo "Add to DB...";
2687 
+			if ($globalDebug) {
2688 
+				echo "Add to DB...";
2689 
+			}
2301 2690 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
2302 
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2691 
+		} else {
2692 
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2693 
+		}
2303 2694 
 		if ($error != '') {
2304 2695 
 			return $error;
2305 
-		} elseif ($globalDebug) echo "Done\n";
2306 
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2696 
+		} elseif ($globalDebug) {
2697 
+			echo "Done\n";
2698 
+		}
2699 
+		if ($globalDebug) {
2700 
+			echo "Owner New Zealand: Download...";
2701 
+		}
2307 2702 
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
2308 2703 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
2309 
-			if ($globalDebug) echo "Add to DB...";
2704 
+			if ($globalDebug) {
2705 
+				echo "Add to DB...";
2706 
+			}
2310 2707 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
2311 
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2708 
+		} else {
2709 
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2710 
+		}
2312 2711 
 		if ($error != '') {
2313 2712 
 			return $error;
2314 
-		} elseif ($globalDebug) echo "Done\n";
2315 
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2713 
+		} elseif ($globalDebug) {
2714 
+			echo "Done\n";
2715 
+		}
2716 
+		if ($globalDebug) {
2717 
+			echo "Owner Papua New Guinea: Download...";
2718 
+		}
2316 2719 
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
2317 2720 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
2318 
-			if ($globalDebug) echo "Add to DB...";
2721 
+			if ($globalDebug) {
2722 
+				echo "Add to DB...";
2723 
+			}
2319 2724 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
2320 
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2725 
+		} else {
2726 
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2727 
+		}
2321 2728 
 		if ($error != '') {
2322 2729 
 			return $error;
2323 
-		} elseif ($globalDebug) echo "Done\n";
2324 
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2730 
+		} elseif ($globalDebug) {
2731 
+			echo "Done\n";
2732 
+		}
2733 
+		if ($globalDebug) {
2734 
+			echo "Owner Slovakia: Download...";
2735 
+		}
2325 2736 
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
2326 2737 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
2327 
-			if ($globalDebug) echo "Add to DB...";
2738 
+			if ($globalDebug) {
2739 
+				echo "Add to DB...";
2740 
+			}
2328 2741 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
2329 
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2742 
+		} else {
2743 
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2744 
+		}
2330 2745 
 		if ($error != '') {
2331 2746 
 			return $error;
2332 
-		} elseif ($globalDebug) echo "Done\n";
2333 
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2747 
+		} elseif ($globalDebug) {
2748 
+			echo "Done\n";
2749 
+		}
2750 
+		if ($globalDebug) {
2751 
+			echo "Owner Ecuador: Download...";
2752 
+		}
2334 2753 
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
2335 2754 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
2336 
-			if ($globalDebug) echo "Add to DB...";
2755 
+			if ($globalDebug) {
2756 
+				echo "Add to DB...";
2757 
+			}
2337 2758 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
2338 
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2759 
+		} else {
2760 
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2761 
+		}
2339 2762 
 		if ($error != '') {
2340 2763 
 			return $error;
2341 
-		} elseif ($globalDebug) echo "Done\n";
2342 
-		if ($globalDebug) echo "Owner Iceland: Download...";
2764 
+		} elseif ($globalDebug) {
2765 
+			echo "Done\n";
2766 
+		}
2767 
+		if ($globalDebug) {
2768 
+			echo "Owner Iceland: Download...";
2769 
+		}
2343 2770 
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
2344 2771 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
2345 
-			if ($globalDebug) echo "Add to DB...";
2772 
+			if ($globalDebug) {
2773 
+				echo "Add to DB...";
2774 
+			}
2346 2775 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
2347 
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2776 
+		} else {
2777 
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2778 
+		}
2348 2779 
 		if ($error != '') {
2349 2780 
 			return $error;
2350 
-		} elseif ($globalDebug) echo "Done\n";
2351 
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2781 
+		} elseif ($globalDebug) {
2782 
+			echo "Done\n";
2783 
+		}
2784 
+		if ($globalDebug) {
2785 
+			echo "Owner Isle of Man: Download...";
2786 
+		}
2352 2787 
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
2353 2788 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
2354 
-			if ($globalDebug) echo "Add to DB...";
2789 
+			if ($globalDebug) {
2790 
+				echo "Add to DB...";
2791 
+			}
2355 2792 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
2356 
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2793 
+		} else {
2794 
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2795 
+		}
2357 2796 
 		if ($error != '') {
2358 2797 
 			return $error;
2359 
-		} elseif ($globalDebug) echo "Done\n";
2798 
+		} elseif ($globalDebug) {
2799 
+			echo "Done\n";
2800 
+		}
2360 2801 
 		if ($globalMasterSource) {
2361 
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2802 
+			if ($globalDebug) {
2803 
+				echo "ModeS Netherlands: Download...";
2804 
+			}
2362 2805 
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
2363 2806 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
2364 
-				if ($globalDebug) echo "Add to DB...";
2807 
+				if ($globalDebug) {
2808 
+					echo "Add to DB...";
2809 
+				}
2365 2810 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
2366 
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2811 
+			} else {
2812 
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2813 
+			}
2367 2814 
 			if ($error != '') {
2368 2815 
 				return $error;
2369 
-			} elseif ($globalDebug) echo "Done\n";
2370 
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2816 
+			} elseif ($globalDebug) {
2817 
+				echo "Done\n";
2818 
+			}
2819 
+			if ($globalDebug) {
2820 
+				echo "ModeS Denmark: Download...";
2821 
+			}
2371 2822 
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
2372 2823 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
2373 
-				if ($globalDebug) echo "Add to DB...";
2824 
+				if ($globalDebug) {
2825 
+					echo "Add to DB...";
2826 
+				}
2374 2827 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
2375 
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2828 
+			} else {
2829 
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2830 
+			}
2376 2831 
 			if ($error != '') {
2377 2832 
 				return $error;
2378 
-			} elseif ($globalDebug) echo "Done\n";
2379 
-		} elseif ($globalDebug) echo "Done\n";
2833 
+			} elseif ($globalDebug) {
2834 
+				echo "Done\n";
2835 
+			}
2836 
+		} elseif ($globalDebug) {
2837 
+			echo "Done\n";
2838 
+		}
2380 2839 
 		return '';
2381 2840 
 	}
2382 2841
2383 2842 
 	public static function update_translation() {
2384 2843 
 		global $tmp_dir, $globalDebug;
2385 2844 
 		$error = '';
2386 
-		if ($globalDebug) echo "Translation : Download...";
2845 
+		if ($globalDebug) {
2846 
+			echo "Translation : Download...";
2847 
+		}
2387 2848 
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
2388 2849 
 		if (file_exists($tmp_dir.'translation.zip')) {
2389 
-			if ($globalDebug) echo "Unzip...";
2850 
+			if ($globalDebug) {
2851 
+				echo "Unzip...";
2852 
+			}
2390 2853 
 			update_db::unzip($tmp_dir.'translation.zip');
2391 
-			if ($globalDebug) echo "Add to DB...";
2854 
+			if ($globalDebug) {
2855 
+				echo "Add to DB...";
2856 
+			}
2392 2857 
 			$error = update_db::translation();
2393 
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2858 
+		} else {
2859 
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2860 
+		}
2394 2861 
 		if ($error != '') {
2395 2862 
 			return $error;
2396 
-		} elseif ($globalDebug) echo "Done\n";
2863 
+		} elseif ($globalDebug) {
2864 
+			echo "Done\n";
2865 
+		}
2397 2866 
 		return '';
2398 2867 
 	}
2399 2868
2400 2869 
 	public static function update_translation_fam() {
2401 2870 
 		global $tmp_dir, $globalDebug;
2402 2871 
 		$error = '';
2403 
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2872 
+		if ($globalDebug) {
2873 
+			echo "Translation from FlightAirMap website : Download...";
2874 
+		}
2404 2875 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
2405 2876 
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
2406 2877 
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
2407 2878 
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
2408 2879 
 			$translation_md5 = $translation_md5_file[0];
2409 2880 
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
2410 
-				if ($globalDebug) echo "Gunzip...";
2881 
+				if ($globalDebug) {
2882 
+					echo "Gunzip...";
2883 
+				}
2411 2884 
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
2412 
-				if ($globalDebug) echo "Add to DB...";
2885 
+				if ($globalDebug) {
2886 
+					echo "Add to DB...";
2887 
+				}
2413 2888 
 				$error = update_db::translation_fam();
2414 
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2415 
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2889 
+			} else {
2890 
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
2891 
+			}
2892 
+		} else {
2893 
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2894 
+		}
2416 2895 
 		if ($error != '') {
2417 2896 
 			return $error;
2418 
-		} elseif ($globalDebug) echo "Done\n";
2897 
+		} elseif ($globalDebug) {
2898 
+			echo "Done\n";
2899 
+		}
2419 2900 
 		return '';
2420 2901 
 	}
2421 2902 
 	public static function update_ModeS_fam() {
2422 2903 
 		global $tmp_dir, $globalDebug;
2423 2904 
 		$error = '';
2424 
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2905 
+		if ($globalDebug) {
2906 
+			echo "ModeS from FlightAirMap website : Download...";
2907 
+		}
2425 2908 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
2426 2909 
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
2427 2910 
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
2428 2911 
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
2429 2912 
 			$modes_md5 = $modes_md5_file[0];
2430 2913 
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
2431 
-				if ($globalDebug) echo "Gunzip...";
2914 
+				if ($globalDebug) {
2915 
+					echo "Gunzip...";
2916 
+				}
2432 2917 
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
2433 
-				if ($globalDebug) echo "Add to DB...";
2918 
+				if ($globalDebug) {
2919 
+					echo "Add to DB...";
2920 
+				}
2434 2921 
 				$error = update_db::modes_fam();
2435 
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2436 
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2922 
+			} else {
2923 
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
2924 
+			}
2925 
+		} else {
2926 
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2927 
+		}
2437 2928 
 		if ($error != '') {
2438 2929 
 			return $error;
2439 
-		} elseif ($globalDebug) echo "Done\n";
2930 
+		} elseif ($globalDebug) {
2931 
+			echo "Done\n";
2932 
+		}
2440 2933 
 		return '';
2441 2934 
 	}
2442 2935
2443 2936 
 	public static function update_airlines_fam() {
2444 2937 
 		global $tmp_dir, $globalDebug;
2445 2938 
 		$error = '';
2446 
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
2939 
+		if ($globalDebug) {
2940 
+			echo "Airlines from FlightAirMap website : Download...";
2941 
+		}
2447 2942 
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
2448 2943 
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
2449 2944 
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
 
@@ -2452,26 +2947,42 @@  discard block
 
 block discarded – undo
2452 2947 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
2453 2948 
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
2454 2949 
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
2455 
-						if ($globalDebug) echo "Gunzip...";
2950 
+						if ($globalDebug) {
2951 
+							echo "Gunzip...";
2952 
+						}
2456 2953 
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
2457 
-						if ($globalDebug) echo "Add to DB...";
2954 
+						if ($globalDebug) {
2955 
+							echo "Add to DB...";
2956 
+						}
2458 2957 
 						$error = update_db::airlines_fam();
2459 2958 
 						update_db::insert_airlines_version($airlines_md5);
2460 
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2461 
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2462 
-			} elseif ($globalDebug) echo "No update.";
2463 
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2959 
+					} else {
2960 
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
2961 
+					}
2962 
+			    } else {
2963 
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
2964 
+			    }
2965 
+			} elseif ($globalDebug) {
2966 
+				echo "No update.";
2967 
+			}
2968 
+		} else {
2969 
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
2970 
+		}
2464 2971 
 		if ($error != '') {
2465 2972 
 			return $error;
2466 2973 
 		} else {
2467 
-			if ($globalDebug) echo "Done\n";
2974 
+			if ($globalDebug) {
2975 
+				echo "Done\n";
2976 
+			}
2468 2977 
 		}
2469 2978 
 		return '';
2470 2979 
 	}
2471 2980
2472 2981 
 	public static function update_owner_fam() {
2473 2982 
 		global $tmp_dir, $globalDebug, $globalOwner;
2474 
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2983 
+		if ($globalDebug) {
2984 
+			echo "owner from FlightAirMap website : Download...";
2985 
+		}
2475 2986 
 		$error = '';
2476 2987 
 		if ($globalOwner === TRUE) {
2477 2988 
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
 
@@ -2484,35 +2995,57 @@  discard block
 
 block discarded – undo
2484 2995 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
2485 2996 
 			$owners_md5 = $owners_md5_file[0];
2486 2997 
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
2487 
-				if ($globalDebug) echo "Gunzip...";
2998 
+				if ($globalDebug) {
2999 
+					echo "Gunzip...";
3000 
+				}
2488 3001 
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
2489 
-				if ($globalDebug) echo "Add to DB...";
3002 
+				if ($globalDebug) {
3003 
+					echo "Add to DB...";
3004 
+				}
2490 3005 
 				$error = update_db::owner_fam();
2491 
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
2492 
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3006 
+			} else {
3007 
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
3008 
+			}
3009 
+		} else {
3010 
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
3011 
+		}
2493 3012 
 		if ($error != '') {
2494 3013 
 			return $error;
2495 
-		} elseif ($globalDebug) echo "Done\n";
3014 
+		} elseif ($globalDebug) {
3015 
+			echo "Done\n";
3016 
+		}
2496 3017 
 		return '';
2497 3018 
 	}
2498 3019 
 	public static function update_routes_fam() {
2499 3020 
 		global $tmp_dir, $globalDebug;
2500 
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
3021 
+		if ($globalDebug) {
3022 
+			echo "Routes from FlightAirMap website : Download...";
3023 
+		}
2501 3024 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
2502 3025 
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
2503 3026 
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
2504 3027 
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
2505 3028 
 			$routes_md5 = $routes_md5_file[0];
2506 3029 
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
2507 
-				if ($globalDebug) echo "Gunzip...";
3030 
+				if ($globalDebug) {
3031 
+					echo "Gunzip...";
3032 
+				}
2508 3033 
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
2509 
-				if ($globalDebug) echo "Add to DB...";
3034 
+				if ($globalDebug) {
3035 
+					echo "Add to DB...";
3036 
+				}
2510 3037 
 				$error = update_db::routes_fam();
2511 
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
2512 
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3038 
+			} else {
3039 
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
3040 
+			}
3041 
+		} else {
3042 
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
3043 
+		}
2513 3044 
 		if ($error != '') {
2514 3045 
 			return $error;
2515 
-		} elseif ($globalDebug) echo "Done\n";
3046 
+		} elseif ($globalDebug) {
3047 
+			echo "Done\n";
3048 
+		}
2516 3049 
 		return '';
2517 3050 
 	}
2518 3051 
 	public static function update_marine_identity_fam() {
 
@@ -2522,21 +3055,33 @@  discard block
 
 block discarded – undo
2522 3055 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
2523 3056 
 			$marine_identity_md5 = $marine_identity_md5_file[0];
2524 3057 
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
2525 
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
3058 
+				if ($globalDebug) {
3059 
+					echo "Marine identity from FlightAirMap website : Download...";
3060 
+				}
2526 3061 
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
2527 3062 
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
2528 3063 
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
2529 
-						if ($globalDebug) echo "Gunzip...";
3064 
+						if ($globalDebug) {
3065 
+							echo "Gunzip...";
3066 
+						}
2530 3067 
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
2531 
-						if ($globalDebug) echo "Add to DB...";
3068 
+						if ($globalDebug) {
3069 
+							echo "Add to DB...";
3070 
+						}
2532 3071 
 						$error = update_db::marine_identity_fam();
2533 
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
2534 
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3072 
+					} else {
3073 
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
3074 
+					}
3075 
+				} else {
3076 
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
3077 
+				}
2535 3078 
 				if ($error != '') {
2536 3079 
 					return $error;
2537 3080 
 				} else {
2538 3081 
 					update_db::insert_marine_identity_version($marine_identity_md5);
2539 
-					if ($globalDebug) echo "Done\n";
3082 
+					if ($globalDebug) {
3083 
+						echo "Done\n";
3084 
+					}
2540 3085 
 				}
2541 3086 
 			}
2542 3087 
 		}
 
@@ -2550,21 +3095,33 @@  discard block
 
 block discarded – undo
2550 3095 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
2551 3096 
 			$satellite_md5 = $satellite_md5_file[0];
2552 3097 
 			if (!update_db::check_satellite_version($satellite_md5)) {
2553 
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
3098 
+				if ($globalDebug) {
3099 
+					echo "Satellite from FlightAirMap website : Download...";
3100 
+				}
2554 3101 
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
2555 3102 
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
2556 3103 
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
2557 
-						if ($globalDebug) echo "Gunzip...";
3104 
+						if ($globalDebug) {
3105 
+							echo "Gunzip...";
3106 
+						}
2558 3107 
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
2559 
-						if ($globalDebug) echo "Add to DB...";
3108 
+						if ($globalDebug) {
3109 
+							echo "Add to DB...";
3110 
+						}
2560 3111 
 						$error = update_db::satellite_fam();
2561 
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
2562 
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3112 
+					} else {
3113 
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
3114 
+					}
3115 
+				} else {
3116 
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
3117 
+				}
2563 3118 
 				if ($error != '') {
2564 3119 
 					return $error;
2565 3120 
 				} else {
2566 3121 
 					update_db::insert_satellite_version($satellite_md5);
2567 
-					if ($globalDebug) echo "Done\n";
3122 
+					if ($globalDebug) {
3123 
+						echo "Done\n";
3124 
+					}
2568 3125 
 				}
2569 3126 
 			}
2570 3127 
 		}
 
@@ -2572,17 +3129,25 @@  discard block
 
 block discarded – undo
2572 3129 
 	}
2573 3130 
 	public static function update_banned_fam() {
2574 3131 
 		global $tmp_dir, $globalDebug;
2575 
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
3132 
+		if ($globalDebug) {
3133 
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
3134 
+		}
2576 3135 
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
2577 3136 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
2578 3137 
 			//if ($globalDebug) echo "Gunzip...";
2579 3138 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
2580 
-			if ($globalDebug) echo "Add to DB...";
3139 
+			if ($globalDebug) {
3140 
+				echo "Add to DB...";
3141 
+			}
2581 3142 
 			$error = update_db::banned_fam();
2582 
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3143 
+		} else {
3144 
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
3145 
+		}
2583 3146 
 		if ($error != '') {
2584 3147 
 			return $error;
2585 
-		} elseif ($globalDebug) echo "Done\n";
3148 
+		} elseif ($globalDebug) {
3149 
+			echo "Done\n";
3150 
+		}
2586 3151 
 		return '';
2587 3152 
 	}
2588 3153 
 
@@ -2590,7 +3155,9 @@  discard block
 
 block discarded – undo
2590 3155 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2591 3156 
 		include_once('class.create_db.php');
2592 3157 
 		$error = '';
2593 
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
3158 
+		if ($globalDebug) {
3159 
+			echo "Airspace from FlightAirMap website : Download...";
3160 
+		}
2594 3161 
 		if ($globalDBdriver == 'mysql') {
2595 3162 
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2596 3163 
 		} else {
 
@@ -2607,9 +3174,13 @@  discard block
 
 block discarded – undo
2607 3174 
 				}
2608 3175 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2609 3176 
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
2610 
-						if ($globalDebug) echo "Gunzip...";
3177 
+						if ($globalDebug) {
3178 
+							echo "Gunzip...";
3179 
+						}
2611 3180 
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
2612 
-						if ($globalDebug) echo "Add to DB...";
3181 
+						if ($globalDebug) {
3182 
+							echo "Add to DB...";
3183 
+						}
2613 3184 
 						$Connection = new Connection();
2614 3185 
 						if ($Connection->tableExists('airspace')) {
2615 3186 
 							$query = 'DROP TABLE airspace';
 
@@ -2622,20 +3193,30 @@  discard block
 
 block discarded – undo
2622 3193 
 						}
2623 3194 
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
2624 3195 
 						update_db::insert_airspace_version($airspace_md5);
2625 
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
2626 
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3196 
+					} else {
3197 
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
3198 
+					}
3199 
+				} else {
3200 
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
3201 
+				}
2627 3202 
 			}
2628 
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3203 
+		} else {
3204 
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
3205 
+		}
2629 3206 
 		if ($error != '') {
2630 3207 
 			return $error;
2631 
-		} elseif ($globalDebug) echo "Done\n";
3208 
+		} elseif ($globalDebug) {
3209 
+			echo "Done\n";
3210 
+		}
2632 3211 
 		return '';
2633 3212 
 	}
2634 3213
2635 3214 
 	public static function update_geoid_fam() {
2636 3215 
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
2637 3216 
 		$error = '';
2638 
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
3217 
+		if ($globalDebug) {
3218 
+			echo "Geoid from FlightAirMap website : Download...";
3219 
+		}
2639 3220 
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
2640 3221 
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
2641 3222 
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
 
@@ -2644,76 +3225,116 @@  discard block
 
 block discarded – undo
2644 3225 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
2645 3226 
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
2646 3227 
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
2647 
-						if ($globalDebug) echo "Gunzip...";
3228 
+						if ($globalDebug) {
3229 
+							echo "Gunzip...";
3230 
+						}
2648 3231 
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
2649 3232 
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
2650 3233 
 							update_db::insert_geoid_version($geoid_md5);
2651 3234 
 						}
2652 
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
2653 
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3235 
+					} else {
3236 
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
3237 
+					}
3238 
+				} else {
3239 
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
3240 
+				}
2654 3241 
 			}
2655 
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3242 
+		} else {
3243 
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
3244 
+		}
2656 3245 
 		if ($error != '') {
2657 3246 
 			return $error;
2658 
-		} elseif ($globalDebug) echo "Done\n";
3247 
+		} elseif ($globalDebug) {
3248 
+			echo "Done\n";
3249 
+		}
2659 3250 
 		return '';
2660 3251 
 	}
2661 3252
2662 3253 
 	public static function update_tle() {
2663 3254 
 		global $tmp_dir, $globalDebug;
2664 
-		if ($globalDebug) echo "Download TLE : Download...";
3255 
+		if ($globalDebug) {
3256 
+			echo "Download TLE : Download...";
3257 
+		}
2665 3258 
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2666 3259 
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2667 3260 
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt','visual.txt','sarsat.txt','argos.txt','ses.txt','iridium-NEXT.txt','beidou.txt');
2668 3261 
 		foreach ($alltle as $filename) {
2669 
-			if ($globalDebug) echo "downloading ".$filename.'...';
3262 
+			if ($globalDebug) {
3263 
+				echo "downloading ".$filename.'...';
3264 
+			}
2670 3265 
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2671 3266 
 			if (file_exists($tmp_dir.$filename)) {
2672 
-				if ($globalDebug) echo "Add to DB ".$filename."...";
3267 
+				if ($globalDebug) {
3268 
+					echo "Add to DB ".$filename."...";
3269 
+				}
2673 3270 
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2674 
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3271 
+			} else {
3272 
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
3273 
+			}
2675 3274 
 			if ($error != '') {
2676 3275 
 				echo $error."\n";
2677 
-			} elseif ($globalDebug) echo "Done\n";
3276 
+			} elseif ($globalDebug) {
3277 
+				echo "Done\n";
3278 
+			}
2678 3279 
 		}
2679 3280 
 		return '';
2680 3281 
 	}
2681 3282
2682 3283 
 	public static function update_ucsdb() {
2683 3284 
 		global $tmp_dir, $globalDebug;
2684 
-		if ($globalDebug) echo "Download UCS DB : Download...";
3285 
+		if ($globalDebug) {
3286 
+			echo "Download UCS DB : Download...";
3287 
+		}
2685 3288 
 		update_db::download('https://s3.amazonaws.com/ucs-documents/nuclear-weapons/sat-database/4-11-17-update/UCS_Satellite_Database_officialname_1-1-17.txt',$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2686 3289 
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
2687 
-			if ($globalDebug) echo "Add to DB...";
3290 
+			if ($globalDebug) {
3291 
+				echo "Add to DB...";
3292 
+			}
2688 3293 
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
2689 
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3294 
+		} else {
3295 
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
3296 
+		}
2690 3297 
 		if ($error != '') {
2691 3298 
 			echo $error."\n";
2692 
-		} elseif ($globalDebug) echo "Done\n";
3299 
+		} elseif ($globalDebug) {
3300 
+			echo "Done\n";
3301 
+		}
2693 3302 
 		return '';
2694 3303 
 	}
2695 3304
2696 3305 
 	public static function update_celestrak() {
2697 3306 
 		global $tmp_dir, $globalDebug;
2698 
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
3307 
+		if ($globalDebug) {
3308 
+			echo "Download Celestrak DB : Download...";
3309 
+		}
2699 3310 
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
2700 3311 
 		if (file_exists($tmp_dir.'satcat.txt')) {
2701 
-			if ($globalDebug) echo "Add to DB...";
3312 
+			if ($globalDebug) {
3313 
+				echo "Add to DB...";
3314 
+			}
2702 3315 
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
2703 
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3316 
+		} else {
3317 
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
3318 
+		}
2704 3319 
 		if ($error != '') {
2705 3320 
 			echo $error."\n";
2706 
-		} elseif ($globalDebug) echo "Done\n";
3321 
+		} elseif ($globalDebug) {
3322 
+			echo "Done\n";
3323 
+		}
2707 3324 
 		return '';
2708 3325 
 	}
2709 3326
2710 3327 
 	public static function update_models() {
2711 3328 
 		global $tmp_dir, $globalDebug;
2712 3329 
 		$error = '';
2713 
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
3330 
+		if ($globalDebug) {
3331 
+			echo "Models from FlightAirMap website : Download...";
3332 
+		}
2714 3333 
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2715 3334 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2716 
-			if ($globalDebug) echo "Check files...\n";
3335 
+			if ($globalDebug) {
3336 
+				echo "Check files...\n";
3337 
+			}
2717 3338 
 			$newmodelsdb = array();
2718 3339 
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2719 3340 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2732,19 +3353,29 @@  discard block
 
 block discarded – undo
2732 3353 
 			}
2733 3354 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2734 3355 
 			foreach ($diff as $key => $value) {
2735 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3356 
+				if ($globalDebug) {
3357 
+					echo 'Downloading model '.$key.' ...'."\n";
3358 
+				}
2736 3359 
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2737 3360
2738 3361 
 			}
2739 3362 
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2740 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3363 
+		} else {
3364 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3365 
+		}
2741 3366 
 		if ($error != '') {
2742 3367 
 			return $error;
2743 
-		} elseif ($globalDebug) echo "Done\n";
2744 
-		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
3368 
+		} elseif ($globalDebug) {
3369 
+			echo "Done\n";
3370 
+		}
3371 
+		if ($globalDebug) {
3372 
+			echo "glTF 2.0 Models from FlightAirMap website : Download...";
3373 
+		}
2745 3374 
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
2746 3375 
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
2747 
-			if ($globalDebug) echo "Check files...\n";
3376 
+			if ($globalDebug) {
3377 
+				echo "Check files...\n";
3378 
+			}
2748 3379 
 			$newmodelsdb = array();
2749 3380 
 			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
2750 3381 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2763,25 +3394,35 @@  discard block
 
 block discarded – undo
2763 3394 
 			}
2764 3395 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2765 3396 
 			foreach ($diff as $key => $value) {
2766 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
3397 
+				if ($globalDebug) {
3398 
+					echo 'Downloading model '.$key.' ...'."\n";
3399 
+				}
2767 3400 
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
2768 3401
2769 3402 
 			}
2770 3403 
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
2771 
-		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
3404 
+		} else {
3405 
+			$error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
3406 
+		}
2772 3407 
 		if ($error != '') {
2773 3408 
 			return $error;
2774 
-		} elseif ($globalDebug) echo "Done\n";
3409 
+		} elseif ($globalDebug) {
3410 
+			echo "Done\n";
3411 
+		}
2775 3412 
 		return '';
2776 3413 
 	}
2777 3414
2778 3415 
 	public static function update_liveries() {
2779 3416 
 		global $tmp_dir, $globalDebug;
2780 3417 
 		$error = '';
2781 
-		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
3418 
+		if ($globalDebug) {
3419 
+			echo "Liveries from FlightAirMap website : Download...";
3420 
+		}
2782 3421 
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
2783 3422 
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
2784 
-			if ($globalDebug) echo "Check files...\n";
3423 
+			if ($globalDebug) {
3424 
+				echo "Check files...\n";
3425 
+			}
2785 3426 
 			$newmodelsdb = array();
2786 3427 
 			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
2787 3428 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2800,25 +3441,35 @@  discard block
 
 block discarded – undo
2800 3441 
 			}
2801 3442 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2802 3443 
 			foreach ($diff as $key => $value) {
2803 
-				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
3444 
+				if ($globalDebug) {
3445 
+					echo 'Downloading liveries '.$key.' ...'."\n";
3446 
+				}
2804 3447 
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
2805 3448
2806 3449 
 			}
2807 3450 
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
2808 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3451 
+		} else {
3452 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3453 
+		}
2809 3454 
 		if ($error != '') {
2810 3455 
 			return $error;
2811 
-		} elseif ($globalDebug) echo "Done\n";
3456 
+		} elseif ($globalDebug) {
3457 
+			echo "Done\n";
3458 
+		}
2812 3459 
 		return '';
2813 3460 
 	}
2814 3461
2815 3462 
 	public static function update_space_models() {
2816 3463 
 		global $tmp_dir, $globalDebug;
2817 3464 
 		$error = '';
2818 
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
3465 
+		if ($globalDebug) {
3466 
+			echo "Space models from FlightAirMap website : Download...";
3467 
+		}
2819 3468 
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2820 3469 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2821 
-			if ($globalDebug) echo "Check files...\n";
3470 
+			if ($globalDebug) {
3471 
+				echo "Check files...\n";
3472 
+			}
2822 3473 
 			$newmodelsdb = array();
2823 3474 
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2824 3475 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2837,25 +3488,35 @@  discard block
 
 block discarded – undo
2837 3488 
 			}
2838 3489 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2839 3490 
 			foreach ($diff as $key => $value) {
2840 
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
3491 
+				if ($globalDebug) {
3492 
+					echo 'Downloading space model '.$key.' ...'."\n";
3493 
+				}
2841 3494 
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2842 3495
2843 3496 
 			}
2844 3497 
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2845 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3498 
+		} else {
3499 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3500 
+		}
2846 3501 
 		if ($error != '') {
2847 3502 
 			return $error;
2848 
-		} elseif ($globalDebug) echo "Done\n";
3503 
+		} elseif ($globalDebug) {
3504 
+			echo "Done\n";
3505 
+		}
2849 3506 
 		return '';
2850 3507 
 	}
2851 3508
2852 3509 
 	public static function update_vehicules_models() {
2853 3510 
 		global $tmp_dir, $globalDebug;
2854 3511 
 		$error = '';
2855 
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
3512 
+		if ($globalDebug) {
3513 
+			echo "Vehicules models from FlightAirMap website : Download...";
3514 
+		}
2856 3515 
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
2857 3516 
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
2858 
-			if ($globalDebug) echo "Check files...\n";
3517 
+			if ($globalDebug) {
3518 
+				echo "Check files...\n";
3519 
+			}
2859 3520 
 			$newmodelsdb = array();
2860 3521 
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
2861 3522 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2874,15 +3535,21 @@  discard block
 
 block discarded – undo
2874 3535 
 			}
2875 3536 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2876 3537 
 			foreach ($diff as $key => $value) {
2877 
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
3538 
+				if ($globalDebug) {
3539 
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
3540 
+				}
2878 3541 
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
2879 3542
2880 3543 
 			}
2881 3544 
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
2882 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3545 
+		} else {
3546 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
3547 
+		}
2883 3548 
 		if ($error != '') {
2884 3549 
 			return $error;
2885 
-		} elseif ($globalDebug) echo "Done\n";
3550 
+		} elseif ($globalDebug) {
3551 
+			echo "Done\n";
3552 
+		}
2886 3553 
 		return '';
2887 3554 
 	}
2888 3555 
 
@@ -2925,7 +3592,9 @@  discard block
 
 block discarded – undo
2925 3592 
                 }
2926 3593
2927 3594 
 		$error = '';
2928 
-		if ($globalDebug) echo "Notam : Download...";
3595 
+		if ($globalDebug) {
3596 
+			echo "Notam : Download...";
3597 
+		}
2929 3598 
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2930 3599 
 		if (file_exists($tmp_dir.'notam.rss')) {
2931 3600 
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
 
@@ -2940,14 +3609,30 @@  discard block
 
 block discarded – undo
2940 3609 
 				$data['fir'] = $q[0];
2941 3610 
 				$data['code'] = $q[1];
2942 3611 
 				$ifrvfr = $q[2];
2943 
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2944 
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2945 
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2946 
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2947 
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2948 
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2949 
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2950 
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
3612 
+				if ($ifrvfr == 'IV') {
3613 
+					$data['rules'] = 'IFR/VFR';
3614 
+				}
3615 
+				if ($ifrvfr == 'I') {
3616 
+					$data['rules'] = 'IFR';
3617 
+				}
3618 
+				if ($ifrvfr == 'V') {
3619 
+					$data['rules'] = 'VFR';
3620 
+				}
3621 
+				if ($q[4] == 'A') {
3622 
+					$data['scope'] = 'Airport warning';
3623 
+				}
3624 
+				if ($q[4] == 'E') {
3625 
+					$data['scope'] = 'Enroute warning';
3626 
+				}
3627 
+				if ($q[4] == 'W') {
3628 
+					$data['scope'] = 'Navigation warning';
3629 
+				}
3630 
+				if ($q[4] == 'AE') {
3631 
+					$data['scope'] = 'Airport/Enroute warning';
3632 
+				}
3633 
+				if ($q[4] == 'AW') {
3634 
+					$data['scope'] = 'Airport/Navigation warning';
3635 
+				}
2951 3636 
 				//$data['scope'] = $q[4];
2952 3637 
 				$data['lower_limit'] = $q[5];
2953 3638 
 				$data['upper_limit'] = $q[6];
 
@@ -2955,8 +3640,12 @@  discard block
 
 block discarded – undo
2955 3640 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2956 3641 
 				$latitude = $Common->convertDec($las,'latitude');
2957 3642 
 				$longitude = $Common->convertDec($lns,'longitude');
2958 
-				if ($lac == 'S') $latitude = '-'.$latitude;
2959 
-				if ($lnc == 'W') $longitude = '-'.$longitude;
3643 
+				if ($lac == 'S') {
3644 
+					$latitude = '-'.$latitude;
3645 
+				}
3646 
+				if ($lnc == 'W') {
3647 
+					$longitude = '-'.$longitude;
3648 
+				}
2960 3649 
 				$data['center_latitude'] = $latitude;
2961 3650 
 				$data['center_longitude'] = $longitude;
2962 3651 
 				$data['radius'] = intval($radius);
 
@@ -2986,10 +3675,14 @@  discard block
 
 block discarded – undo
2986 3675 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2987 3676 
 				unset($data);
2988 3677 
 			}
2989 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3678 
+		} else {
3679 
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
3680 
+		}
2990 3681 
 		if ($error != '') {
2991 3682 
 			return $error;
2992 
-		} elseif ($globalDebug) echo "Done\n";
3683 
+		} elseif ($globalDebug) {
3684 
+			echo "Done\n";
3685 
+		}
2993 3686 
 		return '';
2994 3687 
 	}
2995 3688 
 	
@@ -3014,7 +3707,9 @@  discard block
 
 block discarded – undo
3014 3707 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
3015 3708 
 		$airspace_json = json_decode($airspace_lst,true);
3016 3709 
 		foreach ($airspace_json['records'] as $airspace) {
3017 
-			if ($globalDebug) echo $airspace['name']."...\n";
3710 
+			if ($globalDebug) {
3711 
+				echo $airspace['name']."...\n";
3712 
+			}
3018 3713 
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
3019 3714 
 			if (file_exists($tmp_dir.$airspace['name'])) {
3020 3715 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 
@@ -3058,8 +3753,11 @@  discard block
 
 block discarded – undo
3058 3753 
                         return "error : ".$e->getMessage();
3059 3754 
                 }
3060 3755 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3061 
-                if ($row['nb'] > 0) return false;
3062 
-                else return true;
3756 
+                if ($row['nb'] > 0) {
3757 
+                	return false;
3758 
+                } else {
3759 
+                	return true;
3760 
+                }
3063 3761 
 	}
3064 3762
3065 3763 
 	public static function insert_last_update() {
 
@@ -3084,8 +3782,11 @@  discard block
 
 block discarded – undo
3084 3782 
                         return "error : ".$e->getMessage();
3085 3783 
                 }
3086 3784 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3087 
-                if ($row['nb'] > 0) return true;
3088 
-                else return false;
3785 
+                if ($row['nb'] > 0) {
3786 
+                	return true;
3787 
+                } else {
3788 
+                	return false;
3789 
+                }
3089 3790 
 	}
3090 3791
3091 3792 
 	public static function check_geoid_version($version) {
 
@@ -3098,8 +3799,11 @@  discard block
 
 block discarded – undo
3098 3799 
                         return "error : ".$e->getMessage();
3099 3800 
                 }
3100 3801 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3101 
-                if ($row['nb'] > 0) return true;
3102 
-                else return false;
3802 
+                if ($row['nb'] > 0) {
3803 
+                	return true;
3804 
+                } else {
3805 
+                	return false;
3806 
+                }
3103 3807 
 	}
3104 3808
3105 3809 
 	public static function check_marine_identity_version($version) {
 
@@ -3112,8 +3816,11 @@  discard block
 
 block discarded – undo
3112 3816 
 			return "error : ".$e->getMessage();
3113 3817 
 		}
3114 3818 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3115 
-		if ($row['nb'] > 0) return true;
3116 
-		else return false;
3819 
+		if ($row['nb'] > 0) {
3820 
+			return true;
3821 
+		} else {
3822 
+			return false;
3823 
+		}
3117 3824 
 	}
3118 3825
3119 3826 
 	public static function check_satellite_version($version) {
 
@@ -3126,8 +3833,11 @@  discard block
 
 block discarded – undo
3126 3833 
 			return "error : ".$e->getMessage();
3127 3834 
 		}
3128 3835 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3129 
-		if ($row['nb'] > 0) return true;
3130 
-		else return false;
3836 
+		if ($row['nb'] > 0) {
3837 
+			return true;
3838 
+		} else {
3839 
+			return false;
3840 
+		}
3131 3841 
 	}
3132 3842
3133 3843 
 	public static function check_airlines_version($version) {
 
@@ -3140,8 +3850,11 @@  discard block
 
 block discarded – undo
3140 3850 
 			return "error : ".$e->getMessage();
3141 3851 
 		}
3142 3852 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3143 
-		if ($row['nb'] > 0) return true;
3144 
-		else return false;
3853 
+		if ($row['nb'] > 0) {
3854 
+			return true;
3855 
+		} else {
3856 
+			return false;
3857 
+		}
3145 3858 
 	}
3146 3859
3147 3860 
 	public static function check_notam_version($version) {
 
@@ -3154,8 +3867,11 @@  discard block
 
 block discarded – undo
3154 3867 
 			return "error : ".$e->getMessage();
3155 3868 
 		}
3156 3869 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3157 
-		if ($row['nb'] > 0) return true;
3158 
-		else return false;
3870 
+		if ($row['nb'] > 0) {
3871 
+			return true;
3872 
+		} else {
3873 
+			return false;
3874 
+		}
3159 3875 
 	}
3160 3876
3161 3877 
 	public static function insert_airlines_version($version) {
 
@@ -3245,8 +3961,11 @@  discard block
 
 block discarded – undo
3245 3961 
                         return "error : ".$e->getMessage();
3246 3962 
                 }
3247 3963 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3248 
-                if ($row['nb'] > 0) return false;
3249 
-                else return true;
3964 
+                if ($row['nb'] > 0) {
3965 
+                	return false;
3966 
+                } else {
3967 
+                	return true;
3968 
+                }
3250 3969 
 	}
3251 3970
3252 3971 
 	public static function insert_last_notam_update() {
 
@@ -3276,8 +3995,11 @@  discard block
 
 block discarded – undo
3276 3995 
                         return "error : ".$e->getMessage();
3277 3996 
                 }
3278 3997 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3279 
-                if ($row['nb'] > 0) return false;
3280 
-                else return true;
3998 
+                if ($row['nb'] > 0) {
3999 
+                	return false;
4000 
+                } else {
4001 
+                	return true;
4002 
+                }
3281 4003 
 	}
3282 4004
3283 4005 
 	public static function insert_last_airspace_update() {
 
@@ -3307,8 +4029,11 @@  discard block
 
 block discarded – undo
3307 4029 
                         return "error : ".$e->getMessage();
3308 4030 
                 }
3309 4031 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3310 
-                if ($row['nb'] > 0) return false;
3311 
-                else return true;
4032 
+                if ($row['nb'] > 0) {
4033 
+                	return false;
4034 
+                } else {
4035 
+                	return true;
4036 
+                }
3312 4037 
 	}
3313 4038
3314 4039 
 	public static function insert_last_geoid_update() {
 
@@ -3338,8 +4063,11 @@  discard block
 
 block discarded – undo
3338 4063 
 			return "error : ".$e->getMessage();
3339 4064 
 		}
3340 4065 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3341 
-		if ($row['nb'] > 0) return false;
3342 
-		else return true;
4066 
+		if ($row['nb'] > 0) {
4067 
+			return false;
4068 
+		} else {
4069 
+			return true;
4070 
+		}
3343 4071 
 	}
3344 4072
3345 4073 
 	public static function insert_last_owner_update() {
 
@@ -3369,8 +4097,11 @@  discard block
 
 block discarded – undo
3369 4097 
 			return "error : ".$e->getMessage();
3370 4098 
 		}
3371 4099 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3372 
-		if ($row['nb'] > 0) return false;
3373 
-		else return true;
4100 
+		if ($row['nb'] > 0) {
4101 
+			return false;
4102 
+		} else {
4103 
+			return true;
4104 
+		}
3374 4105 
 	}
3375 4106
3376 4107 
 	public static function insert_last_fires_update() {
 
@@ -3400,8 +4131,11 @@  discard block
 
 block discarded – undo
3400 4131 
 			return "error : ".$e->getMessage();
3401 4132 
 		}
3402 4133 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3403 
-		if ($row['nb'] > 0) return false;
3404 
-		else return true;
4134 
+		if ($row['nb'] > 0) {
4135 
+			return false;
4136 
+		} else {
4137 
+			return true;
4138 
+		}
3405 4139 
 	}
3406 4140
3407 4141 
 	public static function insert_last_airlines_update() {
 
@@ -3431,8 +4165,11 @@  discard block
 
 block discarded – undo
3431 4165 
                         return "error : ".$e->getMessage();
3432 4166 
                 }
3433 4167 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
3434 
-                if ($row['nb'] > 0) return false;
3435 
-                else return true;
4168 
+                if ($row['nb'] > 0) {
4169 
+                	return false;
4170 
+                } else {
4171 
+                	return true;
4172 
+                }
3436 4173 
 	}
3437 4174
3438 4175 
 	public static function insert_last_schedules_update() {
 
@@ -3462,8 +4199,11 @@  discard block
 
 block discarded – undo
3462 4199 
 			return "error : ".$e->getMessage();
3463 4200 
 		}
3464 4201 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3465 
-		if ($row['nb'] > 0) return false;
3466 
-		else return true;
4202 
+		if ($row['nb'] > 0) {
4203 
+			return false;
4204 
+		} else {
4205 
+			return true;
4206 
+		}
3467 4207 
 	}
3468 4208
3469 4209 
 	public static function insert_last_tle_update() {
 
@@ -3493,8 +4233,11 @@  discard block
 
 block discarded – undo
3493 4233 
 			return "error : ".$e->getMessage();
3494 4234 
 		}
3495 4235 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3496 
-		if ($row['nb'] > 0) return false;
3497 
-		else return true;
4236 
+		if ($row['nb'] > 0) {
4237 
+			return false;
4238 
+		} else {
4239 
+			return true;
4240 
+		}
3498 4241 
 	}
3499 4242
3500 4243 
 	public static function insert_last_ucsdb_update() {
 
@@ -3524,8 +4267,11 @@  discard block
 
 block discarded – undo
3524 4267 
 			return "error : ".$e->getMessage();
3525 4268 
 		}
3526 4269 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3527 
-		if ($row['nb'] > 0) return false;
3528 
-		else return true;
4270 
+		if ($row['nb'] > 0) {
4271 
+			return false;
4272 
+		} else {
4273 
+			return true;
4274 
+		}
3529 4275 
 	}
3530 4276
3531 4277 
 	public static function insert_last_celestrak_update() {
 
@@ -3555,8 +4301,11 @@  discard block
 
 block discarded – undo
3555 4301 
 			return "error : ".$e->getMessage();
3556 4302 
 		}
3557 4303 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3558 
-		if ($row['nb'] > 0) return false;
3559 
-		else return true;
4304 
+		if ($row['nb'] > 0) {
4305 
+			return false;
4306 
+		} else {
4307 
+			return true;
4308 
+		}
3560 4309 
 	}
3561 4310
3562 4311 
 	public static function check_last_satellite_update() {
 
@@ -3574,8 +4323,11 @@  discard block
 
 block discarded – undo
3574 4323 
 			return "error : ".$e->getMessage();
3575 4324 
 		}
3576 4325 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
3577 
-		if ($row['nb'] > 0) return false;
3578 
-		else return true;
4326 
+		if ($row['nb'] > 0) {
4327 
+			return false;
4328 
+		} else {
4329 
+			return true;
4330 
+		}
3579 4331 
 	}
3580 4332
3581 4333 
 	public static function insert_last_marine_identity_update() {
Please login to merge, or discard this patch.