Ysurac / FlightAirMap

require/class.SpotterLive.php

Braces +122 added lines, -41 removed lines

@@ -8,7 +8,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 
@@ -30,7 +32,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -119,8 +123,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -161,9 +168,13 @@ 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
 			}
 		}
-		if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC';
+		if ($orderby_query == '') {
+			$orderby_query = ' ORDER BY date DESC';
+		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -186,7 +197,9 @@ 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 		date_default_timezone_set('UTC');
 		$filter_query = $this->getFilter($filter,true,true);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
@@ -236,8 +249,12 @@ 
 		}
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval) || $globalLiveInterval == '') $globalLiveInterval = '200';
-		if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') $globalMap3DAircraftsLimit = '300';
+		if (!isset($globalLiveInterval) || $globalLiveInterval == '') {
+			$globalLiveInterval = '200';
+		}
+		if (!isset($globalMap3DAircraftsLimit) || $globalMap3DAircraftsLimit == '') {
+			$globalMap3DAircraftsLimit = '300';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				/*
@@ -248,22 +265,32 @@ 
 				*/
 				$query  = 'SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source 
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id ";
-				if ($usecoord) $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 				FROM spotter_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date";
-				if ($usecoord) $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS spotter 
 				WHERE latitude <> '0' AND longitude <> '0' 
 				ORDER BY flightaware_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				}
 			} else {
 				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 				FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date ";
-				if ($usecoord) $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 				ORDER BY spotter_live.flightaware_id, spotter_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				}
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
@@ -275,21 +302,31 @@ 
                                */
 				$query  = "SELECT * FROM (SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source 
 				FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id ";
-				if ($usecoord) $query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND spotter_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 				FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date";
-				if ($usecoord) $query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS spotter WHERE latitude <> '0' AND longitude <> '0' ";
 				$query .= "ORDER BY flightaware_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				}
 			} else {
 				$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 				FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date ";
-				if ($usecoord) $query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 				ORDER BY spotter_live.flightaware_id, spotter_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DAircraftsLimit;
+				}
 			}
 		}
 		try {
@@ -314,7 +351,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query;
 			$query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
@@ -344,7 +383,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -352,7 +393,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query;
 		} else {
@@ -373,7 +416,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter,true,true);
 
 		if (is_array($coord)) {
@@ -381,7 +426,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
@@ -608,11 +655,15 @@ 
 		//$query  = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -707,7 +758,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -1014,7 +1067,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -1022,7 +1077,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($waypoints != '')
 		{
@@ -1038,14 +1095,18 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		if ($altitude_real != '')
 		{
 			if (!is_numeric($altitude_real))
 			{
 				return false;
 			}
-		} else $altitude_real = 0;
+		} else {
+			$altitude_real = 0;
+		}
 
 		if ($heading != '')
 		{
@@ -1053,7 +1114,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -1061,9 +1124,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -1108,14 +1175,24 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+            	if ($squawk == '' || $Common->isInteger($squawk) === false ) {
+            		$squawk = NULL;
+            	}
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) {
+            		$verticalrate = NULL;
+            	}
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
 		
 		$query = '';
 		if ($globalArchive) {
-			if ($globalDebug) echo '-- Delete previous data -- ';
+			if ($globalDebug) {
+				echo '-- Delete previous data -- ';
+			}
 			$query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;';
 		}
 
@@ -1132,10 +1209,14 @@ 
 			return "error : ".$e->getMessage();
 		}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
+		    if ($globalDebug) {
+		    	echo '(Add to SBS archive : ';
+		    }
 		    $SpotterArchive = new SpotterArchive($this->db);
 		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+		    if ($globalDebug) {
+		    	echo $result.')';
+		    }
 		} elseif ($globalDebug && $putinarchive !== true) {
 			echo '(Not adding to archive)';
 		} elseif ($globalDebug && $noarchive === true) {

require/class.MarineLive.php

Braces +113 added lines, -38 removed lines

@@ -8,7 +8,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 
@@ -30,7 +32,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -77,8 +81,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -119,9 +126,13 @@ 
 				$orderby_query = ' '.$search_orderby_array[$sort]['sql'];
 			}
 		}
-		if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC';
+		if ($orderby_query == '') {
+			$orderby_query= ' ORDER BY date DESC';
+		}
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate";
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query;
@@ -146,7 +157,9 @@ 
 
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0";
@@ -187,48 +200,72 @@ 
 		}
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
+		if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') {
+			$globalMap3DMarinesLimit = '300';
+		}
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = 'SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id,marine_archive.type, marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date) l ON l.flightaware_id = marine_archive.flightaware_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine 
 				    WHERE latitude <> '0' AND longitude <> '0' 
 				    ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
 				$query  = "SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.type,marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source 
 				    FROM marine_archive INNER JOIN (SELECT flightaware_id FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date) l ON l.flightaware_id = marine_archive.flightaware_id ";
-				if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "UNION
 				    SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date";
-				if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				if ($usecoord) {
+					$query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong;
+				}
 				$query .= ") AS marine WHERE latitude <> '0' AND longitude <> '0' ";
 				$query .= "ORDER BY fammarine_id, date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			} else {
 				$query  = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 				    FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date ";
-				if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				if ($usecoord) {
+					$query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
+				}
 				$query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' 
 				ORDER BY marine_live.fammarine_id, marine_live.date";
-				if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit;
+				if ($limit) {
+					$query .= " LIMIT ".$globalMap3DMarinesLimit;
+				}
 			}
 		}
 		try {
@@ -253,7 +290,9 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		$filter_query = $this->getFilter($filter,true,true);
 
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
 		} else {
@@ -281,7 +320,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -289,7 +330,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query;
 		} else {
@@ -309,7 +352,9 @@ 
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+		if (!isset($globalLiveInterval)) {
+			$globalLiveInterval = '200';
+		}
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
@@ -317,7 +362,9 @@ 
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		} else return array();
+		} else {
+			return array();
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source 
 			FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong."
@@ -485,11 +532,15 @@ 
 		//$query  = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date';
 		if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			if ($liveinterval) {
+				$query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date';
+			}
 			$query .= ' ORDER BY date';
 		} else {
 			$query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id';
-			if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			if ($liveinterval) {
+				$query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date";
+			}
 			$query .= ' ORDER BY date';
 		}
 
@@ -584,7 +635,9 @@ 
 				$i++;
 				$j++;
 				if ($j == 30) {
-					if ($globalDebug) echo ".";
+					if ($globalDebug) {
+						echo ".";
+					}
 				    	try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
@@ -864,7 +917,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 		if ($longitude != '')
 		{
@@ -872,7 +927,9 @@ 
 			{
 				return false;
 			}
-		} else return '';
+		} else {
+			return '';
+		}
 
 
 		if ($heading != '')
@@ -881,7 +938,9 @@ 
 			{
 				return false;
 			}
-		} else $heading = 0;
+		} else {
+			$heading = 0;
+		}
 
 		if ($groundspeed != '')
 		{
@@ -889,9 +948,13 @@ 
 			{
 				return false;
 			}
-		} else $groundspeed = 0;
+		} else {
+			$groundspeed = 0;
+		}
 		date_default_timezone_set('UTC');
-		if ($date == '') $date = date("Y-m-d H:i:s", time());
+		if ($date == '') {
+			$date = date("Y-m-d H:i:s", time());
+		}
 
         
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -912,12 +975,20 @@ 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
 		
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) {
+            		$groundspeed = 0;
+            	}
+            	if ($heading == '' || $Common->isInteger($heading) === false ) {
+            		$heading = 0;
+            	}
+            	if ($arrival_date == '') {
+            		$arrival_date = NULL;
+            	}
             	$query = '';
 		if ($globalArchive) {
-			if ($globalDebug) echo '-- Delete previous data -- ';
+			if ($globalDebug) {
+				echo '-- Delete previous data -- ';
+			}
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';
 		}
 		$query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) 
@@ -932,10 +1003,14 @@ 
 		}
 		
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-			if ($globalDebug) echo '(Add to Marine archive : ';
+			if ($globalDebug) {
+				echo '(Add to Marine archive : ';
+			}
 			$MarineArchive = new MarineArchive($this->db);
 			$result =  $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country);
-			if ($globalDebug) echo $result.')';
+			if ($globalDebug) {
+				echo $result.')';
+			}
 		}
 		return "success";
 	}

scripts/update_db.php

Braces +30 added lines, -11 removed lines

@@ -9,7 +9,9 @@ 
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) {
+		if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
+	}
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();
@@ -29,14 +31,18 @@ 
 			$update_db->update_notam();
 		}
 		$update_db->insert_last_notam_update();
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
+		echo "NOTAM are only updated once a day.\n";
+	}
 	if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 		$update_db->update_all();
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
 	//	$Spotter = new Spotter();
 	//	$Spotter->updateFieldsFromOtherTables();
 		$update_db->insert_last_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
+	}
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
 		echo "Check if new airspace version exist...";
 		echo $update_db->update_airspace_fam();
@@ -45,8 +51,11 @@ 
 	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) {
 		echo "Check if new geoid version exist...";
 		$error = $update_db->update_geoid_fam();
-		if ($error == '') $update_db->insert_last_geoid_update();
-		else echo $error;
+		if ($error == '') {
+			$update_db->insert_last_geoid_update();
+		} else {
+			echo $error;
+		}
 	}
 	if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) {
 		echo "Check if new marine identity version exist...";
@@ -64,7 +73,9 @@ 
 			//echo "Done";
 		}
 		$update_db->insert_last_owner_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+		echo "Owner are only updated every 15 days.\n";
+	}
 
 	if ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 		echo "Updating airlines...\n";
@@ -72,7 +83,9 @@ 
 			echo $update_db->update_airlines_fam();
 		}
 		$update_db->insert_last_airlines_update();
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n";
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+		echo "Airlines are only updated every 15 days.\n";
+	}
 
 	if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 		require_once(dirname(__FILE__).'/../require/class.Accident.php');
@@ -81,7 +94,9 @@ 
 		if ($Accident->check_last_accidents_update()) {
 			$Accident->download_update();
 			$Accident->insert_last_accidents_update();
-		} else echo "Accidents are updated once a day.\n";
+		} else {
+			echo "Accidents are updated once a day.\n";
+		}
 	}
   
 }
@@ -94,15 +109,19 @@ 
 	if ($METAR->check_last_update()) {
 		$METAR->addMETARCycle();
 		$METAR->insert_last_update();
-	} else echo "METAR are only updated every 30 minutes.\n";
-}
+	} else {
+		echo "METAR are only updated every 30 minutes.\n";
+	}
+	}
 
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
 	echo "Updating schedules...";
 	//$update_db->update_oneworld();
 	$update_db->update_skyteam();
 	$update_db->insert_last_schedules_update();
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
+	echo "Schedules are only updated every 15 days.\n";
+}
 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
 	echo "Updating statistics and archive old data...";

index.php

Braces +437 added lines, -110 removed lines

@@ -162,11 +162,26 @@ 
 				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li>
 				<li><?php echo _("NOTAM scope:"); ?>
 					<select class="selectpicker" onchange="notamscope(this);">
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
+	print ' selected';
+}
+?>>All</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
+	print ' selected';
+}
+?>>Airport/Enroute warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
+	print ' selected';
+}
+?>>Airport warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
+	print ' selected';
+}
+?>>Navigation warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
+	print ' selected';
+}
+?>>Enroute warning</option>
 					</select
 				</li>
 			</ul>
@@ -194,7 +209,12 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) {
+	print $_POST['start_date'];
+} elseif (isset($_COOKIE['archive_begin'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_begin']);
+}
+?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -203,7 +223,12 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) {
+	print $_POST['end_date'];
+} elseif (isset($_COOKIE['archive_end'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_end']);
+}
+?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -228,8 +253,20 @@ 
 			</script>
 		    <li><?php echo _("Playback speed:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
+	print $_POST['archivespeed'];
+} elseif (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 		    <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li>
@@ -251,15 +288,27 @@ 
 		    <li><?php echo _("Type of Map:"); ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
-				else $MapType = $_COOKIE['MapType'];
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
+					$MapType = $globalMapProvider;
+				} else {
+					$MapType = $_COOKIE['MapType'];
+				}
 			    ?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				}
 			    ?>
@@ -269,56 +318,131 @@ 
 			    <?php
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-					else $MapBoxId = $_COOKIE['MapTypeId'];
+					if (!isset($_COOKIE['MapTypeId'])) {
+						$MapBoxId = 'default';
+					} else {
+						$MapBoxId = $_COOKIE['MapTypeId'];
+					}
 			    ?>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
@@ -326,10 +450,22 @@ 
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
+	print ' selected';
+}
+?>>stk terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
+	print ' selected';
+}
+?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
+	print ' selected';
+}
+?>>vr terrain</option>
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') {
+	print ' selected';
+}
+?>>ArticDEM</option>
 			</select>
 		    </li>
 <?php
@@ -341,28 +477,61 @@ 
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
 	}
 	if (isset($globalSatellite) && $globalSatellite === TRUE) {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Satellites animate between updates"); ?></label></div></li>
 <?php
 	}
     }
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display ground station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display weather station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display lightning on map"); ?></label></div></li>
 <?php
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
@@ -375,17 +544,25 @@ 
 			if (function_exists('array_column')) {
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 			} elseif (isset($globalSources)) {
 			    $dispolar = false;
 			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
+			        	$dispolar = true;
+			        }
 			    }
 			    if ($dispolar) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 		        }
@@ -398,12 +575,22 @@ 
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 				}
@@ -415,7 +602,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Marine icon color:"); ?>
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -426,7 +620,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Tracker icon color:"); ?>
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -437,8 +638,22 @@ 
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 		    <?php
@@ -450,9 +665,19 @@ 
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Aircraft color"); ?></li>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -460,9 +685,19 @@ 
 <?php
 	if (isset($globalMarine) && $globalMarine === TRUE) {
 ?>
-		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?></li>
+		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Marine color"); ?></li>
 		    <li><?php echo _("Marine icon color:"); ?>
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -470,9 +705,19 @@ 
 <?php
 	if (isset($globalTracker) && $globalTracker === TRUE) {
 ?>
-		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?></li>
+		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Tracker color"); ?></li>
 		    <li><?php echo _("Tracker icon color:"); ?>
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -480,22 +725,46 @@ 
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 
@@ -513,9 +782,18 @@ 
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -523,10 +801,16 @@ 
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
 		    <?php
 			}
@@ -543,7 +827,9 @@ 
 				}
 				foreach($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -561,7 +847,10 @@ 
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
 			    <?php
 				foreach($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
@@ -621,10 +910,22 @@ 
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -632,7 +933,10 @@ 
 		    ?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
+	print $_COOKIE['filter_ident'];
+}
+?>" />
 		    </li>
 		    <?php
 			}
@@ -651,7 +955,10 @@ 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
 	    <form>
 		<ul>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) {
+	print 'checked';
+}
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
 		    <li><?php echo _("Type:"); ?>
 			<select class="selectpicker" multiple onchange="sattypes(this);">
 			    <?php
@@ -659,25 +966,45 @@ 
 				$types = $Satellite->get_tle_types();
 				foreach ($types as $type) {
 					$type_name = $type['tle_type'];
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
+					if ($type_name == 'musson') {
+						$type_name = 'Russian LEO Navigation';
+					} else if ($type_name == 'nnss') {
+						$type_name = 'Navi Navigation Satellite System';
+					} else if ($type_name == 'sbas') {
+						$type_name = 'Satellite-Based Augmentation System';
+					} else if ($type_name == 'glo-ops') {
+						$type_name = 'Glonass Operational';
+					} else if ($type_name == 'gps-ops') {
+						$type_name = 'GPS Operational';
+					} else if ($type_name == 'argos') {
+						$type_name = 'ARGOS Data Collection System';
+					} else if ($type_name == 'tdrss') {
+						$type_name = 'Tracking and Data Relay Satellite System';
+					} else if ($type_name == 'sarsat') {
+						$type_name = 'Search & Rescue';
+					} else if ($type_name == 'dmc') {
+						$type_name = 'Disaster Monitoring';
+					} else if ($type_name == 'resource') {
+						$type_name = 'Earth Resources';
+					} else if ($type_name == 'stations') {
+						$type_name = 'Space Stations';
+					} else if ($type_name == 'geo') {
+						$type_name = 'Geostationary';
+					} else if ($type_name == 'amateur') {
+						$type_name = 'Amateur Radio';
+					} else if ($type_name == 'x-comm') {
+						$type_name = 'Experimental';
+					} else if ($type_name == 'other-comm') {
+						$type_name = 'Other Comm';
+					} else if ($type_name == 'science') {
+						$type_name = 'Space & Earth Science';
+					} else if ($type_name == 'military') {
+						$type_name = 'Miscellaneous Military';
+					} else if ($type_name == 'radar') {
+						$type_name = 'Radar Calibration';
+					} else if ($type_name == 'tle-new') {
+						$type_name = 'Last 30 days launches';
+					}
 					
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';

sitemap.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 		$aircraft_types = $Stats->getAllAircraftTypes();
-		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
+		if (empty($aircraft_types)) {
+			$aircraft_types = $Spotter->getAllAircraftTypes();
+		}
 		foreach($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
@@ -80,7 +82,9 @@ 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airport_names = $Stats->getAllAirportNames();
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
+		if (empty($airport_names)) {
+			$airport_names = $Spotter->getAllAirportNames();
+		}
 		foreach($airport_names as $airport_item)
 		{
 			$output .= '<url>';
@@ -97,7 +101,9 @@ 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$manufacturer_names = $Stats->getAllManufacturers();
-		if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
+		if (empty($manufacturer_names)) {
+			$manufacturer_names = $Spotter->getAllManufacturers();
+		}
 		foreach($manufacturer_names as $manufacturer_item)
 		{
 			$output .= '<url>';

install/class.update_db.php

Braces +1116 added lines, -387 removed lines

@@ -26,7 +26,9 @@ 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
 		curl_setopt($ch, CURLOPT_TIMEOUT, 20);
-		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);
@@ -1827,7 +2001,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++;
@@ -1855,7 +2031,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1878,7 +2056,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) {
@@ -1892,7 +2072,9 @@ 
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		}
 		return '';
         }
@@ -1912,8 +2094,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']);
@@ -1932,7 +2115,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')) {
@@ -1942,20 +2127,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 '';
 	}
 
@@ -2010,68 +2209,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() {
@@ -2088,340 +2333,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'));
@@ -2430,26 +2925,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');
@@ -2462,35 +2973,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() {
@@ -2500,21 +3033,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";
+					}
 				}
 			}
 		}
@@ -2528,21 +3073,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";
+					}
 				}
 			}
 		}
@@ -2550,17 +3107,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 '';
 	}
 
@@ -2568,7 +3133,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 {
@@ -2585,9 +3152,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';
@@ -2600,20 +3171,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'));
@@ -2622,76 +3203,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) {
@@ -2710,25 +3331,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/'.$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";
+		} 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) {
@@ -2747,25 +3378,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) {
@@ -2784,15 +3425,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 '';
 	}
 
@@ -2835,7 +3482,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);
@@ -2850,14 +3499,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];
@@ -2865,8 +3530,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);
@@ -2896,10 +3565,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 '';
 	}
 	
@@ -2924,7 +3597,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'])));
@@ -2968,8 +3643,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() {
@@ -2994,8 +3672,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) {
@@ -3008,8 +3689,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) {
@@ -3022,8 +3706,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) {
@@ -3036,8 +3723,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) {
@@ -3050,8 +3740,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) {
@@ -3064,8 +3757,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) {
@@ -3155,8 +3851,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() {
@@ -3186,8 +3885,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() {
@@ -3217,8 +3919,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() {
@@ -3248,8 +3953,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() {
@@ -3279,8 +3987,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() {
@@ -3310,8 +4021,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() {
@@ -3341,8 +4055,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() {
@@ -3372,8 +4089,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() {
@@ -3403,8 +4123,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() {
@@ -3434,8 +4157,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() {
@@ -3453,8 +4179,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.Stats.php

Braces +625 added lines, -219 removed lines

@@ -13,10 +13,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.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	public function addLastStatsUpdate($type,$stats_date) {
@@ -84,7 +88,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);
@@ -104,7 +110,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);
@@ -116,7 +124,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);
@@ -128,7 +138,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);
@@ -141,7 +153,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);
@@ -154,7 +168,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);
@@ -169,7 +185,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)));
@@ -178,8 +196,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 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 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 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 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));
@@ -187,11 +208,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 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 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 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 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));
@@ -199,7 +225,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) {
@@ -218,10 +246,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));
@@ -229,7 +262,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();
@@ -244,7 +279,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)));
@@ -253,8 +290,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));
@@ -262,11 +302,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));
@@ -274,7 +319,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) {
@@ -294,7 +341,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)));
@@ -303,8 +352,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));
@@ -312,11 +364,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));
@@ -324,7 +381,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) {
@@ -343,7 +402,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)));
@@ -351,12 +412,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 {
@@ -384,17 +451,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 {
@@ -404,7 +483,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();
@@ -419,7 +500,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)));
@@ -428,8 +511,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 aircraft_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 aircraft_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 aircraft_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 aircraft_registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -437,11 +523,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 aircraft_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 aircraft_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 aircraft_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 aircraft_registration_count DESC";
+				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -449,7 +540,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) {
@@ -468,7 +561,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)));
@@ -477,8 +572,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));
@@ -486,11 +584,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));
@@ -498,7 +601,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) {
@@ -517,7 +622,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);
@@ -527,8 +634,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));
@@ -537,11 +647,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));
@@ -550,7 +665,9 @@ 
 					}
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 					return $all;
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		} else {
 			/*
@@ -564,10 +681,15 @@ 
 	}
 	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));
@@ -575,7 +697,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 != '') {
@@ -590,7 +714,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)));
@@ -599,8 +725,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));
@@ -608,11 +737,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));
@@ -620,7 +754,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) {
@@ -639,7 +775,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)));
@@ -648,8 +786,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_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_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_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_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));
@@ -657,11 +798,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_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_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_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_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));
@@ -669,7 +815,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) {
@@ -694,7 +842,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) {
@@ -706,7 +856,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)));
@@ -715,8 +867,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_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_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_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_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));
@@ -724,11 +879,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_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_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_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_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));
@@ -736,7 +896,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) {
@@ -761,7 +923,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) {
@@ -773,7 +937,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)));
@@ -782,20 +948,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);
 		}
@@ -823,7 +1001,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)));
@@ -860,7 +1040,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)));
@@ -905,7 +1087,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)));
@@ -942,7 +1126,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 {
@@ -964,7 +1150,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)));
@@ -1049,7 +1237,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);
@@ -1070,7 +1260,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)));
@@ -1078,12 +1270,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') {
@@ -1093,7 +1291,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);
@@ -1117,8 +1317,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) {
@@ -1137,8 +1341,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();
@@ -1154,8 +1362,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) {
@@ -1174,7 +1386,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)));
@@ -1192,7 +1406,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";
@@ -1204,7 +1420,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) {
@@ -1223,7 +1441,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 {
@@ -1234,7 +1454,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);
@@ -1249,7 +1471,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)));
@@ -1304,7 +1528,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";
@@ -1333,7 +1559,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)));
@@ -1357,7 +1585,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 {
@@ -1370,7 +1600,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 {
@@ -1381,7 +1613,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);
@@ -1437,7 +1671,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)));
@@ -1470,7 +1706,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)));
@@ -1501,7 +1739,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 {
@@ -1518,7 +1758,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 {
@@ -1535,7 +1777,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);
@@ -1544,12 +1788,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 {
@@ -1566,7 +1815,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);
@@ -1575,13 +1826,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 {
@@ -1597,7 +1853,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 {
@@ -1983,10 +2241,14 @@ 
 		$Connection = new Connection($this->db);
 		date_default_timezone_set('UTC');
 		$last_update = $this->getLastStatsUpdate('last_update_stats');
-			if ($globalDebug) echo 'Update stats !'."\n";
+			if ($globalDebug) {
+				echo 'Update 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) {
@@ -1995,43 +2257,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'];
@@ -2041,7 +2323,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) {
@@ -2051,11 +2335,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'];
@@ -2065,7 +2355,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) {
@@ -2076,7 +2368,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);
@@ -2087,7 +2381,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();
@@ -2103,48 +2399,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();
@@ -2262,7 +2578,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);
@@ -2271,37 +2589,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'];
@@ -2322,11 +2656,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'];
@@ -2345,37 +2685,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) {
@@ -2398,7 +2754,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) {
@@ -2422,13 +2780,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();
@@ -2441,14 +2805,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'];
@@ -2456,7 +2824,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);
 					}
@@ -2473,39 +2843,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();
@@ -2517,7 +2903,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) {
@@ -2527,7 +2915,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();
@@ -2539,7 +2929,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) {
@@ -2549,35 +2941,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.Source.php

Braces +15 added lines, -5 removed lines

@@ -7,7 +7,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	public function getAllLocationInfo() {
@@ -72,7 +74,9 @@ 
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
 		}
 		$query .= " ORDER BY last_seen DESC";
-		if ($limit) $query .= " LIMIT 200";
+		if ($limit) {
+			$query .= " LIMIT 200";
+		}
 		$query_values = array(':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
@@ -111,7 +115,9 @@ 
 	}
 
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -123,7 +129,9 @@ 
 	}
 
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {
@@ -146,7 +154,9 @@ 
 	}
 
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
+		if ($last_seen == '') {
+			$last_seen = date('Y-m-d H:i:s');
+		}
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
 		try {

require/class.SpotterArchive.php

Braces +40 added lines, -14 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
 	/**
@@ -27,7 +29,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -112,8 +116,11 @@ 
 			}
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -127,10 +134,17 @@ 
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
+		if ($airline_type === NULL) {
+			$airline_type ='';
+		}
 	
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -626,7 +640,9 @@ 
 		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -842,7 +858,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($date_array[1] != "")
 		{                
 			$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -1108,9 +1126,13 @@ 
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1154,9 +1176,13 @@ 
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);