Ysurac / FlightAirMap

require/class.Tracker.php

Braces +160 added lines, -57 removed lines

@@ -10,7 +10,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Tracker)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Tracker)');
+		}
 	}
 
 	/**
@@ -32,7 +34,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) {
@@ -71,8 +75,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
 			}
 		}
-		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);
 		}
@@ -126,26 +133,43 @@ 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
 			} elseif (isset($row['spotter_archive_output_id'])) {
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
-			*/} 
-			elseif (isset($row['trackerid'])) {
+			*/} elseif (isset($row['trackerid'])) {
 				$temp_array['trackerid'] = $row['trackerid'];
 			} else {
 				$temp_array['trackerid'] = '';
 			}
-			if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid'];
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
-			if (isset($row['comment'])) $temp_array['comment'] = $row['comment'];
+			if (isset($row['famtrackid'])) {
+				$temp_array['famtrackid'] = $row['famtrackid'];
+			}
+			if (isset($row['type'])) {
+				$temp_array['type'] = $row['type'];
+			}
+			if (isset($row['comment'])) {
+				$temp_array['comment'] = $row['comment'];
+			}
 			$temp_array['ident'] = $row['ident'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
+			if (isset($row['format_source'])) {
+				$temp_array['format_source'] = $row['format_source'];
+			}
+			if (isset($row['altitude'])) {
+				$temp_array['altitude'] = $row['altitude'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 			
 			if (isset($row['date'])) {
 				$dateArray = $this->parseDateString($row['date']);
@@ -188,13 +212,21 @@ 
 			}
 			
 			$fromsource = NULL;
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			$temp_array['query_number_rows'] = $num_rows;
 			$spotter_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$spotter_array[0]['query_number_rows'] = $num_rows;
 		return $spotter_array;
 	}	
@@ -225,8 +257,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		
 		if ($sort != "")
 		{
@@ -254,7 +290,9 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
 		$query  = $global_query." WHERE ".$additional_query." ";
@@ -397,8 +435,11 @@ 
 		$query .= " ORDER BY tracker_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -453,7 +494,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
@@ -609,7 +652,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		
 		if ($heading != "")
 		{
@@ -648,8 +693,12 @@ 
             		$latitude = 0;
             		$longitude = 0;
             	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+                if ($heading == '' || $Common->isInteger($heading) === false) {
+                	$heading = 0;
+                }
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
+                	$groundspeed = 0;
+                }
                 $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
@@ -758,7 +807,9 @@ 
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
 		$Connection= new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return array();
+		if (!$Connection->tableExists('countries')) {
+			return array();
+		}
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
@@ -801,7 +852,9 @@ 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country ";
 		}
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -834,12 +887,18 @@ 
 		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
-			else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'";
-			else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND tracker_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -870,7 +929,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -905,7 +966,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -955,7 +1018,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1001,7 +1066,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1049,7 +1116,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -1098,7 +1167,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
@@ -1147,7 +1218,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -1216,7 +1289,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1264,7 +1339,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1329,8 +1406,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1367,8 +1447,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1390,7 +1473,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1494,7 +1579,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -1583,7 +1670,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			/*
@@ -1603,9 +1692,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1623,7 +1716,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -1635,9 +1730,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1698,7 +1797,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$tracker_array = array();
@@ -1725,7 +1826,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
         
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		

require/class.Image.php

Braces +220 added lines, -81 removed lines

@@ -9,7 +9,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Image)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Image)');
+		}
 	}
 
 	/**
@@ -24,7 +26,9 @@ 
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
 		$reg = $registration;
-		if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao;
+		if ($reg == '' && $aircraft_icao != '') {
+			$reg = $aircraft_icao.$airline_icao;
+		}
 		$reg = trim($reg);
 		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration 
 			FROM spotter_image 
@@ -32,9 +36,13 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $reg));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (!empty($result)) return $result;
-		elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
-		else return array();
+		if (!empty($result)) {
+			return $result;
+		} elseif ($registration != '') {
+			return $this->getSpotterImage('',$aircraft_icao,$airline_icao);
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -77,8 +85,11 @@ 
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if (isset($exif['COMPUTED']['copyright'])) {
+			$copyright = $exif['COMPUTED']['copyright'];
+		} elseif (isset($exif['copyright'])) {
+			$copyright = $exif['copyright'];
+		}
 		if ($copyright != '') {
 			$copyright = str_replace('Copyright ','',$copyright);
 			$copyright = str_replace('© ','',$copyright);
@@ -96,17 +107,27 @@ 
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
-		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
+		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
+			return '';
+		}
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		if ($globalDebug && $registration != '') {
+			echo 'Try to find an aircraft image for '.$registration.'...';
+		} elseif ($globalDebug && $aircraft_icao != '') {
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
+		} elseif ($globalDebug && $airline_icao != '') {
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		}
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -115,7 +136,9 @@ 
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -128,7 +151,9 @@ 
 	public function addMarineImage($mmsi,$imo = '',$name = '')
 	{
 		global $globalDebug,$globalMarineImageFetch;
-		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return '';
+		if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) {
+			return '';
+		}
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
 		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
@@ -138,16 +163,22 @@ 
 			$identity = $Marine->getIdentity($mmsi);
 			if (isset($identity[0]['mmsi'])) {
 				$imo = $identity[0]['imo'];
-				if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name'];
+				if ($identity[0]['ship_name'] != '') {
+					$name = $identity[0]['ship_name'];
+				}
 			}
 		}
 		unset($Marine);
 
 		//getting the aircraft image
-		if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...';
+		if ($globalDebug && $name != '') {
+			echo 'Try to find an vessel image for '.$name.'...';
+		}
 		$image_url = $this->findMarineImage($mmsi,$imo,$name);
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -156,7 +187,9 @@ 
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -171,41 +204,85 @@ 
 	{
 		global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '' && (!isset($globalVA) || $globalVA !== TRUE)) {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration,'/') !== false) {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-			else $aircraft_name = '';
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-			else $aircraft_icao = '';
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-			else $airline_icao = '';
+			if (isset($aircraft_info[0]['aircraft_name'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
+			} else {
+				$aircraft_name = '';
+			}
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			} else {
+				$aircraft_icao = '';
+			}
+			if (isset($aircraft_info[0]['airline_icao'])) {
+				$airline_icao = $aircraft_info[0]['airline_icao'];
+			} else {
+				$airline_icao = '';
+			}
 		} elseif ($aircraft_icao != '') {
 			$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao);
-			if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type'];
-			else $aircraft_name = '';
+			if (isset($aircraft_info[0]['type'])) {
+				$aircraft_name = $aircraft_info[0]['type'];
+			} else {
+				$aircraft_name = '';
+			}
 			$aircraft_registration = $aircraft_icao;
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		unset($Spotter);
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		if (!isset($globalAircraftImageSources)) {
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		}
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
-		}
-		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao);
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
+				$images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao);
+			}
+			if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) {
+				$images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'flickr' && extension_loaded('simplexml')) {
+				$images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'deviantart' && extension_loaded('simplexml')) {
+				$images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) {
+				$images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) {
+				$images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'airportdata' && !$globalIVAO) {
+				$images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
+		}
+		if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) {
+			return $this->findAircraftImage($aircraft_icao);
+		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
 
@@ -225,7 +302,9 @@ 
 		//$imo = filter_var($imo,FILTER_SANITIZE_STRING);
 		$name = filter_var($name,FILTER_SANITIZE_STRING);
 		$name = trim($name);
-		if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		if (strlen($name) < 4) {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
 		/*
 		$Marine = new Marine($this->db);
 		if ($imo == '' || $name == '') {
@@ -237,15 +316,29 @@ 
 		}
 		unset($Marine);
 		*/
-		if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		if (!isset($globalMarineImageSources)) {
+			$globalMarineImageSources = array('wikimedia','deviantart','flickr','bing');
+		}
 		foreach ($globalMarineImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name);
-			if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr('marine',$mmsi,$name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing('marine',$mmsi,$name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart('marine',$mmsi,$name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia('marine',$mmsi,$name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource('marine',$mmsi,$name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
 		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
@@ -268,7 +361,9 @@ 
 			$url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return false;
+		if (substr($data, 0, 5) != "<?xml") {
+			return false;
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$image_url = array();
@@ -307,7 +402,9 @@ 
 			$url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"';
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return false;
+		if (substr($data, 0, 5) != "<?xml") {
+			return false;
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item->link)) {
 				$image_url = array();
@@ -411,14 +508,22 @@ 
 	public function fromFlickr($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
+			if ($name != '') {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name);
+			} else {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft';
+			}
 		} elseif ($type == 'marine') {
-			if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name);
-			else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship';
+			if ($name != '') {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name);
+			} else {
+				$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship';
+			}
 		}
 		$data = $Common->getData($url);
-		if (substr($data, 0, 5) != "<?xml") return false;
+		if (substr($data, 0, 5) != "<?xml") {
+			return false;
+		}
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
 				$original_url = trim((string)$xml->channel->item->enclosure->attributes()->url);
@@ -461,13 +566,21 @@ 
 	public function fromBing($type,$aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
+			return false;
+		}
 		if ($type == 'aircraft') {
-			if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
-			else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+			if ($aircraft_name != '') {
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
+			} else {
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+			}
 		} elseif ($type == 'marine') {
-			if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27';
-			else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27';
+			if ($aircraft_name != '') {
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27';
+			} else {
+				$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27';
+			}
 		}
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
 		$data = $Common->getData($url,'get','',$headers);
@@ -523,17 +636,25 @@ 
 	public function fromWikimedia($type,$registration,$name='') {
 		$Common = new Common();
 		if ($type == 'aircraft') {
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
-			else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			if ($name != '') {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name);
+			} else {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft';
+			}
 		} elseif ($type == 'marine') {
-			if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"';
-			else return false;
+			if ($name != '') {
+				$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"';
+			} else {
+				return false;
+			}
 		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo,-3) == 'pdf') {
+				return false;
+			}
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -604,18 +725,27 @@ 
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 		if (!empty($globalMarineImageCustomSources) && $type == 'marine') {
 			$customsources = array();
 			if (!isset($globalMarineImageCustomSources[0])) {
@@ -640,18 +770,27 @@ 
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright'];
-					else $image_url['copyright'] = $source['source_website'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} elseif (isset($source['copyright'])) {
+						$image_url['copyright'] = $source['copyright'];
+					} else {
+						$image_url['copyright'] = $source['source_website'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 }
 

require/class.SpotterImport.php

Braces +401 added lines, -143 removed lines

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

require/class.MarineImport.php

Braces +193 added lines, -66 removed lines

@@ -54,7 +54,9 @@ 
     public function checkAll() {
 	global $globalDebug, $globalNoDB;
 	if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	    if ($globalDebug) echo "Update last seen tracked data...\n";
+	    if ($globalDebug) {
+	    	echo "Update last seen tracked data...\n";
+	    }
 	    foreach ($this->all_tracked as $key => $flight) {
 		if (isset($this->all_tracked[$key]['id'])) {
 		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -68,13 +70,17 @@ 
     public function del() {
 	global $globalDebug, $globalNoDB, $globalNoImport;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
             		if (isset($this->all_tracked[$key]['id'])) {
-            		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    if ($globalDebug) {
+            		    	echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		    }
 			    /*
 			    $MarineLive = new MarineLive();
             		    $MarineLive->deleteLiveMarineDataById($this->all_tracked[$key]['id']);
@@ -84,7 +90,9 @@ 
             		    $Marine = new Marine($this->db);
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			    }
 			    // Put in archive
 //				$Marine->db = null;
@@ -98,7 +106,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
+		$globalCoordMinChange = '0.02';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -112,20 +122,30 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
 		$AIS = new AIS();
-	        if (!isset($line['id'])) $id = trim($line['mmsi']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['mmsi']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -133,10 +153,16 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
@@ -186,34 +212,49 @@ 
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
 				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 				$Marine->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 			    }
 			}
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    }
 		}
 
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) >= time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!";
+			}
 			return '';
 		}
 
@@ -226,14 +267,21 @@ 
 		    if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
@@ -241,22 +289,32 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Marine = new Marine($this->db);
 				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    if (!empty($all_country)) {
+				    	$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				    }
 				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -265,8 +323,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -284,7 +346,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -314,15 +378,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -334,23 +404,38 @@ 
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
+				    if ($globalDebug) {
+				    	echo "Check if aircraft is already in DB...";
+				    }
 				    $timeelapsed = microtime(true);
 				    $MarineLive = new MarineLive($this->db);
 				    if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				    } else $recent_ident = '';
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
+				    } else {
+				    	$recent_ident = '';
+				    }
 				    $MarineLive->db=null;
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-				} else $recent_ident = '';
+				    if ($globalDebug && $recent_ident == '') {
+				    	echo " Not in DB.\n";
+				    } elseif ($globalDebug && $recent_ident != '') {
+				    	echo " Already in DB.\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -358,30 +443,44 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) {
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+				    }
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $timeelapsed = microtime(true);
 					    $Marine = new Marine($this->db);
 					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 					    $Marine->db = null;
-					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    if ($globalDebug && isset($result)) {
+					    	echo $result."\n";
+					    }
+					    if ($globalDebugTimeElapsed) {
+					    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    }
 					}
 				    }
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					// Add source stat in DB
 					$Stats = new Stats($this->db);
 					if (!empty($this->stats)) {
-					    if ($globalDebug) echo 'Add source stats : ';
+					    if ($globalDebug) {
+					    	echo 'Add source stats : ';
+					    }
 				    	    foreach($this->stats as $date => $data) {
 						foreach($data as $source => $sourced) {
 					    	    //print_r($sourced);
-				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    if (isset($sourced['polar'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date);
+				    	    	    }
+				    	    	    if (isset($sourced['hist'])) {
+				    	    	    	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    }
 				    		    if (isset($sourced['msg'])) {
 				    			if (time() - $sourced['msg']['date'] > 10) {
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -394,7 +493,9 @@ 
 			    			    unset($this->stats[$date]);
 			    			}
 				    	    }
-				    	    if ($globalDebug) echo 'Done'."\n";
+				    	    if ($globalDebug) {
+				    	    	echo 'Done'."\n";
+				    	    }
 					}
 					$Stats->db = null;
 				    }
@@ -404,13 +505,17 @@ 
 				$this->all_tracked[$id]['addedMarine'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Marine data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Marine data older than 9 hours...";
+				    }
 				    //MarineLive->deleteLiveMarineDataNotUpdated();
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
 					$MarineLive->db=null;
-					if ($globalDebug) echo " Done\n";
+					if ($globalDebug) {
+						echo " Done\n";
+					}
 				    }
 				    $this->last_delete = time();
 				}
@@ -436,15 +541,21 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
 					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 					$MarineLive->db = null;
-					if ($globalDebug) echo $result."\n";
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebug) {
+						echo $result."\n";
+					}
+					if ($globalDebugTimeElapsed) {
+						echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
@@ -456,7 +567,9 @@ 
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source($this->db);
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -477,7 +590,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -495,7 +610,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -507,19 +624,27 @@ 
 				
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-				if ($globalDebug) echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				if ($globalDebug) {
+					echo "---- Deleting Live Marine data Not updated since 2 hour...";
+				}
 				$MarineLive = new MarineLive($this->db);
 				$MarineLive->deleteLiveMarineDataNotUpdated();
 				$MarineLive->db = null;
 				//MarineLive->deleteLiveMarineData();
-				if ($globalDebug) echo " Done\n";
+				if ($globalDebug) {
+					echo " Done\n";
+				}
 			    }
 			    $this->last_delete_hourly = time();
 			}
@@ -528,7 +653,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }