Ysurac / FlightAirMap

require/class.Stats.php

Braces +778 added lines, -273 removed lines

@@ -22,10 +22,14 @@ 
 	*/
 	public function __construct($dbc = null) {
 		global $globalFilterName;
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
+		if (isset($globalFilterName)) {
+			$this->filter_name = $globalFilterName;
+		}
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Stats)');
+		}
 	}
 
 	public function addLastStatsUpdate($type,$stats_date) {
@@ -93,7 +97,9 @@ 
 
 	public function getAllAirlineNames($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
 		 try {
 			$sth = $this->db->prepare($query);
@@ -113,7 +119,9 @@ 
 		return $all;
 	}
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
 		try {
 			$sth = $this->db->prepare($query);
@@ -125,7 +133,9 @@ 
 		return $all;
 	}
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		try {
 			$sth = $this->db->prepare($query);
@@ -137,7 +147,9 @@ 
 		return $all;
 	}
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		try {
 			$sth = $this->db->prepare($query);
@@ -150,7 +162,9 @@ 
 	}
 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
@@ -163,7 +177,9 @@ 
 	}
 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
 		try {
 			$sth = $this->db->prepare($query);
@@ -178,7 +194,9 @@ 
 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -187,8 +205,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -196,11 +217,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -208,7 +234,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -227,10 +255,15 @@ 
 	}
 	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($limit) $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
-			else $query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+			if ($limit) {
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY marine_type_count DESC LIMIT 10 OFFSET 0";
+			} else {
+				$query = "SELECT type AS marine_type, cnt AS marine_type_count, type_id AS marine_type_id FROM stats_marine_type WHERE filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -238,7 +271,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -252,10 +287,15 @@ 
 	}
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			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";
-			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";
+			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";
+			} 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";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -263,7 +303,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$Spotter = new Spotter($this->db);
 			$filters = array();
@@ -278,7 +320,9 @@ 
 	}
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -287,8 +331,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -296,11 +343,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -308,7 +360,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -328,7 +382,9 @@ 
 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -337,8 +393,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -346,11 +405,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -358,7 +422,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -377,7 +443,9 @@ 
 	}
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -385,12 +453,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			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";
-			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";
+			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";
+			} 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";
+			}
 			$query_values = array(':filter_name' => $filter_name);
 		} else {
-			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";
-			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";
+			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";
+			} 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";
+			}
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		}
 		try {
@@ -418,17 +492,29 @@ 
 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			if ($globalVATSIM) $forsource = 'vatsim';
-			if ($globalIVAO) $forsource = 'ivao';
+			if ($globalVATSIM) {
+				$forsource = 'vatsim';
+			}
+			if ($globalIVAO) {
+				$forsource = 'ivao';
+			}
 			if (isset($forsource)) {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
 			} else {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				$query_values = array(':filter_name' => $filter_name);
 			}
 			try {
@@ -438,7 +524,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
                 if (empty($all)) {
 	                $Spotter = new Spotter($this->db);
             		$filters = array();
@@ -453,7 +541,9 @@ 
 	}
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -462,8 +552,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY registration_count DESC";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY registration_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -471,11 +564,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY registration_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY registration_count DESC";
+				if ($limit) {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY registration_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -483,7 +581,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -502,7 +602,9 @@ 
 	}
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -511,8 +613,11 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -520,11 +625,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -532,7 +642,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -551,7 +663,9 @@ 
 	}
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		$Connection = new Connection($this->db);
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 				$Spotter = new Spotter($this->db);
@@ -561,8 +675,11 @@ 
 					foreach ($airlines as $airline) {
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 					}
-					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";
-					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";
+					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";
+					} 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";
+					}
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':filter_name' => $filter_name));
@@ -571,11 +688,16 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			} else {
 				if ($year == '' && $month == '') {
-					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";
-					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";
+					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";
+					} 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";
+					}
 					 try {
 						$sth = $this->db->prepare($query);
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -584,20 +706,29 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 			$Spotter = new Spotter($this->db);
 			return $Spotter->countAllFlightOverCountries($limit);
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
 		$Connection = new Connection($this->db);
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			$all = array();
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
-				else $query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
+				if ($limit) {
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC LIMIT 20 OFFSET 0";
+				} else {
+					$query = "SELECT countries.iso3 as marine_country_iso3, countries.iso2 as marine_country_iso2, countries.name as marine_country, cnt as marine_count, lat as marine_country_latitude, lon as marine_country_longitude FROM stats_marine_country, countries WHERE stats_marine_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY marine_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -615,17 +746,24 @@ 
 				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
 			}
 			return $all;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
 		$Connection = new Connection($this->db);
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($Connection->tableExists('countries')) {
 			$all = array();
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
-				else $query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
+				if ($limit) {
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC LIMIT 20 OFFSET 0";
+				} else {
+					$query = "SELECT countries.iso3 as tracker_country_iso3, countries.iso2 as tracker_country_iso2, countries.name as tracker_country, cnt as tracker_count, lat as tracker_country_latitude, lon as tracker_country_longitude FROM stats_tracker_country, countries WHERE stats_tracker_country.iso2 = countries.iso2 AND filter_name = :filter_name ORDER BY tracker_count DESC";
+				}
 				 try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -644,14 +782,21 @@ 
 				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
 			}
 			return $all;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
-			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";
-			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";
+			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";
+			} 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";
+			}
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -659,7 +804,9 @@ 
 				echo "error : ".$e->getMessage();
 			}
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		} else $all = array();
+		} else {
+			$all = array();
+		}
 		if (empty($all)) {
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
 			if ($filter_name != '') {
@@ -674,7 +821,9 @@ 
 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -683,8 +832,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -692,11 +844,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -704,7 +861,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -723,7 +882,9 @@ 
 	}
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -732,8 +893,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -741,11 +905,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -753,7 +922,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -778,7 +949,9 @@ 
 				$icao = $value['airport_departure_icao'];
 				if (isset($all[$icao])) {
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-				} else $all[$icao] = $value;
+				} else {
+					$all[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($all as $key => $row) {
@@ -790,7 +963,9 @@ 
 	}
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -799,8 +974,11 @@ 
 				foreach ($airlines as $airline) {
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 				}
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -808,11 +986,16 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		} else {
 			if ($year == '' && $month == '') {
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				if ($limit) {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
+				} else {
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -820,7 +1003,9 @@ 
 					echo "error : ".$e->getMessage();
 				}
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			} else $all = array();
+			} else {
+				$all = array();
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -845,7 +1030,9 @@ 
 				$icao = $value['airport_arrival_icao'];
 				if (isset($all[$icao])) {
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-				} else $all[$icao] = $value;
+				} else {
+					$all[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($all as $key => $row) {
@@ -857,7 +1044,9 @@ 
 	}
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -866,20 +1055,32 @@ 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
 			if ($globalDBdriver == 'mysql') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 			} else {
-				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";
-				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";
+				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";
+				} 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";
+				}
 			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
 			if ($globalDBdriver == 'mysql') {
-				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";
-				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";
+				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";
+				} 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";
+				}
 			} else {
-				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";
-				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";
+				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";
+				} 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";
+				}
 			}
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		}
@@ -907,13 +1108,21 @@ 
 
 	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
+			}
 		} else {
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'marine_bymonth' AND filter_name = :filter_name";
+			}
 		}
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -936,13 +1145,21 @@ 
 
 	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
-			if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
-			else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
+			}
 		} else {
-			if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
-			else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
+			if ($limit) {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND filter_name = :filter_name";
+			} else {
+				$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'tracker_bymonth' AND filter_name = :filter_name";
+			}
 		}
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -965,7 +1182,9 @@ 
 	
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1002,7 +1221,9 @@ 
 	}
 	public function countAllMarineDatesLastMonth($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND filter_name = :filter_name";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -1024,7 +1245,9 @@ 
 	}
 	public function countAllTrackerDatesLastMonth($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND filter_name = :filter_name";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -1046,7 +1269,9 @@ 
 	}
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1091,7 +1316,9 @@ 
 	}
 	public function countAllMarineDatesLast7Days($filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'month' AND marine_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
 		} else {
@@ -1117,7 +1344,9 @@ 
 	}
 	public function countAllTrackerDatesLast7Days($filter_name = '') {
 		global $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'month' AND tracker_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND filter_name = :filter_name";
 		} else {
@@ -1143,7 +1372,9 @@ 
 	}
 	public function countAllDates($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1180,7 +1411,9 @@ 
 	}
 	public function countAllDatesMarine($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -1202,7 +1435,9 @@ 
 	}
 	public function countAllDatesTracker($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		$query_data = array(':filter_name' => $filter_name);
 		try {
@@ -1224,7 +1459,9 @@ 
 	}
 	public function countAllDatesByAirlines($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		$query_data = array('filter_name' => $filter_name);
 		try {
@@ -1246,7 +1483,9 @@ 
 	}
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
 		global $globalStatsFilters, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1331,7 +1570,9 @@ 
 	}
 	public function countAllMilitaryMonths($filter_name = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$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";
 		try {
 			$sth = $this->db->prepare($query);
@@ -1352,7 +1593,9 @@ 
 	}
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1360,12 +1603,18 @@ 
 			foreach ($airlines as $airline) {
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
 			}
-			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";
-			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";
+			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";
+			} 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";
+			}
 			$query_data = array(':filter_name' => $filter_name);
 		} else {
-			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";
-			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";
+			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";
+			} 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";
+			}
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
 		}
 		if ($orderby == 'hour') {
@@ -1375,7 +1624,9 @@ 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
@@ -1399,9 +1650,14 @@ 
 	}
 	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
-		else $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		} else {
+			$query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		}
 		$query_data = array(':filter_name' => $filter_name);
 		if ($orderby == 'hour') {
 			if ($globalDBdriver == 'mysql') {
@@ -1410,7 +1666,9 @@ 
 				$query .= " ORDER BY CAST(marine_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
@@ -1430,9 +1688,14 @@ 
 	}
 	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
-		else $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($limit) {
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		} else {
+			$query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
+		}
 		$query_data = array(':filter_name' => $filter_name);
 		if ($orderby == 'hour') {
 			if ($globalDBdriver == 'mysql') {
@@ -1441,7 +1704,9 @@ 
 				$query .= " ORDER BY CAST(tracker_date AS integer) ASC";
 			}
 		}
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
+		if ($orderby == 'count') {
+			$query .= " ORDER BY hour_count DESC";
+		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_data);
@@ -1461,8 +1726,12 @@ 
 	}
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1481,8 +1750,12 @@ 
 	}
 	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 			$filters = array('year' => $year,'month' => $month);
@@ -1497,8 +1770,12 @@ 
 	}
 	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 			$filters = array('year' => $year,'month' => $month);
@@ -1513,8 +1790,12 @@ 
 	}
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
 		if (empty($all)) {
 			$filters = array();
@@ -1530,8 +1811,12 @@ 
 	}
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
-		if ($year == '') $year = date('Y');
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
+		if ($year == '') {
+			$year = date('Y');
+		}
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1550,7 +1835,9 @@ 
 	}
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1568,7 +1855,9 @@ 
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else {
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			}
 		} else {
 			if ($year == '' && $month == '') {
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1580,7 +1869,9 @@ 
 				}
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 				$all = $result[0]['nb'];
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			} else {
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
+			}
 		}
 		if (empty($all)) {
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1599,7 +1890,9 @@ 
 	}
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
 			try {
@@ -1610,7 +1903,9 @@ 
 			}
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 			$all = $result[0]['nb_airline'];
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		} else {
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
+		}
 		if (empty($all)) {
 			$filters = array();
 			$filters = array('year' => $year,'month' => $month);
@@ -1625,7 +1920,9 @@ 
 	}
 	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$all = array();
 		if ($year == '' && $month == '') {
 			$query = "SELECT COUNT(*) AS nb_type FROM stats_marine_type WHERE filter_name = :filter_name";
@@ -1652,7 +1949,9 @@ 
 	}
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1707,7 +2006,9 @@ 
 	}
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
 		global $globalStatsFilters;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		//if ($year == '') $year = date('Y');
 		if ($year == '' && $month == '') {
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1736,7 +2037,9 @@ 
 	}
 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1760,7 +2063,9 @@ 
 		return $all;
 	}
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		try {
@@ -1773,7 +2078,9 @@ 
 		return $all;
 	}
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
 		try {
@@ -1784,7 +2091,9 @@ 
 		}
 	}
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		global $globalArchiveMonths, $globalDBdriver;
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
@@ -1840,7 +2149,9 @@ 
 	}
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1873,7 +2184,9 @@ 
 	}
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
 			$Spotter = new Spotter($this->db);
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1904,7 +2217,9 @@ 
 	}
 	public function getStatsAirlineTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
 		} else {
@@ -1921,7 +2236,9 @@ 
 	}
 	public function getStatsOwnerTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
 		} else {
@@ -1938,7 +2255,9 @@ 
 	}
 	public function getStatsOwner($owner_name,$filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
 		try {
 			$sth = $this->db->prepare($query);
@@ -1947,12 +2266,17 @@ 
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-		else return 0;
+		if (isset($all[0]['cnt'])) {
+			return $all[0]['cnt'];
+		} else {
+			return 0;
+		}
 	}
 	public function getStatsPilotTotal($filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
 		} else {
@@ -1969,7 +2293,9 @@ 
 	}
 	public function getStatsPilot($pilot,$filter_name = '') {
 		global $globalArchiveMonths, $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
 		try {
 			$sth = $this->db->prepare($query);
@@ -1978,13 +2304,18 @@ 
 			echo "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
-		else return 0;
+		if (isset($all[0]['cnt'])) {
+			return $all[0]['cnt'];
+		} else {
+			return 0;
+		}
 	}
 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$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";
 		} else {
@@ -2000,7 +2331,9 @@ 
 	}
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
 		global $globalDBdriver;
-		if ($filter_name == '') $filter_name = $this->filter_name;
+		if ($filter_name == '') {
+			$filter_name = $this->filter_name;
+		}
 		if ($globalDBdriver == 'mysql') {
 			$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";
 		} else {
@@ -2519,27 +2852,37 @@ 
 		date_default_timezone_set('UTC');
 		if ((isset($globalMarine) && $globalMarine) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update Marine stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			$Marine = new Marine($this->db);
 			$filtername = 'marine';
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all vessels by countries...'."\n";
+				}
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
 				foreach ($alldata as $number) {
 					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all vessels by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$alldata = $Marine->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$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'])));
 			}
 			echo 'Marine data...'."\n";
@@ -2569,7 +2912,9 @@ 
 			foreach ($alldata as $number) {
 				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
 			}
-			if ($globalDebug) echo 'Count all types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all types...'."\n";
+			}
 			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
@@ -2581,26 +2926,36 @@ 
 		}
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update tracker stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			$Tracker = new Tracker($this->db);
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all trackers by countries...'."\n";
+				}
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
 				foreach ($alldata as $number) {
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all vessels by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$alldata = $Tracker->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$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'])));
 			}
 			echo 'Tracker data...'."\n";
@@ -2630,7 +2985,9 @@ 
 			foreach ($alldata as $number) {
 				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
 			}
-			if ($globalDebug) echo 'Count all types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all types...'."\n";
+			}
 			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
@@ -2642,10 +2999,14 @@ 
 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
+			if ($globalDebug) {
+				echo '!!! Update aicraft stats !!!'."\n";
+			}
 			if (isset($last_update[0]['value'])) {
 				$last_update_day = $last_update[0]['value'];
-			} else $last_update_day = '2012-12-12 12:12:12';
+			} else {
+				$last_update_day = '2012-12-12 12:12:12';
+			}
 			$reset = false;
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
 			if ($globalStatsResetYear) {
@@ -2654,43 +3015,63 @@ 
 			}
 			$Spotter = new Spotter($this->db);
 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all registrations...'."\n";
+			if ($globalDebug) {
+				echo 'Count all registrations...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners...'."\n";
+			}
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots...'."\n";
+			}
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
 			foreach ($alldata as $number) {
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
+					$number['pilot_id'] = $number['pilot_name'];
+				}
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
 			}
 			
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order departure airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order departure airports...'."\n";
+			}
 			$alldata = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -2700,7 +3081,9 @@ 
 				$icao = $value['airport_departure_icao'];
 				if (isset($alldata[$icao])) {
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-				} else $alldata[$icao] = $value;
+				} else {
+					$alldata[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($alldata as $key => $row) {
@@ -2710,11 +3093,17 @@ 
 			foreach ($alldata as $number) {
 				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);
 			}
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports...'."\n";
+			}
 			$alldata = array();
 			foreach ($pall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -2724,7 +3113,9 @@ 
 				$icao = $value['airport_arrival_icao'];
 				if (isset($alldata[$icao])) {
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-				} else $alldata[$icao] = $value;
+				} else {
+					$alldata[$icao] = $value;
+				}
 			}
 			$count = array();
 			foreach ($alldata as $key => $row) {
@@ -2735,7 +3126,9 @@ 
 				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);
 			}
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries...'."\n";
+				}
 				//$SpotterArchive = new SpotterArchive();
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
 				$Spotter = new Spotter($this->db);
@@ -2746,7 +3139,9 @@ 
 			}
 			
 			if (isset($globalAccidents) && $globalAccidents) {
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
+				if ($globalDebug) {
+					echo 'Count fatalities stats...'."\n";
+				}
 				$Accident = new Accident($this->db);
 				$this->deleteStatsByType('fatalities_byyear');
 				$alldata = $Accident->countFatalitiesByYear();
@@ -2762,48 +3157,68 @@ 
 
 			// Add by month using getstat if month finish...
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all flights by months...'."\n";
+			}
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
 			$filter_last_month = array('since_date' => $last_month);
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonths($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all military flights by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all airlines by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
 			foreach ($alldata as $number) {
 				$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'])));
 			}
-			if ($globalDebug) echo 'Airports data...'."\n";
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo 'Airports data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$this->deleteStatAirport('daily');
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -2921,7 +3336,9 @@ 
 			// Count by airlines
 			echo '--- Stats by airlines ---'."\n";
 			if ($Connection->tableExists('countries')) {
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
+				if ($globalDebug) {
+					echo 'Count all flights by countries by airlines...'."\n";
+				}
 				$SpotterArchive = new SpotterArchive($this->db);
 				//$Spotter = new Spotter($this->db);
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -2930,37 +3347,53 @@ 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
 				}
 			}
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft types by airlines...'."\n";
+			}
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircraft registrations by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all callsigns by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
 			}
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
 			foreach ($alldata as $number) {
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
 			}
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all departure airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected departure airports by airlines...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order detected departure airports by airlines...'."\n";
+			}
 			//$alldata = array();
 			foreach ($dall as $value) {
 				$icao = $value['airport_departure_icao'];
@@ -2981,11 +3414,17 @@ 
 			foreach ($alldata as $number) {
 				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);
 			}
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all arrival airports by airlines...'."\n";
+			}
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all detected arrival airports by airlines...'."\n";
+			}
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Order arrival airports by airlines...'."\n";
+			}
 			//$alldata = array();
 			foreach ($dall as $value) {
 				$icao = $value['airport_arrival_icao'];
@@ -3004,37 +3443,53 @@ 
 			}
 			$alldata = $pall;
 			foreach ($alldata as $number) {
-				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);
+				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);
+				}
+			}
+			if ($globalDebug) {
+				echo 'Count all flights by months by airlines...'."\n";
 			}
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
 			$Spotter = new Spotter($this->db);
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
 			$lastyear = false;
 			foreach ($alldata as $number) {
-				if ($number['year_name'] != date('Y')) $lastyear = true;
+				if ($number['year_name'] != date('Y')) {
+					$lastyear = true;
+				}
 				$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']);
 			}
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all owners by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$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']);
 			}
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all pilots by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$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']);
 			}
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all aircrafts by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$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']);
 			}
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
+			if ($globalDebug) {
+				echo 'Count all real arrivals by months by airlines...'."\n";
+			}
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$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']);
 			}
-			if ($globalDebug) echo '...Departure'."\n";
+			if ($globalDebug) {
+				echo '...Departure'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
 			foreach ($dall as $value) {
@@ -3057,7 +3512,9 @@ 
 			foreach ($alldata as $number) {
 				$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']);
 			}
-			if ($globalDebug) echo '...Arrival'."\n";
+			if ($globalDebug) {
+				echo '...Arrival'."\n";
+			}
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
 			foreach ($dall as $value) {
@@ -3081,13 +3538,19 @@ 
 				$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']);
 			}
 
-			if ($globalDebug) echo 'Flights data...'."\n";
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
+			if ($globalDebug) {
+				echo 'Flights data...'."\n";
+			}
+			if ($globalDebug) {
+				echo '-> countAllDatesLastMonth...'."\n";
+			}
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
 			}
-			if ($globalDebug) echo '-> countAllDates...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllDates...'."\n";
+			}
 			//$previousdata = $this->countAllDatesByAirlines();
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
 			$values = array();
@@ -3100,14 +3563,18 @@ 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
 			}
 			
-			if ($globalDebug) echo '-> countAllHours...'."\n";
+			if ($globalDebug) {
+				echo '-> countAllHours...'."\n";
+			}
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
 			foreach ($alldata as $number) {
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
 			}
 
 			// Stats by filters
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
+				$globalStatsFilters = array();
+			}
 			foreach ($globalStatsFilters as $name => $filter) {
 				if (!empty($filter)) {
 					//$filter_name = $filter['name'];
@@ -3115,7 +3582,9 @@ 
 					$reset = false;
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+						if ($globalDebug) {
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
+						}
 						$this->deleteOldStats($filter_name);
 						unset($last_update);
 					}
@@ -3132,39 +3601,55 @@ 
 						$reset = true;
 					}
 					// Count by filter
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
+					if ($globalDebug) {
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
+					}
 					$Spotter = new Spotter($this->db);
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircraft types...'."\n";
+					}
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all airlines...'."\n";
+					if ($globalDebug) {
+						echo 'Count all airlines...'."\n";
+					}
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircraft registrations...'."\n";
+					}
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
+					if ($globalDebug) {
+						echo 'Count all callsigns...'."\n";
+					}
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all owners...'."\n";
+					if ($globalDebug) {
+						echo 'Count all owners...'."\n";
+					}
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
 					}
-					if ($globalDebug) echo 'Count all pilots...'."\n";
+					if ($globalDebug) {
+						echo 'Count all pilots...'."\n";
+					}
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
 					foreach ($alldata as $number) {
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
 					}
-					if ($globalDebug) echo 'Count departure airports...'."\n";
+					if ($globalDebug) {
+						echo 'Count departure airports...'."\n";
+					}
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
 					$alldata = array();
@@ -3176,7 +3661,9 @@ 
 						$icao = $value['airport_departure_icao'];
 						if (isset($alldata[$icao])) {
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
-						} else $alldata[$icao] = $value;
+						} else {
+							$alldata[$icao] = $value;
+						}
 					}
 					$count = array();
 					foreach ($alldata as $key => $row) {
@@ -3186,7 +3673,9 @@ 
 					foreach ($alldata as $number) {
 						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);
 					}
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
+					if ($globalDebug) {
+						echo 'Count all arrival airports...'."\n";
+					}
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
 					$alldata = array();
@@ -3198,7 +3687,9 @@ 
 						$icao = $value['airport_arrival_icao'];
 						if (isset($alldata[$icao])) {
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
-						} else $alldata[$icao] = $value;
+						} else {
+							$alldata[$icao] = $value;
+						}
 					}
 					$count = array();
 					foreach ($alldata as $key => $row) {
@@ -3208,35 +3699,49 @@ 
 					foreach ($alldata as $number) {
 						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);
 					}
-					if ($globalDebug) echo 'Count all months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all months...'."\n";
+					}
 					$Spotter = new Spotter($this->db);
 					$alldata = $Spotter->countAllMonths($filter);
 					$lastyear = false;
 					foreach ($alldata as $number) {
-						if ($number['year_name'] != date('Y')) $lastyear = true;
+						if ($number['year_name'] != date('Y')) {
+							$lastyear = true;
+						}
 						$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);
 					}
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all owners by months...'."\n";
+					}
 					$alldata = $Spotter->countAllMonthsOwners($filter);
 					foreach ($alldata as $number) {
 						$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);
 					}
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all pilots by months...'."\n";
+					}
 					$alldata = $Spotter->countAllMonthsPilots($filter);
 					foreach ($alldata as $number) {
 						$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);
 					}
-					if ($globalDebug) echo 'Count all military by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all military by months...'."\n";
+					}
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
 					foreach ($alldata as $number) {
 						$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);
 					}
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all aircrafts by months...'."\n";
+					}
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
 				    	foreach ($alldata as $number) {
 			    			$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);
 					}
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
+					if ($globalDebug) {
+						echo 'Count all real arrivals by months...'."\n";
+					}
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
 					foreach ($alldata as $number) {
 						$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);

require/class.SBS.php

Braces +248 added lines, -87 removed lines

@@ -19,9 +19,13 @@ 
 		// Not yet finished, no CRC checks
 		$data = array();
 		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		else $hex = substr($buffer,1,-1);
+		if ($typehex == '*' || $typehex == ':') {
+			$hex = substr($buffer,1,-1);
+		} elseif ($typehex == '@' || $typehex == '%') {
+			$hex = substr($buffer,13,-13);
+		} else {
+			$hex = substr($buffer,1,-1);
+		}
 		$bin = gmp_strval( gmp_init($hex,16), 2);
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 		if (strlen($hex) == 28) {
@@ -64,8 +68,9 @@ 
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
 					$cprlat = intval(substr($bin,54,17),2)/131072.0;
 					$cprlon = intval(substr($bin,71,17),2)/131072.0;
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
-					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+					if ($oe == 0) {
+						$this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+					} elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 						$cprlat_odd = $cprlat;
 						$cprlon_odd = $cprlon;
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -73,8 +78,12 @@ 
 						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
 						$lat_even = (360.0/60)*($j%60+$cprlat_even);
 						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
-						if ($lat_even >= 270) $lat_even = $lat_even - 360;
-						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
+						if ($lat_even >= 270) {
+							$lat_even = $lat_even - 360;
+						}
+						if ($lat_odd >= 270) {
+							$lat_odd = $lat_odd - 360;
+						}
 						// check latitude zone
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 							if ($this::$latlon[$icao]['created'] > time()) {
@@ -82,7 +91,9 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
 								$lat = $lat_even;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 									$data['latitude'] = $lat;
@@ -93,14 +104,18 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
 								$lat = $lat_odd;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 									$data['latitude'] = $lat;
 									$data['longitude'] = $lon;
 								}
 							}
-						} else echo "Not cprNL";
+						} else {
+							echo "Not cprNL";
+						}
 						unset($this::$latlon[$icao]);
 					}
 				} elseif ($tc == 19) {
@@ -109,11 +124,17 @@ 
 					$v_ew = intval(substr($bin,46,10),2);
 					$v_ns_dir = intval(substr($bin,56,1));
 					$v_ns = intval(substr($bin,57,10),2);
-					if ($v_ew_dir) $v_ew = -1*$v_ew;
-					if ($v_ns_dir) $v_ns = -1*$v_ns;
+					if ($v_ew_dir) {
+						$v_ew = -1*$v_ew;
+					}
+					if ($v_ns_dir) {
+						$v_ns = -1*$v_ns;
+					}
 					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
 					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-					if ($heading <0) $heading = $heading+360;
+					if ($heading <0) {
+						$heading = $heading+360;
+					}
 					$data['speed'] = $speed;
 					$data['heading'] = $heading;
 				}
@@ -128,72 +149,194 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
-		if ($lat < 10.47047130) return 59;
-		if ($lat < 14.82817437) return 58;
-		if ($lat < 18.18626357) return 57;
-		if ($lat < 21.02939493) return 56;
-		if ($lat < 23.54504487) return 55;
-		if ($lat < 25.82924707) return 54;
-		if ($lat < 27.93898710) return 53;
-		if ($lat < 29.91135686) return 52;
-		if ($lat < 31.77209708) return 51;
-		if ($lat < 33.53993436) return 50;
-		if ($lat < 35.22899598) return 49;
-		if ($lat < 36.85025108) return 48;
-		if ($lat < 38.41241892) return 47;
-		if ($lat < 39.92256684) return 46;
-		if ($lat < 41.38651832) return 45;
-		if ($lat < 42.80914012) return 44;
-		if ($lat < 44.19454951) return 43;
-		if ($lat < 45.54626723) return 42;
-		if ($lat < 46.86733252) return 41;
-		if ($lat < 48.16039128) return 40;
-		if ($lat < 49.42776439) return 39;
-		if ($lat < 50.67150166) return 38;
-		if ($lat < 51.89342469) return 37;
-		if ($lat < 53.09516153) return 36;
-		if ($lat < 54.27817472) return 35;
-		if ($lat < 55.44378444) return 34;
-		if ($lat < 56.59318756) return 33;
-		if ($lat < 57.72747354) return 32;
-		if ($lat < 58.84763776) return 31;
-		if ($lat < 59.95459277) return 30;
-		if ($lat < 61.04917774) return 29;
-		if ($lat < 62.13216659) return 28;
-		if ($lat < 63.20427479) return 27;
-		if ($lat < 64.26616523) return 26;
-		if ($lat < 65.31845310) return 25;
-		if ($lat < 66.36171008) return 24;
-		if ($lat < 67.39646774) return 23;
-		if ($lat < 68.42322022) return 22;
-		if ($lat < 69.44242631) return 21;
-		if ($lat < 70.45451075) return 20;
-		if ($lat < 71.45986473) return 19;
-		if ($lat < 72.45884545) return 18;
-		if ($lat < 73.45177442) return 17;
-		if ($lat < 74.43893416) return 16;
-		if ($lat < 75.42056257) return 15;
-		if ($lat < 76.39684391) return 14;
-		if ($lat < 77.36789461) return 13;
-		if ($lat < 78.33374083) return 12;
-		if ($lat < 79.29428225) return 11;
-		if ($lat < 80.24923213) return 10;
-		if ($lat < 81.19801349) return 9;
-		if ($lat < 82.13956981) return 8;
-		if ($lat < 83.07199445) return 7;
-		if ($lat < 83.99173563) return 6;
-		if ($lat < 84.89166191) return 5;
-		if ($lat < 85.75541621) return 4;
-		if ($lat < 86.53536998) return 3;
-		if ($lat < 87.00000000) return 2;
+		if ($lat < 0) {
+			$lat = -$lat;
+		}
+		// Table is simmetric about the equator.
+		if ($lat < 10.47047130) {
+			return 59;
+		}
+		if ($lat < 14.82817437) {
+			return 58;
+		}
+		if ($lat < 18.18626357) {
+			return 57;
+		}
+		if ($lat < 21.02939493) {
+			return 56;
+		}
+		if ($lat < 23.54504487) {
+			return 55;
+		}
+		if ($lat < 25.82924707) {
+			return 54;
+		}
+		if ($lat < 27.93898710) {
+			return 53;
+		}
+		if ($lat < 29.91135686) {
+			return 52;
+		}
+		if ($lat < 31.77209708) {
+			return 51;
+		}
+		if ($lat < 33.53993436) {
+			return 50;
+		}
+		if ($lat < 35.22899598) {
+			return 49;
+		}
+		if ($lat < 36.85025108) {
+			return 48;
+		}
+		if ($lat < 38.41241892) {
+			return 47;
+		}
+		if ($lat < 39.92256684) {
+			return 46;
+		}
+		if ($lat < 41.38651832) {
+			return 45;
+		}
+		if ($lat < 42.80914012) {
+			return 44;
+		}
+		if ($lat < 44.19454951) {
+			return 43;
+		}
+		if ($lat < 45.54626723) {
+			return 42;
+		}
+		if ($lat < 46.86733252) {
+			return 41;
+		}
+		if ($lat < 48.16039128) {
+			return 40;
+		}
+		if ($lat < 49.42776439) {
+			return 39;
+		}
+		if ($lat < 50.67150166) {
+			return 38;
+		}
+		if ($lat < 51.89342469) {
+			return 37;
+		}
+		if ($lat < 53.09516153) {
+			return 36;
+		}
+		if ($lat < 54.27817472) {
+			return 35;
+		}
+		if ($lat < 55.44378444) {
+			return 34;
+		}
+		if ($lat < 56.59318756) {
+			return 33;
+		}
+		if ($lat < 57.72747354) {
+			return 32;
+		}
+		if ($lat < 58.84763776) {
+			return 31;
+		}
+		if ($lat < 59.95459277) {
+			return 30;
+		}
+		if ($lat < 61.04917774) {
+			return 29;
+		}
+		if ($lat < 62.13216659) {
+			return 28;
+		}
+		if ($lat < 63.20427479) {
+			return 27;
+		}
+		if ($lat < 64.26616523) {
+			return 26;
+		}
+		if ($lat < 65.31845310) {
+			return 25;
+		}
+		if ($lat < 66.36171008) {
+			return 24;
+		}
+		if ($lat < 67.39646774) {
+			return 23;
+		}
+		if ($lat < 68.42322022) {
+			return 22;
+		}
+		if ($lat < 69.44242631) {
+			return 21;
+		}
+		if ($lat < 70.45451075) {
+			return 20;
+		}
+		if ($lat < 71.45986473) {
+			return 19;
+		}
+		if ($lat < 72.45884545) {
+			return 18;
+		}
+		if ($lat < 73.45177442) {
+			return 17;
+		}
+		if ($lat < 74.43893416) {
+			return 16;
+		}
+		if ($lat < 75.42056257) {
+			return 15;
+		}
+		if ($lat < 76.39684391) {
+			return 14;
+		}
+		if ($lat < 77.36789461) {
+			return 13;
+		}
+		if ($lat < 78.33374083) {
+			return 12;
+		}
+		if ($lat < 79.29428225) {
+			return 11;
+		}
+		if ($lat < 80.24923213) {
+			return 10;
+		}
+		if ($lat < 81.19801349) {
+			return 9;
+		}
+		if ($lat < 82.13956981) {
+			return 8;
+		}
+		if ($lat < 83.07199445) {
+			return 7;
+		}
+		if ($lat < 83.99173563) {
+			return 6;
+		}
+		if ($lat < 84.89166191) {
+			return 5;
+		}
+		if ($lat < 85.75541621) {
+			return 4;
+		}
+		if ($lat < 86.53536998) {
+			return 3;
+		}
+		if ($lat < 87.00000000) {
+			return 2;
+		}
 		return 1;
 	}
 
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
-		if ($nl > 1) return $nl;
-		else return 1;
+		if ($nl > 1) {
+			return $nl;
+		} else {
+			return 1;
+		}
 	}
 
 	private function parityCheck($msg, $bin) {
@@ -216,10 +359,13 @@ 
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);
 		for ($j = 0; $j < strlen($bin); $j++) {
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+			if ($bin[$j]) {
+				$crc = $crc^intval($modes_checksum_table[$j],0);
+			}
 		}
-		if ($crc == $checksum) return true;
-		else {
+		if ($crc == $checksum) {
+			return true;
+		} else {
 			//echo "**** CRC ERROR ****\n";
 			return false;
 		}
@@ -269,22 +415,37 @@ 
 			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
 			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
 			$msg['callsign'] = '';
-			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
-			else $msg['altitude'] = '';
+			if (isset($data['altitude'])) {
+				$msg['altitude'] = $data['altitude'];
+			} else {
+				$msg['altitude'] = '';
+			}
 			$msg['speed'] = $data['speed'];
-			if (isset($data['heading'])) $msg['track'] = $data['heading'];
-			else $msg['track'] = '';
+			if (isset($data['heading'])) {
+				$msg['track'] = $data['heading'];
+			} else {
+				$msg['track'] = '';
+			}
 			$msg['latitude'] = $data['latitude'];
 			$msg['longitude'] = $data['longitude'];
-			if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
-			else $msg['verticalrate'] = '';
-			if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
-			else $msg['squawk'] = 0;
+			if (isset($data['verticalrate'])) {
+				$msg['verticalrate'] = $data['verticalrate'];
+			} else {
+				$msg['verticalrate'] = '';
+			}
+			if (isset($data['squawk'])) {
+				$msg['squawk'] = $data['squawk'];
+			} else {
+				$msg['squawk'] = 0;
+			}
 			$msg['alert'] = 0;
 			$msg['emergency'] = 0;
 			$msg['SPI'] = 0;
-			if (isset($data['ground'])) $msg['ground'] = 1;
-			else $msg['ground'] = 0;
+			if (isset($data['ground'])) {
+				$msg['ground'] = 1;
+			} else {
+				$msg['ground'] = 0;
+			}
 			$result[] = implode(',',$msg);
 		}
 		return $result;

require/class.Common.php

Braces +101 added lines, -45 removed lines

@@ -37,8 +37,11 @@ 
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -95,8 +98,9 @@ 
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		//global $cookies;
 		$cookies = array();
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 
@@ -107,7 +111,9 @@ 
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		if (isset($globalForceIPv4) && $globalForceIPv4) {
 			if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){
 				curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
@@ -119,7 +125,9 @@ 
 		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');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
-		if (curl_errno($ch) && $globalDebug) echo 'Download error: '.curl_error($ch);
+		if (curl_errno($ch) && $globalDebug) {
+			echo 'Download error: '.curl_error($ch);
+		}
 		curl_close($ch);
 		fclose($fp);
 	}
@@ -127,12 +135,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -148,11 +160,14 @@ 
 	public static function bunzip2($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.bz2', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.bz2', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('bzopen')) $file = bzopen($in_file,'rb');
-			else {
+			if (function_exists('bzopen')) {
+				$file = bzopen($in_file,'rb');
+			} else {
 				echo 'bzopen not available';
 				die;
 			}
@@ -171,10 +186,16 @@ 
 	* @return Array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -209,7 +230,9 @@ 
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -230,7 +253,9 @@ 
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -269,7 +294,9 @@ 
 		$dX = $latc - $lat;
 		$dY = $lonc - $lon;
 		$azimuth = rad2deg(atan2($dY,$dX));
-		if ($azimuth < 0) return $azimuth+360;
+		if ($azimuth < 0) {
+			return $azimuth+360;
+		}
 		return $azimuth;
 	}
 	
@@ -283,10 +310,16 @@ 
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -314,11 +347,17 @@ 
 	
 	public function convertDM($coord,$latlong) {
 		if ($latlong == 'latitude') {
-			if ($coord < 0) $NSEW = 'S';
-			else $NSEW = 'N';
+			if ($coord < 0) {
+				$NSEW = 'S';
+			} else {
+				$NSEW = 'N';
+			}
 		} else {
-			if ($coord < 0) $NSEW = 'W';
-			else $NSEW = 'E';
+			if ($coord < 0) {
+				$NSEW = 'W';
+			} else {
+				$NSEW = 'E';
+			}
 		}
 		$coord = abs($coord);
 		$deg = floor($coord);
@@ -361,7 +400,9 @@ 
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -398,8 +439,11 @@ 
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -458,7 +502,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -529,8 +575,9 @@ 
 		$error = false; 
 		if ($fp_out = gzopen($dest, $mode)) { 
 			if ($fp_in = fopen($source,'rb')) { 
-				while (!feof($fp_in)) 
-					gzwrite($fp_out, fread($fp_in, 1024 * 512)); 
+				while (!feof($fp_in)) {
+									gzwrite($fp_out, fread($fp_in, 1024 * 512));
+				}
 				fclose($fp_in); 
 			} else {
 				$error = true; 
@@ -539,14 +586,17 @@ 
 		} else {
 			$error = true; 
 		}
-		if ($error)
-			return false; 
-		else
-			return $dest; 
+		if ($error) {
+					return false;
+		} else {
+					return $dest;
+		}
 	} 
 	
 	public function remove_accents($string) {
-		if ( !preg_match('/[\x80-\xff]/', $string) ) return $string;
+		if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+		}
 		$chars = array(
 		    // Decompositions for Latin-1 Supplement
 		    chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
@@ -670,7 +720,9 @@ 
 		$ip = gethostbyname($host);
 		$s = socket_create(AF_INET, SOCK_STREAM, 0);
 		$r = @socket_connect($s, $ip, $port);
-		if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
+		if (!socket_set_nonblock($s)) {
+			echo "Unable to set nonblock on socket\n";
+		}
 		if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
 			return $s;
 		}
@@ -715,18 +767,22 @@ 
 		//NOTE: use a trailing slash for folders!!!
 		//see http://bugs.php.net/bug.php?id=27609
 		//see http://bugs.php.net/bug.php?id=30931
-		if ($path{strlen($path)-1}=='/') // recursively return a temporary file path
+		if ($path{strlen($path)-1}=='/') {
+			// recursively return a temporary file path
 			return $this->is__writable($path.uniqid(mt_rand()).'.tmp');
-		else if (is_dir($path))
-			return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		} else if (is_dir($path)) {
+					return $this->is__writable($path.'/'.uniqid(mt_rand()).'.tmp');
+		}
 		// check tmp file for read/write capabilities
 		$rm = file_exists($path);
 		$f = @fopen($path, 'a');
-		if ($f===false)
-			return false;
+		if ($f===false) {
+					return false;
+		}
 		fclose($f);
-		if (!$rm)
-			unlink($path);
+		if (!$rm) {
+					unlink($path);
+		}
 		return true;
 	}
 }

airport-detailed.php

Braces +13 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -47,7 +47,9 @@ 
 			$METAR = new METAR();
 			$metar_info = $METAR->getMETAR($airport_icao);
 			//print_r($metar_info);
-			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
+			if (isset($metar_info[0]['metar'])) {
+				$metar_parse = $METAR->parse($metar_info[0]['metar']);
+			}
             		//print_r($metar_parse);
 		}
 		
@@ -61,7 +63,9 @@ 
 		print '<option></option>';
 		$Stats = new Stats();
 		$airport_names = $Stats->getAllAirportNames();
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+		if (empty($airport_names)) {
+			$airport_names = $Spotter->getAllAirportNames();
+		}
 		ksort($airport_names);
 		foreach($airport_names as $airport_name)
 		{
@@ -95,7 +99,9 @@ 
 			print '</div>';
 			print '<div><span class="label">'._("Coordinates").'</span><a href="http://maps.google.ca/maps?z=10&t=k&q='.$airport_array[0]['latitude'].','.$airport_array[0]['longitude'].'" target="_blank">Google Map<i class="fa fa-angle-double-right"></i></a></div>';
 			print '<div><span class="label">'._("Live Air Traffic").'</span><a href="http://www.liveatc.net/search/?icao='.$airport_array[0]['icao'].'" target="_blank">LiveATC.net<i class="fa fa-angle-double-right"></i></a></div>';
-			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			if (isset($airport_array[0]['diagram_pdf']) && $airport_array[0]['diagram_pdf'] != '') {
+				print '<div><span class="label">'._("Diagram").'</span><a href="'.$airport_array[0]['diagram_pdf'].'" target="_blank">'.$airport_array[0]['icao'].'<i class="fa fa-angle-double-right"></i></a></div>';
+			}
 			print '</div>';
 			
 			$Stats = new Stats();
@@ -103,7 +109,9 @@ 
 			// Use spotter also
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (count($all_data) > 0) {
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';

getImages.php

Braces +5 added lines, -2 removed lines

@@ -105,8 +105,11 @@
     } elseif (isset($_GET['satellite'])) {
         readfile(dirname(__FILE__).'/images/satellites/'.$filename);
     } else {
-        if ($color == 'FF0000') readfile(dirname(__FILE__).'/images/aircrafts/selected/'.$filename);
-	else readfile(dirname(__FILE__).'/images/aircrafts/'.$filename);
+        if ($color == 'FF0000') {
+        	readfile(dirname(__FILE__).'/images/aircrafts/selected/'.$filename);
+        } else {
+		readfile(dirname(__FILE__).'/images/aircrafts/'.$filename);
+	}
     }
 }
 ?>
\ No newline at end of file

install/install-action.php

Braces +78 added lines, -28 removed lines

@@ -75,7 +75,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	}
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
 	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -93,7 +95,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		}
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -107,7 +111,9 @@ 
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -128,8 +136,10 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
-/*
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
+	/*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -154,7 +164,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	}
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
@@ -188,7 +200,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		}
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -209,18 +223,26 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -245,7 +267,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		}
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -265,7 +289,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -300,7 +326,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -321,12 +349,16 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			}
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -376,7 +408,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') {
+				$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			}
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 		unset($_SESSION['sources']);
@@ -387,15 +421,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -416,33 +456,43 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		}
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			}
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

install/class.update_schema.php

Braces +490 added lines, -180 removed lines

@@ -258,7 +258,9 @@ 
     		// Update table countries
     		if ($Connection->tableExists('airspace')) {
     		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+		    if ($error != '') {
+		    	return $error;
+		    }
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
         	try {
@@ -331,7 +335,9 @@ 
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@ 
 		$error = '';
     		// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
         	try {
@@ -389,13 +397,21 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/metar.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/taf.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
         	try {
@@ -469,19 +485,33 @@ 
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airline.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_pilot.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
         	try {
@@ -521,7 +551,9 @@ 
     		// Add tables
     		if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
         	try {
@@ -545,7 +577,9 @@ 
     		} catch(PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@ 
     		if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@ 
     		if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@ 
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@ 
 		$error = '';
     		// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return 'Import airport.sql : '.$error;
+		if ($error != '') {
+			return 'Import airport.sql : '.$error;
+		}
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
         	try {
@@ -699,7 +741,9 @@ 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@ 
     		// Update airline table
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return 'Import airlines.sql : '.$error;
+			if ($error != '') {
+				return 'Import airlines.sql : '.$error;
+			}
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
@@ -729,7 +775,9 @@ 
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@ 
 			} catch(PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
         	try {
@@ -782,7 +832,9 @@ 
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
         	try {
@@ -803,12 +855,16 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
 			try {
@@ -848,7 +904,9 @@ 
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
-		if ($error != '') return 'Import airlines.sql : '.$error;
+		if ($error != '') {
+			return 'Import airlines.sql : '.$error;
+		}
 		if (!$Connection->checkColumnName('airlines','forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1331,20 +1389,28 @@ 
 		}
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
 			include_once(dirname(__FILE__).'/class.update_db.php');
 			if (isset($globalVATSIM) && $globalVATSIM) {
 				$error .= update_db::update_vatsim();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
 				$error .= update_db::update_IVAO();
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 
@@ -1607,41 +1673,65 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_output')) {
 				$error .= create_db::import_file('../db/tracker_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_live')) {
 				$error .= create_db::import_file('../db/tracker_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_output')) {
 				$error .= create_db::import_file('../db/marine_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_live')) {
 				$error .= create_db::import_file('../db/marine_live.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_identity')) {
 				$error .= create_db::import_file('../db/marine_identity.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_mid')) {
 				$error .= create_db::import_file('../db/marine_mid.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
 		try {
@@ -1660,39 +1750,61 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('marine_image')) {
 				$error .= create_db::import_file('../db/marine_image.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive')) {
 				$error .= create_db::import_file('../db/marine_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive')) {
 				$error .= create_db::import_file('../db/tracker_archive.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			if (!$Connection->tableExists('marine_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
@@ -2063,7 +2175,9 @@ 
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tracker_archive_output')) {
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
 		} else {
@@ -2091,14 +2205,22 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			if (file_exists('tmp/ivae_feb2013.zip')) {
@@ -2115,7 +2237,9 @@ 
 				$error .= update_db::update_vatsim();
 			}
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE config SET value = '45' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
@@ -2133,10 +2257,14 @@ 
 		if (!$Connection->tableExists('satellite')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/satellite.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/satellite.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '46' WHERE name = 'schema_version'";
@@ -2156,37 +2284,53 @@ 
 		if (!$Connection->tableExists('stats_marine')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_marine_country')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_tracker')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		if (!$Connection->tableExists('stats_tracker_country')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker_country.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '47' WHERE name = 'schema_version'";
@@ -2206,10 +2350,14 @@ 
 		if (!$Connection->tableExists('stats_marine_type')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_marine_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_marine_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '48' WHERE name = 'schema_version'";
@@ -2229,10 +2377,14 @@ 
 		if (!$Connection->tableExists('stats_tracker_type')) {
 			if ($globalDBdriver == 'mysql') {
 				$error .= create_db::import_file('../db/stats_tracker_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_tracker_type.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		}
 		$query = "UPDATE config SET value = '49' WHERE name = 'schema_version'";
@@ -2251,10 +2403,14 @@ 
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
 			$error .= create_db::import_file('../db/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '50' WHERE name = 'schema_version'";
 		try {
@@ -2276,8 +2432,11 @@ 
 			if ($Connection->tableExists('aircraft')) {
 				if (!$Connection->tableExists('config')) {
 					$version = '1';
-					if ($update) return self::update_from_1();
-					else return $version;
+					if ($update) {
+						return self::update_from_1();
+					} else {
+						return $version;
+					}
 				} else {
 					$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
 					try {
@@ -2290,203 +2449,354 @@ 
 					if ($update) {
 						if ($result['value'] == '2') {
 							$error = self::update_from_2();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '3') {
 							$error = self::update_from_3();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '4') {
 							$error = self::update_from_4();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '5') {
 							$error = self::update_from_5();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '6') {
 							$error = self::update_from_6();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '7') {
 							$error = self::update_from_7();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '8') {
 							$error = self::update_from_8();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '9') {
 							$error = self::update_from_9();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '10') {
 							$error = self::update_from_10();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '11') {
 							$error = self::update_from_11();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '12') {
 							$error = self::update_from_12();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '13') {
 							$error = self::update_from_13();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '14') {
 							$error = self::update_from_14();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '15') {
 							$error = self::update_from_15();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '16') {
 							$error = self::update_from_16();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '17') {
 							$error = self::update_from_17();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '18') {
 							$error = self::update_from_18();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '19') {
 							$error = self::update_from_19();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '20') {
 							$error = self::update_from_20();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '21') {
 							$error = self::update_from_21();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '22') {
 							$error = self::update_from_22();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '23') {
 							$error = self::update_from_23();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '24') {
 							$error = self::update_from_24();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '25') {
 							$error = self::update_from_25();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '26') {
 							$error = self::update_from_26();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '27') {
 							$error = self::update_from_27();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '28') {
 							$error = self::update_from_28();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '29') {
 							$error = self::update_from_29();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '30') {
 							$error = self::update_from_30();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '31') {
 							$error = self::update_from_31();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '32') {
 							$error = self::update_from_32();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '33') {
 							$error = self::update_from_33();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '34') {
 							$error = self::update_from_34();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '35') {
 							$error = self::update_from_35();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '36') {
 							$error = self::update_from_36();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '37') {
 							$error = self::update_from_37();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '38') {
 							$error = self::update_from_38();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '39') {
 							$error = self::update_from_39();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '40') {
 							$error = self::update_from_40();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '41') {
 							$error = self::update_from_41();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '42') {
 							$error = self::update_from_42();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '43') {
 							$error = self::update_from_43();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '44') {
 							$error = self::update_from_44();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '45') {
 							$error = self::update_from_45();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '46') {
 							$error = self::update_from_46();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '47') {
 							$error = self::update_from_47();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '48') {
 							$error = self::update_from_48();
-							if ($error != '') return $error;
-							else return self::check_version(true);
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
 						} elseif ($result['value'] == '49') {
 							$error = self::update_from_49();
-							if ($error != '') return $error;
-							else return self::check_version(true);
-						} else return '';
+							if ($error != '') {
+								return $error;
+							} else {
+								return self::check_version(true);
+							}
+						} else {
+							return '';
+						}
 					} else {
-						if (isset($result['value']) && $result['value'] != '') return $result['value'];
-						else return 0;
+						if (isset($result['value']) && $result['value'] != '') {
+							return $result['value'];
+						} else {
+							return 0;
+						}
 					}
 				}
-			} else return $version;
+			} else {
+				return $version;
+			}
 		}
 	}
 }

install/class.update_db.php

Braces +1151 added lines, -399 removed lines

@@ -26,7 +26,9 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 200);
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
+		if ($referer != '') {
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
+		}
 		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');
 		curl_setopt($ch, CURLOPT_FILE, $fp);
 		curl_exec($ch);
@@ -37,12 +39,16 @@ 
 	public static function gunzip($in_file,$out_file_name = '') {
 		//echo $in_file.' -> '.$out_file_name."\n";
 		$buffer_size = 4096; // read 4kb at a time
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); 
+		if ($out_file_name == '') {
+			$out_file_name = str_replace('.gz', '', $in_file);
+		}
 		if ($in_file != '' && file_exists($in_file)) {
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
-			else {
+			if (function_exists('gzopen')) {
+				$file = gzopen($in_file,'rb');
+			} elseif (function_exists('gzopen64')) {
+				$file = gzopen64($in_file,'rb');
+			} else {
 				echo 'gzopen not available';
 				die;
 			}
@@ -63,8 +69,12 @@ 
 			if ($res === TRUE) {
 				$zip->extractTo($path);
 				$zip->close();
-			} else return false;
-		} else return false;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 	
 	public static function connect_sqlite($database) {
@@ -79,7 +89,9 @@ 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -90,7 +102,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
     		update_db::connect_sqlite($database_file);
 		//$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';
 		$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 @@ 
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 				//$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);
 				$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);
 				$sth_dest->execute($query_dest_values);
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack(); 
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			return "error : ".$e->getMessage();
 		}
                 return '';
@@ -121,7 +141,9 @@ 
 	public static function retrieve_route_oneworld($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -132,14 +154,18 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
 		if ($fh = fopen($database_file,"r")) {
 			$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)';
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (!feof($fh)) {
 				$line = fgetcsv($fh,9999,',');
 				if ($line[0] != '') {
@@ -148,13 +174,17 @@ 
 							$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');
 							$sth_dest->execute($query_dest_values);
 						} catch(PDOException $e) {
-							if ($globalTransaction) $Connection->db->rollBack(); 
+							if ($globalTransaction) {
+								$Connection->db->rollBack();
+							}
 							return "error : ".$e->getMessage();
 						}
 					}
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
                 return '';
 	}
@@ -162,7 +192,9 @@ 
 	public static function retrieve_route_skyteam($database_file) {
 		global $globalDebug, $globalTransaction;
 		//$query = 'TRUNCATE TABLE routes';
-		if ($globalDebug) echo " - Delete previous routes from DB -";
+		if ($globalDebug) {
+			echo " - Delete previous routes from DB -";
+		}
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
 		$Connection = new Connection();
 		try {
@@ -173,7 +205,9 @@ 
                         return "error : ".$e->getMessage();
                 }
 
-    		if ($globalDebug) echo " - Add routes to DB -";
+    		if ($globalDebug) {
+    			echo " - Add routes to DB -";
+    		}
 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 		$Spotter = new Spotter();
@@ -182,7 +216,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				while (!feof($fh)) {
 					$line = fgetcsv($fh,9999,',');
 					if ($line[0] != '') {
@@ -193,9 +229,13 @@ 
 						}
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
-				if ($globalTransaction) $Connection->db->rollBack(); 
+				if ($globalTransaction) {
+					$Connection->db->rollBack();
+				}
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -238,11 +278,16 @@ 
 		$sth_dest = $Connection->db->prepare($query_dest);
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
 		try {
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
 			//$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']);
-				if ($values['UserString4'] == 'M') $type = 'military';
-				else $type = null;
+				if ($values['UserString4'] == 'M') {
+					$type = 'military';
+				} else {
+					$type = null;
+				}
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
 				$sth_dest->execute($query_dest_values);
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
@@ -250,7 +295,9 @@ 
 				    $sth_dest_owner->execute($query_dest_owner_values);
 				}
             		}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
@@ -287,7 +334,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
             			while (!feof($fh)) {
             				$values = array();
             				$line = $Common->hex2str(fgets($fh,9999));
@@ -298,7 +347,9 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
@@ -311,7 +362,9 @@ 
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
+					if (!isset($values['ICAOTypeCode'])) {
+						$values['ICAOTypeCode'] = 'GLID';
+					}
 					// Add data to db
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
 						//$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 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -356,7 +411,9 @@ 
 			$Connection = new Connection();
 			$sth_dest = $Connection->db->prepare($query_dest);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',',"'");
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',',"'");
@@ -370,13 +427,17 @@ 
             				// Check if we can find ICAO, else set it to GLID
             				$aircraft_name_split = explode(' ',$aircraft_name);
             				$search_more = '';
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
+            				}
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
             				$sth_search = $Connection->db->prepare($query_search);
 					try {
                                     		$sth_search->execute();
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
+	            				if (isset($result['icao']) && $result['icao'] != '') {
+	            					$values['ICAOTypeCode'] = $result['icao'];
+	            				}
 					} catch(PDOException $e) {
 						return "error : ".$e->getMessage();
 					}
@@ -389,7 +450,9 @@ 
 						$sth_dest->execute($query_dest_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -428,7 +491,9 @@ 
 			$sth_dest = $Connection->db->prepare($query_dest);
 			$sth_modes = $Connection->db->prepare($query_modes);
 			try {
-				if ($globalTransaction) $Connection->db->beginTransaction();
+				if ($globalTransaction) {
+					$Connection->db->beginTransaction();
+				}
 				$tmp = fgetcsv($fh,9999,',','"');
             			while (!feof($fh)) {
             				$line = fgetcsv($fh,9999,',','"');
@@ -438,16 +503,22 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[4];
             				    $values['owner'] = $line[5];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'EI') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = $line[3];
             				    $values['owner'] = $line[2];
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+            				    if ($line[1] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
+					    }
 					    $values['cancel'] = '';
 					    $values['modes'] = $line[7];
 					    $values['icao'] = $line[8];
@@ -466,16 +537,22 @@ 
             				    $values['registration'] = $line[3];
             				    $values['base'] = null;
             				    $values['owner'] = $line[5];
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+            				    if ($line[18] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'VH') {
 					    // TODO : add modeS & reg to aircraft_modes
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[12];
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+            				    if ($line[28] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
+					    }
 
 					    $values['cancel'] = $line[39];
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
@@ -494,29 +571,41 @@ 
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[8];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'PP') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+            				    if ($line[6] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
+					    }
 					    $values['cancel'] = $line[7];
 					} elseif ($country == 'E7') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[4];
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+            				    if ($line[5] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == '8Q') {
             				    $values['registration'] = $line[0];
             				    $values['base'] = null;
             				    $values['owner'] = $line[3];
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+            				    if ($line[7] == '') {
+            				    	$values['date_first_reg'] = null;
+            				    } else {
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
+					    }
 					    $values['cancel'] = '';
 					} elseif ($country == 'ZK') {
             				    $values['registration'] = $line[0];
@@ -561,7 +650,9 @@ 
 						$sth_modes->execute($query_modes_values);
 					}
 				}
-				if ($globalTransaction) $Connection->db->commit();
+				if ($globalTransaction) {
+					$Connection->db->commit();
+				}
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
@@ -697,25 +788,45 @@ 
 		    VALUES (:name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
 		$Connection = new Connection();
 		$sth_dest = $Connection->db->prepare($query_dest);
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
   
 		$i = 0;
 		while($row = sparql_fetch_array($result))
 		{
 			if ($i >= 1) {
 			//print_r($row);
-			if (!isset($row['iata'])) $row['iata'] = '';
-			if (!isset($row['icao'])) $row['icao'] = '';
-			if (!isset($row['type'])) $row['type'] = '';
-			if (!isset($row['altitude'])) $row['altitude'] = '';
+			if (!isset($row['iata'])) {
+				$row['iata'] = '';
+			}
+			if (!isset($row['icao'])) {
+				$row['icao'] = '';
+			}
+			if (!isset($row['type'])) {
+				$row['type'] = '';
+			}
+			if (!isset($row['altitude'])) {
+				$row['altitude'] = '';
+			}
 			if (isset($row['city_bis'])) {
 				$row['city'] = $row['city_bis'];
 			}
-			if (!isset($row['city'])) $row['city'] = '';
-			if (!isset($row['country'])) $row['country'] = '';
-			if (!isset($row['homepage'])) $row['homepage'] = '';
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
-			if (!isset($row['name'])) continue;
+			if (!isset($row['city'])) {
+				$row['city'] = '';
+			}
+			if (!isset($row['country'])) {
+				$row['country'] = '';
+			}
+			if (!isset($row['homepage'])) {
+				$row['homepage'] = '';
+			}
+			if (!isset($row['wikipedia_page'])) {
+				$row['wikipedia_page'] = '';
+			}
+			if (!isset($row['name'])) {
+				continue;
+			}
 			if (!isset($row['image'])) {
 				$row['image'] = '';
 				$row['image_thumb'] = '';
@@ -771,7 +882,9 @@ 
 
 			$i++;
 		}
-		if ($globalTransaction) $Connection->db->commit();
+		if ($globalTransaction) {
+			$Connection->db->commit();
+		}
 		/*
 		echo "Delete duplicate rows...\n";
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
@@ -814,7 +927,9 @@ 
 		$delimiter = ',';
 		$out_file = $tmp_dir.'airports.csv';
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		echo "Add data from ourairports.com...\n";
 
 		$header = NULL;
@@ -824,8 +939,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = array();
 					$data = array_combine($header, $row);
 					try {
@@ -866,7 +982,9 @@ 
 		echo "Download data from another free database...\n";
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
+		if (!file_exists($out_file) || !is_readable($out_file)) {
+			return FALSE;
+		}
 		update_db::unzip($out_file);
 		$header = NULL;
 		echo "Add data from another free database...\n";
@@ -877,8 +995,9 @@ 
 			//$Connection->db->beginTransaction();
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
-				if(!$header) $header = $row;
-				else {
+				if(!$header) {
+					$header = $row;
+				} else {
 					$data = $row;
 
 					$query = 'UPDATE airport SET city = :city, country = :country WHERE icao = :icao';
@@ -1047,7 +1166,9 @@ 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1060,7 +1181,9 @@ 
 					}
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
 					if (!empty($result_search)) {
-						if ($globalDebug) echo '.';
+						if ($globalDebug) {
+							echo '.';
+						}
 							//if ($globalDBdriver == 'mysql') {
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
 							//} else {
@@ -1082,8 +1205,12 @@ 
 						}
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
 						if (!empty($result_search_mfr)) {
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
+								$data[16] = $data[23];
+							}
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
+								$data[16] = $data[15];
+							}
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
 							try {
 								$sthf = $Connection->db->prepare($queryf);
@@ -1094,7 +1221,9 @@ 
 						}
 					}
 					if (strtotime($data[29]) > time()) {
-						if ($globalDebug) echo 'i';
+						if ($globalDebug) {
+							echo 'i';
+						}
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
 						try {
 							$sth = $Connection->db->prepare($query);
@@ -1105,13 +1234,19 @@ 
 					}
 				}
 				if ($i % 90 == 0) {
-					if ($globalTransaction) $Connection->db->commit();
-					if ($globalTransaction) $Connection->db->beginTransaction();
+					if ($globalTransaction) {
+						$Connection->db->commit();
+					}
+					if ($globalTransaction) {
+						$Connection->db->beginTransaction();
+					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1131,11 +1266,15 @@ 
 		if (($handle = fopen($tmp_dir.'modes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1147,7 +1286,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1179,11 +1320,15 @@ 
 		if (($handle = fopen($tmp_dir.'airlines.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
-					if ($data[1] == 'NULL') $data[1] = $data[0];
+					if ($data[1] == 'NULL') {
+						$data[1] = $data[0];
+					}
 					$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)';
 					try {
 						$sth = $Connection->db->prepare($query);
@@ -1195,7 +1340,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		/*
 		$query = "UNLOCK TABLES";
@@ -1225,7 +1372,9 @@ 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1241,7 +1390,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1261,7 +1412,9 @@ 
 		if (($handle = fopen($tmp_dir.'routes.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1270,13 +1423,17 @@ 
 						$sth = $Connection->db->prepare($query);
 						$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'));
 					} catch(PDOException $e) {
-						if ($globalDebug) echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						if ($globalDebug) {
+							echo "error: ".$e->getMessage()." - data: ".implode(',',$data);
+						}
 					}
 				}
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1301,7 +1458,9 @@ 
 			$i = 0;
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
 			//$Connection->db->beginTransaction();
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1317,7 +1476,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1337,7 +1498,9 @@ 
 		if (($handle = fopen($tmp_dir.'satellite.tsv', 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if ($i > 0) {
@@ -1354,7 +1517,9 @@ 
 				$i++;
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1373,7 +1538,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
 			{
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
@@ -1388,7 +1555,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1464,9 +1633,14 @@ 
 				if ($i > 0 && $data[0] != '') {
 					$sources = trim($data[28].' '.$data[29].' '.$data[30].' '.$data[31].' '.$data[32].' '.$data[33]);
 					$period = str_replace(',','',$data[14]);
-					if (!empty($period) && strpos($period,'days')) $period = str_replace(' days','',$period)*24*60;
-					if ($data[18] != '') $launch_date = date('Y-m-d',strtotime($data[18]));
-					else $launch_date = NULL;
+					if (!empty($period) && strpos($period,'days')) {
+						$period = str_replace(' days','',$period)*24*60;
+					}
+					if ($data[18] != '') {
+						$launch_date = date('Y-m-d',strtotime($data[18]));
+					} else {
+						$launch_date = NULL;
+					}
 					$data = array_map(function($value) {
 						return trim($value) === '' ? null : $value;
 					}, $data);
@@ -1829,7 +2003,9 @@ 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
 			$i = 0;
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				$i++;
@@ -1857,7 +2033,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
 	}
@@ -1900,7 +2078,9 @@ 
 		$Connection = new Connection();
 		if (($handle = fopen($filename, 'r')) !== FALSE)
 		{
-			if ($globalTransaction) $Connection->db->beginTransaction();
+			if ($globalTransaction) {
+				$Connection->db->beginTransaction();
+			}
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
 			{
 				if(count($row) > 1) {
@@ -1914,7 +2094,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1934,8 +2116,9 @@ 
 	        }
 
 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
-		else {
+		if ($globalDBdriver == 'mysql') {
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
+		} else {
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
 			$query = "CREATE EXTENSION postgis";
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
@@ -1954,7 +2137,9 @@ 
 		global $tmp_dir, $globalDebug;
 		include_once('class.create_db.php');
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "NOTAM from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/notam.txt.gz.md5',$tmp_dir.'notam.txt.gz.md5');
 		$error = '';
 		if (file_exists($tmp_dir.'notam.txt.gz.md5')) {
@@ -1964,20 +2149,34 @@ 
 				update_db::download('http://data.flightairmap.com/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
 				if (file_exists($tmp_dir.'notam.txt.gz')) {
 					if (md5_file($tmp_dir.'notam.txt.gz') == $notam_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'notam.txt.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						//$error = create_db::import_file($tmp_dir.'notam.sql');
 						$NOTAM = new NOTAM();
 						$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
 						update_db::insert_notam_version($notam_md5);
-					} else $error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No new version.";
-		} else $error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'notam.txt.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
+				}
+			} elseif ($globalDebug) {
+				echo "No new version.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'notam.txt.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2032,68 +2231,114 @@ 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
 		if (extension_loaded('zip')) {
 			if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
-				if ($globalDebug) echo "Unzip...";
+				if ($globalDebug) {
+					echo "Unzip...";
+				}
 				update_db::unzip($tmp_dir.'ivae_feb2013.zip');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
-				if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
+				if ($globalDebug) {
+					echo "Copy airlines logos to airlines images directory...";
+				}
 				if (is_writable(dirname(__FILE__).'/../images/airlines')) {
-					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
-				} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
-			} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
-		} else $error = "ZIP module not loaded but required for IVAO.";
+					if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
+						$error = "Failed to copy airlines logo.";
+					}
+				} else {
+					$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
+				}
+			} else {
+				$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
+			}
+		} else {
+			$error = "ZIP module not loaded but required for IVAO.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_routes() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Routes : Download...";
+		if ($globalDebug) {
+			echo "Routes : Download...";
+		}
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_oneworld() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
+		if ($globalDebug) {
+			echo "Schedules Oneworld : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_skyteam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
+		if ($globalDebug) {
+			echo "Schedules Skyteam : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
-			if ($globalDebug) echo "Gunzip...";
+			if ($globalDebug) {
+				echo "Gunzip...";
+			}
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS() {
@@ -2110,340 +2355,590 @@ 
 			exit;
 		} elseif ($globalDebug) echo "Done\n";
 */
-		if ($globalDebug) echo "Modes : Download...";
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
+		if ($globalDebug) {
+			echo "Modes : Download...";
+		}
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
 		update_db::download('http://data.flightairmap.com/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
-			if ($globalDebug) echo "Unzip...";
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_faa() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes FAA: Download...";
+		if ($globalDebug) {
+			echo "Modes FAA: Download...";
+		}
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::modes_faa();
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_flarm() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
+		if ($globalDebug) {
+			echo "Modes Flarmnet: Download...";
+		}
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
 		if (file_exists($tmp_dir.'data.fln')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_ModeS_ogn() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Modes OGN: Download...";
+		if ($globalDebug) {
+			echo "Modes OGN: Download...";
+		}
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
 		if (file_exists($tmp_dir.'ogn.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_owner() {
 		global $tmp_dir, $globalDebug, $globalMasterSource;
 		
-		if ($globalDebug) echo "Owner France: Download...";
+		if ($globalDebug) {
+			echo "Owner France: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
 		if (file_exists($tmp_dir.'owner_f.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		
-		if ($globalDebug) echo "Owner Ireland: Download...";
+		if ($globalDebug) {
+			echo "Owner Ireland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Switzerland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Switzerland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Czech Republic: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Australia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Australia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Austria: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Austria: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Chile: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Chile: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Colombia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Colombia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Bosnia Herzegobina: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Brazil: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Brazil: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Cayman Islands: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Croatia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Croatia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Luxembourg: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Maldives: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Maldives: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner New Zealand: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner New Zealand: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Papua New Guinea: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Slovakia: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Slovakia: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
 		if (file_exists($tmp_dir.'owner_om.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Ecuador: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Ecuador: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Iceland: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Iceland: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "Owner Isle of Man: Download...";
+		}
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
 		if (file_exists($tmp_dir.'owner_m.csv')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		if ($globalMasterSource) {
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
+			if ($globalDebug) {
+				echo "ModeS Netherlands: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-			if ($globalDebug) echo "ModeS Denmark: Download...";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+			if ($globalDebug) {
+				echo "ModeS Denmark: Download...";
+			}
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				return $error;
-			} elseif ($globalDebug) echo "Done\n";
-		} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation : Download...";
+		if ($globalDebug) {
+			echo "Translation : Download...";
+		}
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
 		if (file_exists($tmp_dir.'translation.zip')) {
-			if ($globalDebug) echo "Unzip...";
+			if ($globalDebug) {
+				echo "Unzip...";
+			}
 			update_db::unzip($tmp_dir.'translation.zip');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::translation();
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_translation_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Translation from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/translation.tsv.gz.md5',$tmp_dir.'translation.tsv.gz.md5');
 		if (file_exists($tmp_dir.'translation.tsv.gz') && file_exists($tmp_dir.'translation.tsv.gz')) {
 			$translation_md5_file = explode(' ',file_get_contents($tmp_dir.'translation.tsv.gz.md5'));
 			$translation_md5 = $translation_md5_file[0];
 			if (md5_file($tmp_dir.'translation.tsv.gz') == $translation_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'translation.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::translation_fam();
-			} else $error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'translation.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_ModeS_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "ModeS from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/modes.tsv.gz.md5',$tmp_dir.'modes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'modes.tsv.gz') && file_exists($tmp_dir.'modes.tsv.gz.md5')) {
 			$modes_md5_file = explode(' ',file_get_contents($tmp_dir.'modes.tsv.gz.md5'));
 			$modes_md5 = $modes_md5_file[0];
 			if (md5_file($tmp_dir.'modes.tsv.gz') == $modes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'modes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::modes_fam();
-			} else $error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'modes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_airlines_fam() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Airlines from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airlines from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz.md5',$tmp_dir.'airlines.tsv.gz.md5');
 		if (file_exists($tmp_dir.'airlines.tsv.gz.md5')) {
 			$airlines_md5_file = explode(' ',file_get_contents($tmp_dir.'airlines.tsv.gz.md5'));
@@ -2452,26 +2947,42 @@ 
 				update_db::download('http://data.flightairmap.com/data/airlines.tsv.gz',$tmp_dir.'airlines.tsv.gz');
 				if (file_exists($tmp_dir.'airlines.tsv.gz')) {
 					if (md5_file($tmp_dir.'airlines.tsv.gz') == $airlines_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airlines.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::airlines_fam();
 						update_db::insert_airlines_version($airlines_md5);
-					} else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
-			    } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
-			} elseif ($globalDebug) echo "No update.";
-		} else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed.";
+					}
+			    } else {
+			    	$error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed.";
+			    }
+			} elseif ($globalDebug) {
+				echo "No update.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
 		} else {
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_owner_fam() {
 		global $tmp_dir, $globalDebug, $globalOwner;
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "owner from FlightAirMap website : Download...";
+		}
 		$error = '';
 		if ($globalOwner === TRUE) {
 			update_db::download('http://data.flightairmap.com/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
@@ -2484,35 +2995,57 @@ 
 			$owners_md5_file = explode(' ',file_get_contents($tmp_dir.'owners.tsv.gz.md5'));
 			$owners_md5 = $owners_md5_file[0];
 			if (md5_file($tmp_dir.'owners.tsv.gz') == $owners_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'owners.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::owner_fam();
-			} else $error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'owners.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_routes_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Routes from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
 		update_db::download('http://data.flightairmap.com/data/routes.tsv.gz.md5',$tmp_dir.'routes.tsv.gz.md5');
 		if (file_exists($tmp_dir.'routes.tsv.gz') && file_exists($tmp_dir.'routes.tsv.gz.md5')) {
 			$routes_md5_file = explode(' ',file_get_contents($tmp_dir.'routes.tsv.gz.md5'));
 			$routes_md5 = $routes_md5_file[0];
 			if (md5_file($tmp_dir.'routes.tsv.gz') == $routes_md5) {
-				if ($globalDebug) echo "Gunzip...";
+				if ($globalDebug) {
+					echo "Gunzip...";
+				}
 				update_db::gunzip($tmp_dir.'routes.tsv.gz');
-				if ($globalDebug) echo "Add to DB...";
+				if ($globalDebug) {
+					echo "Add to DB...";
+				}
 				$error = update_db::routes_fam();
-			} else $error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.'routes.tsv.gz'." md5 failed. Download failed.";
+			}
+		} else {
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	public static function update_marine_identity_fam() {
@@ -2522,21 +3055,33 @@ 
 			$marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5'));
 			$marine_identity_md5 = $marine_identity_md5_file[0];
 			if (!update_db::check_marine_identity_version($marine_identity_md5)) {
-				if ($globalDebug) echo "Marine identity from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Marine identity from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz');
 				if (file_exists($tmp_dir.'marine_identity.tsv.gz')) {
 					if (md5_file($tmp_dir.'marine_identity.tsv.gz') == $marine_identity_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'marine_identity.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::marine_identity_fam();
-					} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'marine_identity.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_marine_identity_version($marine_identity_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2550,21 +3095,33 @@ 
 			$satellite_md5_file = explode(' ',file_get_contents($tmp_dir.'satellite.tsv.gz.md5'));
 			$satellite_md5 = $satellite_md5_file[0];
 			if (!update_db::check_satellite_version($satellite_md5)) {
-				if ($globalDebug) echo "Satellite from FlightAirMap website : Download...";
+				if ($globalDebug) {
+					echo "Satellite from FlightAirMap website : Download...";
+				}
 				update_db::download('http://data.flightairmap.com/data/satellite.tsv.gz',$tmp_dir.'satellite.tsv.gz');
 				if (file_exists($tmp_dir.'satellite.tsv.gz')) {
 					if (md5_file($tmp_dir.'satellite.tsv.gz') == $satellite_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'satellite.tsv.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$error = update_db::satellite_fam();
-					} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'satellite.tsv.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'satellite.tsv.gz'." doesn't exist. Download failed.";
+				}
 				if ($error != '') {
 					return $error;
 				} else {
 					update_db::insert_satellite_version($satellite_md5);
-					if ($globalDebug) echo "Done\n";
+					if ($globalDebug) {
+						echo "Done\n";
+					}
 				}
 			}
 		}
@@ -2572,17 +3129,25 @@ 
 	}
 	public static function update_banned_fam() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/ban-eu.csv',$tmp_dir.'ban_eu.csv');
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
 			//if ($globalDebug) echo "Gunzip...";
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::banned_fam();
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2590,7 +3155,9 @@ 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
 		include_once('class.create_db.php');
 		$error = '';
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Airspace from FlightAirMap website : Download...";
+		}
 		if ($globalDBdriver == 'mysql') {
 			update_db::download('http://data.flightairmap.com/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
 		} else {
@@ -2607,9 +3174,13 @@ 
 				}
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
 					if (md5_file($tmp_dir.'airspace.sql.gz') == $airspace_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.'airspace.sql.gz');
-						if ($globalDebug) echo "Add to DB...";
+						if ($globalDebug) {
+							echo "Add to DB...";
+						}
 						$Connection = new Connection();
 						if ($Connection->tableExists('airspace')) {
 							$query = 'DROP TABLE airspace';
@@ -2622,20 +3193,30 @@ 
 						}
 						$error = create_db::import_file($tmp_dir.'airspace.sql');
 						update_db::insert_airspace_version($airspace_md5);
-					} else $error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.'airspace.sql.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.'airspace.sql.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'airspace.sql.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_geoid_fam() {
 		global $tmp_dir, $globalDebug, $globalGeoidSource;
 		$error = '';
-		if ($globalDebug) echo "Geoid from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Geoid from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz.md5',$tmp_dir.$globalGeoidSource.'.pgm.gz.md5');
 		if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz.md5')) {
 			$geoid_md5_file = explode(' ',file_get_contents($tmp_dir.$globalGeoidSource.'.pgm.gz.md5'));
@@ -2644,76 +3225,116 @@ 
 				update_db::download('http://data.flightairmap.com/data/geoid/'.$globalGeoidSource.'.pgm.gz',$tmp_dir.$globalGeoidSource.'.pgm.gz');
 				if (file_exists($tmp_dir.$globalGeoidSource.'.pgm.gz')) {
 					if (md5_file($tmp_dir.$globalGeoidSource.'.pgm.gz') == $geoid_md5) {
-						if ($globalDebug) echo "Gunzip...";
+						if ($globalDebug) {
+							echo "Gunzip...";
+						}
 						update_db::gunzip($tmp_dir.$globalGeoidSource.'.pgm.gz',dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm');
 						if (file_exists(dirname(__FILE__).'/../data/'.$globalGeoidSource.'.pgm')) {
 							update_db::insert_geoid_version($geoid_md5);
 						}
-					} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
-				} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
+					} else {
+						$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." md5 failed. Download failed.";
+					}
+				} else {
+					$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz'." doesn't exist. Download failed.";
+				}
 			}
-		} else $error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.$globalGeoidSource.'.pgm.gz.md5'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_tle() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download TLE : Download...";
+		if ($globalDebug) {
+			echo "Download TLE : Download...";
+		}
 		$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',
 		'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',
 		'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');
 		foreach ($alltle as $filename) {
-			if ($globalDebug) echo "downloading ".$filename.'...';
+			if ($globalDebug) {
+				echo "downloading ".$filename.'...';
+			}
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
 			if (file_exists($tmp_dir.$filename)) {
-				if ($globalDebug) echo "Add to DB ".$filename."...";
+				if ($globalDebug) {
+					echo "Add to DB ".$filename."...";
+				}
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			} else {
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
+			}
 			if ($error != '') {
 				echo $error."\n";
-			} elseif ($globalDebug) echo "Done\n";
+			} elseif ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
 
 	public static function update_ucsdb() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download UCS DB : Download...";
+		if ($globalDebug) {
+			echo "Download UCS DB : Download...";
+		}
 		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');
 		if (file_exists($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_ucsdb($tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt');
-		} else $error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'UCS_Satellite_Database_officialname_1-1-17.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_celestrak() {
 		global $tmp_dir, $globalDebug;
-		if ($globalDebug) echo "Download Celestrak DB : Download...";
+		if ($globalDebug) {
+			echo "Download Celestrak DB : Download...";
+		}
 		update_db::download('http://celestrak.com/pub/satcat.txt',$tmp_dir.'satcat.txt');
 		if (file_exists($tmp_dir.'satcat.txt')) {
-			if ($globalDebug) echo "Add to DB...";
+			if ($globalDebug) {
+				echo "Add to DB...";
+			}
 			$error = update_db::satellite_celestrak($tmp_dir.'satcat.txt');
-		} else $error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'satcat.txt'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			echo $error."\n";
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/models.md5sum',$tmp_dir.'models.md5sum');
 		if (file_exists($tmp_dir.'models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2732,19 +3353,29 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
-		if ($globalDebug) echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
+		if ($globalDebug) {
+			echo "glTF 2.0 Models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',$tmp_dir.'modelsgltf2.md5sum');
 		if (file_exists($tmp_dir.'modelsgltf2.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'modelsgltf2.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2763,25 +3394,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/'.$key,dirname(__FILE__).'/../models/gltf2/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/models.md5sum',dirname(__FILE__).'/../models/gltf2/models.md5sum');
-		} else $error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'modelsgltf2.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_liveries() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Liveries from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Liveries from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',$tmp_dir.'liveries.md5sum');
 		if (file_exists($tmp_dir.'liveries.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'liveries.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2800,25 +3441,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading liveries '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading liveries '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/'.$key,dirname(__FILE__).'/../models/gltf2/liveries/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/gltf2/liveries/liveries.md5sum',dirname(__FILE__).'/../models/gltf2/liveries/liveries.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_space_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Space models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2837,25 +3488,35 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading space model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
 	public static function update_vehicules_models() {
 		global $tmp_dir, $globalDebug;
 		$error = '';
-		if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download...";
+		if ($globalDebug) {
+			echo "Vehicules models from FlightAirMap website : Download...";
+		}
 		update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum');
 		if (file_exists($tmp_dir.'vehicules_models.md5sum')) {
-			if ($globalDebug) echo "Check files...\n";
+			if ($globalDebug) {
+				echo "Check files...\n";
+			}
 			$newmodelsdb = array();
 			if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) {
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
@@ -2874,15 +3535,21 @@ 
 			}
 			$diff = array_diff($newmodelsdb,$modelsdb);
 			foreach ($diff as $key => $value) {
-				if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n";
+				if ($globalDebug) {
+					echo 'Downloading vehicules model '.$key.' ...'."\n";
+				}
 				update_db::download('http://data.flightairmap.com/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key);
 				
 			}
 			update_db::download('http://data.flightairmap.com/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum');
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 
@@ -2925,7 +3592,9 @@ 
                 }
 
 		$error = '';
-		if ($globalDebug) echo "Notam : Download...";
+		if ($globalDebug) {
+			echo "Notam : Download...";
+		}
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
 		if (file_exists($tmp_dir.'notam.rss')) {
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
@@ -2940,14 +3609,30 @@ 
 				$data['fir'] = $q[0];
 				$data['code'] = $q[1];
 				$ifrvfr = $q[2];
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
+				if ($ifrvfr == 'IV') {
+					$data['rules'] = 'IFR/VFR';
+				}
+				if ($ifrvfr == 'I') {
+					$data['rules'] = 'IFR';
+				}
+				if ($ifrvfr == 'V') {
+					$data['rules'] = 'VFR';
+				}
+				if ($q[4] == 'A') {
+					$data['scope'] = 'Airport warning';
+				}
+				if ($q[4] == 'E') {
+					$data['scope'] = 'Enroute warning';
+				}
+				if ($q[4] == 'W') {
+					$data['scope'] = 'Navigation warning';
+				}
+				if ($q[4] == 'AE') {
+					$data['scope'] = 'Airport/Enroute warning';
+				}
+				if ($q[4] == 'AW') {
+					$data['scope'] = 'Airport/Navigation warning';
+				}
 				//$data['scope'] = $q[4];
 				$data['lower_limit'] = $q[5];
 				$data['upper_limit'] = $q[6];
@@ -2955,8 +3640,12 @@ 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
 				$latitude = $Common->convertDec($las,'latitude');
 				$longitude = $Common->convertDec($lns,'longitude');
-				if ($lac == 'S') $latitude = '-'.$latitude;
-				if ($lnc == 'W') $longitude = '-'.$longitude;
+				if ($lac == 'S') {
+					$latitude = '-'.$latitude;
+				}
+				if ($lnc == 'W') {
+					$longitude = '-'.$longitude;
+				}
 				$data['center_latitude'] = $latitude;
 				$data['center_longitude'] = $longitude;
 				$data['radius'] = intval($radius);
@@ -2986,10 +3675,14 @@ 
 				$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']);
 				unset($data);
 			} 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		} else {
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
+		}
 		if ($error != '') {
 			return $error;
-		} elseif ($globalDebug) echo "Done\n";
+		} elseif ($globalDebug) {
+			echo "Done\n";
+		}
 		return '';
 	}
 	
@@ -3014,7 +3707,9 @@ 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
 		$airspace_json = json_decode($airspace_lst,true);
 		foreach ($airspace_json['records'] as $airspace) {
-			if ($globalDebug) echo $airspace['name']."...\n";
+			if ($globalDebug) {
+				echo $airspace['name']."...\n";
+			}
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
 			if (file_exists($tmp_dir.$airspace['name'])) {
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
@@ -3058,8 +3753,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_update() {
@@ -3084,8 +3782,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_geoid_version($version) {
@@ -3098,8 +3799,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return true;
-                else return false;
+                if ($row['nb'] > 0) {
+                	return true;
+                } else {
+                	return false;
+                }
 	}
 
 	public static function check_marine_identity_version($version) {
@@ -3112,8 +3816,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_satellite_version($version) {
@@ -3126,8 +3833,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_airlines_version($version) {
@@ -3140,8 +3850,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function check_notam_version($version) {
@@ -3154,8 +3867,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return true;
-		else return false;
+		if ($row['nb'] > 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	public static function insert_airlines_version($version) {
@@ -3245,8 +3961,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_notam_update() {
@@ -3276,8 +3995,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_airspace_update() {
@@ -3307,8 +4029,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_geoid_update() {
@@ -3338,8 +4063,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_owner_update() {
@@ -3369,8 +4097,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_fires_update() {
@@ -3400,8 +4131,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_airlines_update() {
@@ -3431,8 +4165,11 @@ 
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
 	}
 
 	public static function insert_last_schedules_update() {
@@ -3462,8 +4199,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_tle_update() {
@@ -3493,8 +4233,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_ucsdb_update() {
@@ -3524,8 +4267,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_celestrak_update() {
@@ -3555,8 +4301,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function check_last_satellite_update() {
@@ -3574,8 +4323,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	public static function insert_last_marine_identity_update() {

require/class.SpotterImport.php

Braces +401 added lines, -143 removed lines

@@ -52,7 +52,9 @@ 
 		try {
 			$GeoidClass = new GeoidHeight();
 		} catch(Exception $e) {
-			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
+			if ($globalDebug) {
+				echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
+			}
 			$GeoidClass = FALSE;
 		}
 	}
@@ -71,7 +73,9 @@ 
 	$dbc = $this->db;
 	$this->all_flights[$id]['schedule_check'] = true;
 	if ($globalSchedulesFetch) {
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
+	if ($globalDebug) {
+		echo 'Getting schedule info...'."\n";
+	}
 	$Spotter = new Spotter($dbc);
 	$Schedule = new Schedule($dbc);
 	$Translation = new Translation($dbc);
@@ -82,7 +86,9 @@ 
 	    if ($Schedule->checkSchedule($operator) == 0) {
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
+		    if ($globalDebug) {
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
 		    // Should also check if route schedule = route from DB
@@ -91,7 +97,9 @@ 
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
 			    if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
+				if ($globalDebug) {
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
+				}
 			    }
 			}
 		    }
@@ -100,17 +108,25 @@ 
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
 			    if (trim($airport_icao) != '') {
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
+				if ($globalDebug) {
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
+				}
 			    }
 			}
 		    }
 		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
 		}
-	    } else $scheduleexist = true;
-	} else $scheduleexist = true;
+	    } else {
+	    	$scheduleexist = true;
+	    }
+	} else {
+		$scheduleexist = true;
+	}
 	// close connection, at least one way will work ?
        if ($scheduleexist) {
-		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
+		if ($globalDebug) {
+			echo "-> get arrival/departure airport info for ".$ident."\n";
+		}
     		$sch = $Schedule->getSchedule($operator);
 		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
        }
@@ -132,14 +148,18 @@ 
 
     public function checkAll() {
 	global $globalDebug, $globalNoImport;
-	if ($globalDebug) echo "Update last seen flights data...\n";
+	if ($globalDebug) {
+		echo "Update last seen flights data...\n";
+	}
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 	    foreach ($this->all_flights as $key => $flight) {
 		if (isset($this->all_flights[$key]['id'])) {
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
     		    $Spotter = new Spotter($this->db);
         	    $real_arrival = $this->arrival($key);
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) {
+        	    	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+        	    }
         	}
 	    }
 	}
@@ -147,24 +167,32 @@ 
 
     public function arrival($key) {
 	global $globalClosestMinDist, $globalDebug;
-	if ($globalDebug) echo 'Update arrival...'."\n";
+	if ($globalDebug) {
+		echo 'Update arrival...'."\n";
+	}
 	$Spotter = new Spotter($this->db);
         $airport_icao = '';
         $airport_time = '';
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
+        	$globalClosestMinDist = 50;
+        }
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
     	    if (isset($closestAirports[0])) {
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
         	    $airport_icao = $closestAirports[0]['icao'];
         	    $airport_time = $this->all_flights[$key]['datetime'];
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        	    if ($globalDebug) {
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        	    }
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
         	    foreach ($closestAirports as $airport) {
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
         		    $airport_icao = $airport['icao'];
         		    $airport_time = $this->all_flights[$key]['datetime'];
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        		    if ($globalDebug) {
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+        		    }
         		    break;
         		}
         	    }
@@ -172,14 +200,20 @@ 
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+        		if ($globalDebug) {
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
+        		}
         	}
     	    } else {
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+    		    if ($globalDebug) {
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+    		    }
     	    }
 
         } else {
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+        	if ($globalDebug) {
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
+        	}
         }
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
     }
@@ -189,7 +223,9 @@ 
     public function del() {
 	global $globalDebug, $globalNoImport, $globalNoDB;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_flights as $key => $flight) {
 	    if (isset($flight['lastupdate'])) {
 		if ($flight['lastupdate'] < (time()-1800)) {
@@ -203,13 +239,17 @@ 
 	global $globalDebug, $globalNoImport, $globalNoDB;
 	// Delete old infos
 	if (isset($this->all_flights[$key]['id'])) {
-		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+		if ($globalDebug) {
+			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
+		}
 		if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
 			$real_arrival = $this->arrival($key);
 			$Spotter = new Spotter($this->db);
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
 				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 		}
 	}
@@ -219,9 +259,13 @@ 
     public function add($line) {
 	global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass, $globalArchive;
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01';
-	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 3000;
-/*
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.01';
+	}
+	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') {
+		$globalAircraftMaxUpdate = 3000;
+	}
+	/*
 	$Spotter = new Spotter();
 	$dbc = $Spotter->db;
 	$SpotterLive = new SpotterLive($dbc);
@@ -243,19 +287,28 @@ 
 	// SBS format is CSV format
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
 	    //print_r($line);
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
+	    if (isset($line['hex'])) {
+	    	$line['hex'] = strtoupper($line['hex']);
+	    }
   	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		/*
@@ -271,23 +324,38 @@ 
 		//$this->db = $dbc;
 
 		//$hex = trim($line['hex']);
-	        if (!isset($line['id'])) $id = trim($line['hex']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['hex']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_flights[$id])) {
-		    if ($globalDebug) echo 'New flight...'."\n";
+		    if ($globalDebug) {
+		    	echo 'New flight...'."\n";
+		    }
 		    $this->all_flights[$id] = array();
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+		    }
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
-//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
+			//			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+			}
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllFlights !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		if (isset($line['source_type']) && $line['source_type'] != '') {
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
@@ -309,12 +377,20 @@ 
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			    if ($globalDebugTimeElapsed) {
+			    	echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    }
+			    if ($aircraft_icao != '') {
+			    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			    }
 			}
 		    }
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
+		    if ($globalAllFlights !== FALSE) {
+		    	$dataFound = true;
+		    }
+		    if ($globalDebug) {
+		    	echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
+		    }
 		}
 	        if (isset($line['id']) && !isset($line['hex'])) {
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
@@ -323,7 +399,9 @@ 
 			$icao = $line['aircraft_icao'];
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
-				if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
+				if (isset($Spotter->aircraft_correct_icaotype[$icao])) {
+					$icao = $Spotter->aircraft_correct_icaotype[$icao];
+				}
 				$Spotter->db = null;
 			}
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
@@ -333,15 +411,24 @@ 
 				$Spotter = new Spotter($this->db);
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
 				$Spotter->db = null;
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				if ($aircraft_icao != '') {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				}
 			}
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
-			if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			if ($line['aircraft_type'] == 'PARA_GLIDER') {
+				$aircraft_icao = 'GLID';
+			} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+				$aircraft_icao = 'UHEL';
+			} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+				$aircraft_icao = 'TOWPLANE';
+			} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+				$aircraft_icao = 'POWAIRC';
+			}
+			if (isset($aircraft_icao)) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			}
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
@@ -351,8 +438,11 @@ 
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
+				}
 				/*
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
 				print_r($this->all_flights[$id]);
@@ -361,16 +451,22 @@ 
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 
@@ -391,30 +487,48 @@ 
 
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
-				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
+				if ($globalDebug) {
+					echo '---!!!! New ident, reset aircraft data...'."\n";
+				}
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+				} elseif (isset($line['id'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+				} elseif (isset($this->all_flights[$id]['ident'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				}
 			} else {
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$timeelapsed = microtime(true);
             			$Spotter = new Spotter($this->db);
             			$fromsource = NULL;
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+            				$fromsource = $globalAirlinesSource;
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
+            				$fromsource = 'vatsim';
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
+					$fromsource = 'ivao';
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
+					$fromsource = 'vatsim';
+				} elseif (isset($globalIVAO) && $globalIVAO) {
+					$fromsource = 'ivao';
+				}
             			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 			    }
 			}
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+		    } else {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+		    }
 		    
 /*
 		    if (!isset($line['id'])) {
@@ -424,7 +538,9 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    if (!isset($this->all_flights[$id]['id'])) {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    }
 
 		    //$putinarchive = true;
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -442,7 +558,9 @@ 
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
                         }
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -456,7 +574,9 @@ 
 				$Translation->db = null;
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    if ($globalDebugTimeElapsed) {
+			    	echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    }
                     	}
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -465,9 +585,13 @@ 
 		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
 		    	    }
 			}
-			if (!isset($globalFork)) $globalFork = TRUE;
+			if (!isset($globalFork)) {
+				$globalFork = TRUE;
+			}
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
+					$this->get_Schedule($id,trim($line['ident']));
+				}
 			}
 		    }
 		}
@@ -485,9 +609,13 @@ 
 			$speed = $speed*3.6;
 			if ($speed < 1000) {
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
-	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
+	  			if ($globalDebug) {
+	  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
+	  			}
 	  		} else {
-	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
+	  			if ($globalDebug) {
+	  				echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
+	  			}
 	  		}
 		    }
 		}
@@ -496,13 +624,21 @@ 
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
 	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
+	    	    	if ($globalDebug) {
+	    	    		echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
+	    	    	}
 	    	    	return false;
 	    	    }
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
-	    	    else unset($timediff_archive);
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) {
+	    	    	$timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
+	    	    } else {
+	    	    	unset($timediff_archive);
+	    	    }
 	    	    if ($this->tmd > 5
 	    	        || (isset($line['format_source']) 
 	    	    	    && $line['format_source'] == 'airwhere' 
@@ -539,16 +675,25 @@ 
 				$this->all_flights[$id]['putinarchive'] = true;
 				$this->tmd = 0;
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				    if ($globalDebug) {
+				    	echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				    }
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
-					else $this->all_flights[$id]['over_country'] = '';
+					if (!empty($all_country)) {
+						$this->all_flights[$id]['over_country'] = $all_country['iso2'];
+					} else {
+						$this->all_flights[$id]['over_country'] = '';
+					}
 					$Spotter->db = null;
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
+					if ($globalDebug) {
+						echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
+					}
 				    }
 				}
 				$this->all_flights[$id]['time_last_archive_coord'] = time();
@@ -594,7 +739,9 @@ 
 			    */
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) {
 					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -631,7 +778,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -653,35 +802,53 @@ 
 			// Here we force archive of flight because after ground it's a new one (or should be)
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+			} elseif (isset($line['id'])) {
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			}
+		    }
+		    if ($line['ground'] != 1) {
+		    	$line['ground'] = 0;
 		    }
-		    if ($line['ground'] != 1) $line['ground'] = 0;
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
 		    //$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
+			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) {
+			    	$this->all_flights[$id]['putinarchive'] = true;
+			    }
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
 			    $highlight = '';
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
+			    }
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
+			    }
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
+			    }
 			    if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Spotter = new Spotter($this->db);
 				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
 				    $Spotter->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				}
 				//$putinarchive = true;
 				//$highlight = '';
 			    }
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    } else {
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    }
 		    //$dataFound = true;
 		}
 
@@ -694,19 +861,27 @@ 
 				}
 			}
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) {
+				$this->all_flights[$id]['putinarchive'] = true;
+			}
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
-				if ($globalDebug) echo '--- Reset because of altitude'."\n";
+				if ($globalDebug) {
+					echo '--- Reset because of altitude'."\n";
+				}
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-				elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+				} elseif (isset($line['id'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+				} elseif (isset($this->all_flights[$id]['ident'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+				}
 			}
 		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
@@ -717,22 +892,32 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_flights[$id]['putinarchive'] = true;
+		    }
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_flights[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
+  		    }
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
   		    // If not enough messages and ACARS set heading to 0
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
   		}
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
+			$dataFound = false;
+		} elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
+			$dataFound = false;
+		} elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) {
+			$dataFound = false;
+		}
 
 //		print_r($this->all_flights[$id]);
 		//gets the callsign from the last hour
@@ -749,23 +934,38 @@ 
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
+				    if ($globalDebug) {
+				    	echo "Check if aircraft is already in DB...";
+				    }
 				    $timeelapsed = microtime(true);
 				    $SpotterLive = new SpotterLive($this->db);
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'aircraftjson' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) {
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($line['id'])) {
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
+				    } else {
+				    	$recent_ident = '';
+				    }
 				    $SpotterLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-				} else $recent_ident = '';
+				    if ($globalDebug && $recent_ident == '') {
+				    	echo " Not in DB.\n";
+				    } elseif ($globalDebug && $recent_ident != '') {
+				    	echo " Already in DB.\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -773,7 +973,9 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
+				}
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
@@ -817,31 +1019,49 @@ 
 				
 				if (!$ignoreImport) {
 				    $highlight = '';
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
+				    	$highlight = 'Squawk 7500 : Hijack';
+				    }
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
+				    }
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
+				    	$highlight = 'Squawk 7700 : Emergency';
+				    }
+				    if (!isset($this->all_flights[$id]['id'])) {
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
 					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
 					    $Spotter->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
+					    if ($globalDebug && isset($result)) {
+					    	echo $result."\n";
+					    }
 					}
 				    }
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -854,13 +1074,17 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
 				    }
 				    $this->del();
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
+				} elseif ($globalDebug) {
+					echo 'Ignore data'."\n";
+				}
 				//$ignoreImport = false;
 				$this->all_flights[$id]['addedSpotter'] = 1;
 				//print_r($this->all_flights[$id]);
@@ -877,7 +1101,9 @@ 
 			*/
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
+				    }
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -886,7 +1112,9 @@ 
 					    $SpotterLive->db=null;
 					}
 				    }
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -913,11 +1141,17 @@ 
 		    //echo "{$line[8]} {$line[7]} - MODES:{$line[4]}  CALLSIGN:{$line[10]}   ALT:{$line[11]}   VEL:{$line[12]}   HDG:{$line[13]}   LAT:{$line[14]}   LON:{$line[15]}   VR:{$line[16]}   SQUAWK:{$line[17]}\n";
 		    if ($globalDebug) {
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
+				if (isset($this->all_flights[$id]['source_name'])) {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n";
+				} else {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n";
+				}
 			} else {
-				if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
-				else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
+				if (isset($this->all_flights[$id]['source_name'])) {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n";
+				} else {
+					echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n";
+				}
 			}
 		    }
 		    $ignoreImport = false;
@@ -963,22 +1197,30 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				if (!isset($this->all_flights[$id]['id'])) {
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				}
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
+					if ($globalDebug) {
+						echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
+					}
 					$SpotterLive = new SpotterLive($this->db);
 					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 					$SpotterLive->db = null;
-					if ($globalDebug) echo $result."\n";
+					if ($globalDebug) {
+						echo $result."\n";
+					}
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
 					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
 				}
 				$this->all_flights[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				//if ($line['format_source'] != 'aprs') {
@@ -986,7 +1228,9 @@ 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
 					$source = $this->all_flights[$id]['source_name'];
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_flights[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source($this->db);
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -1007,7 +1251,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -1025,7 +1271,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -1037,19 +1285,27 @@ 
 				}
 
 				$this->all_flights[$id]['lastupdate'] = time();
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
+				if ($this->all_flights[$id]['putinarchive']) {
+					$send = true;
+				}
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
 			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
-				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
+				if ($globalDebug) {
+					echo "---- Deleting Live Spotter data Not updated since 2 hour...";
+				}
 				$SpotterLive = new SpotterLive($this->db);
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
 				$SpotterLive->db = null;
 				//SpotterLive->deleteLiveSpotterData();
-				if ($globalDebug) echo " Done\n";
+				if ($globalDebug) {
+					echo " Done\n";
+				}
 				$this->last_delete_hourly = time();
 			    } else {
 				$this->del();
@@ -1061,7 +1317,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_flights[$id];
+		if ($send) {
+			return $this->all_flights[$id];
+		}
 	    }
 	}
     }