Ysurac / FlightAirMap

airline-statistics-registration.php

Spacing +18 added lines, -18 removed lines

@@ -7,21 +7,21 @@ 
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Aircraft by Registration from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Aircraft by Registration from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Aircraft by Registration from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 
@@ -32,10 +32,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>──────────────────</option>';
@@ -43,9 +43,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -79,12 +79,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -95,9 +95,9 @@ 
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft by Registration").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircraft by their registration of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircraft by their registration of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows the most common aircraft by their registration of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows the most common aircraft by their registration of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	/*
 	if ($alliance) {
@@ -106,7 +106,7 @@ 
 		$aircraft_array = $Spotter->countAllAircraftRegistrationByAirline($airline);
 	}
 	*/
-	$aircraft_array = $Stats->countAllAircraftRegistrations(true,$airline);
+	$aircraft_array = $Stats->countAllAircraftRegistrations(true, $airline);
 	if (!empty($aircraft_array))
 	{
 		print '<div class="table-responsive">';
@@ -121,7 +121,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

airline-statistics-departure-airport.php

Spacing +19 added lines, -19 removed lines

@@ -7,21 +7,21 @@ 
 	header('Location: '.$globalURL.'/airline');
 	die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
 $alliance = false;
-if (strpos($airline,'alliance_') !== FALSE) {
+if (strpos($airline, 'alliance_') !== FALSE) {
 	$alliance = true;
 } else {
-	$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+	$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 }
 
 if (!empty($spotter_array) || $alliance === true)
 {
 	if ($alliance) {
-		$title = sprintf(_("Most Common Departure Airports from %s"),str_replace('_',' ',str_replace('alliance_','',$airline)));
+		$title = sprintf(_("Most Common Departure Airports from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline)));
 	} else {
-		$title = sprintf(_("Most Common Departure Airports from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+		$title = sprintf(_("Most Common Departure Airports from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	}
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -31,10 +31,10 @@ 
 	$alliances = $Spotter->getAllAllianceNames();
 	if (!empty($alliances)) {
 		foreach ($alliances as $al) {
-			if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>';
+			if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) {
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>';
 			} else {
-				print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>';
+				print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>';
 			}
 		}
 		print '<option disabled>───────────────────</option>';
@@ -42,9 +42,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -78,12 +78,12 @@ 
 			print '</div>';
 		} else {
 			print '<div class="info column">';
-			print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>';
-			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png'))
+			print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>';
+			if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png'))
 			{
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />';
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />';
 			}
-			print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>';
+			print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>';
 			print '</div>';
 		}
 	} else {
@@ -94,9 +94,9 @@ 
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports").'</h2>';
 	if ($alliance) {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>';
 	} else {
-		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+		print '<p>'.sprintf(_("The statistic below shows all departure airports of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	}
 	/*
 	if ($alliance) {
@@ -105,7 +105,7 @@ 
 		$airport_airport_array = $Spotter->countAllDepartureAirportsByAirline($airline);
 	}
 	*/
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>';
@@ -113,7 +113,7 @@ 
 	print '<script>';
 	print 'var series = [';
 	$airport_data = '';
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_name'].' ('.$airport_item['airport_departure_icao'].')",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 	}
@@ -168,7 +168,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($airport_airport_array as $airport_item)
+	foreach ($airport_airport_array as $airport_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

search-ajax.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 $Spotter = new Spotter();
 $orderby = $Spotter->getOrderBy();
 
-$ask = filter_input(INPUT_GET,'ask',FILTER_SANITIZE_STRING);
+$ask = filter_input(INPUT_GET, 'ask', FILTER_SANITIZE_STRING);
 if ($ask == 'aircraftsdetected') {
 	require_once('require/class.SpotterLive.php');
 	$SpotterLive = new SpotterLive();
@@ -27,16 +27,16 @@ 
 	$manufacturers = $Stats->getAllManufacturers();
 	if (empty($manufacturers)) $manufacturers = $Spotter->getAllManufacturers();
 	$all_manufacturers = array();
-	foreach($manufacturers as $manufacturer)
+	foreach ($manufacturers as $manufacturer)
 	{
-		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ','-',$manufacturer['aircraft_manufacturer'])));
+		$all_manufacturers[] = array('value' => $manufacturer['aircraft_manufacturer'], 'id' => strtolower(str_replace(' ', '-', $manufacturer['aircraft_manufacturer'])));
 	}
 	echo json_encode($all_manufacturers);
 } elseif ($ask == 'aircrafttypes') {
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
 	$all_aircraft_types = array();
-	foreach($aircraft_types as $aircraft_type)
+	foreach ($aircraft_types as $aircraft_type)
 	{
 		$all_aircraft_types[] = array('id' => $aircraft_type['aircraft_icao'], 'value' => $aircraft_type['aircraft_name'].' ('.$aircraft_type['aircraft_icao'].')');
 	}
@@ -44,7 +44,7 @@ 
 } elseif ($ask == 'airlinenames') {
 	$airline_names = $Stats->getAllAirlineNames();
 	$all_airline_names = array();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
 		$all_airline_names[] = array('id' => $airline_name['airline_icao'], 'value' => $airline_name['airline_name'].' ('.$airline_name['airline_icao'].')');
 	}
@@ -52,7 +52,7 @@ 
 } elseif ($ask == 'airlinecountries') {
 	$airline_countries = $Spotter->getAllAirlineCountries();
 	$all_airline_countries = array();
-	foreach($airline_countries as $airline_country)
+	foreach ($airline_countries as $airline_country)
 	{
 		$all_airline_countries[] = array('id' => $airline_country['airline_country'], 'value' => $airline_country['airline_country']);
 	}
@@ -62,7 +62,7 @@ 
 	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
 	ksort($airport_names);
 	$all_airport_names = array();
-	foreach($airport_names as $airport_name)
+	foreach ($airport_names as $airport_name)
 	{
 		$all_airport_names[] = array('id' => $airport_name['airport_icao'], 'value' => $airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')');
 	}
@@ -70,7 +70,7 @@ 
 } elseif ($ask == 'airportcountries') {
 	$airport_countries = $Spotter->getAllAirportCountries();
 	$all_airport_countries = array();
-	foreach($airport_countries as $airport_country)
+	foreach ($airport_countries as $airport_country)
 	{
 		$all_airport_countries[] = array('id' => $airport_country['airport_country'], 'value' => $airport_country['airport_country']);
 	}

require/class.Connection.php

Spacing +29 added lines, -29 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 require_once(dirname(__FILE__).'/settings.php');
 
-class Connection{
+class Connection {
 	public $db = null;
 	public $dbs = array();
 	public $latest_schema = 46;
 	
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
 	    global $globalNoDB;
 	    if (isset($globalNoDB) && $globalNoDB === TRUE) {
 		$this->db = null;
@@ -16,7 +16,7 @@ 
 			if ($user === null && $pass === null) {
 			    $this->createDBConnection();
 			} else {
-			    $this->createDBConnection(null,$user,$pass);
+			    $this->createDBConnection(null, $user, $pass);
 			}
 		    } else {
 			$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@ 
 		while (true) {
 			try {
 				if ($globalDBSdriver == 'mysql') {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@ 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
 				} else {
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
 				}
 				break;
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				$i++;
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
 				//exit;
@@ -154,10 +154,10 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
-		if($results->rowCount()>0) {
+		if ($results->rowCount() > 0) {
 		    return true; 
 		}
 		else return false;
@@ -179,8 +179,8 @@ 
 			     return false;
 			}
 			
-		} catch(PDOException $e) {
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
+		} catch (PDOException $e) {
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
             			throw $e;
 	                }
 	                //echo 'error ! '.$e->getMessage();
@@ -192,7 +192,7 @@ 
 	/*
 	* Check if index exist
 	*/
-	public function indexExists($table,$index)
+	public function indexExists($table, $index)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -203,11 +203,11 @@ 
 		try {
 			//$Connection = new Connection();
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return false;
 		}
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
-		if($nb[0]['nb'] > 0) {
+		if ($nb[0]['nb'] > 0) {
 			return true; 
 		}
 		else return false;
@@ -222,7 +222,7 @@ 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
 		try {
 			$results = $this->db->query($query);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage()."\n";
 		}
 		$columns = array();
@@ -234,7 +234,7 @@ 
 		return $columns;
 	}
 
-	public function getColumnType($table,$column) {
+	public function getColumnType($table, $column) {
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
 		$tomet = $select->getColumnMeta(0);
 		return $tomet['native_type'];
@@ -244,7 +244,7 @@ 
 	* Check if a column name exist in a table
 	* @return Boolean column exist or not
 	*/
-	public function checkColumnName($table,$name)
+	public function checkColumnName($table, $name)
 	{
 		global $globalDBdriver, $globalDBname;
 		if ($globalDBdriver == 'mysql') {
@@ -254,8 +254,8 @@ 
 		}
 			try {
 				$sth = $this->db()->prepare($query);
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
-			} catch(PDOException $e) {
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage()."\n";
 			}
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -294,7 +294,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage()."\n";
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);

space-data.php

Spacing +10 added lines, -10 removed lines

@@ -9,7 +9,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
 $sat = urldecode($sat);
 //$info = $Satellite->get_info(str_replace(' ','-',$sat));
 //print_r($info);
@@ -48,7 +48,7 @@ 
 	$aircraft_name = 'INTEGRAL';
 //	$ground_speed = 14970;
 	$launch_date = '17 October 2002';
-} elseif (strpos($sat,'IRIDIUM') !== false) {
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
 	$image_copyright = 'Cliff';
 	$ident = 'Iridium satellite constellation';
@@ -56,23 +56,23 @@ 
 	$aircraft_name = $sat;
 //	$ground_speed = 14970;
 //	$launch_date = '29 september 2011';
-} elseif (strpos($sat,'ORBCOMM') !== false) {
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
 	$ident = 'Orbcomm';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
 	$aircraft_name = $sat;
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
 	$ident = 'Globalstar';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
 	$aircraft_name = $sat;
-	$satname = str_replace(array('[+]','[-]'),'',$sat);
-} elseif (strpos($sat,'OSCAR 7') !== false) {
+	$satname = str_replace(array('[+]', '[-]'), '', $sat);
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
 	$image_copyright = 'Amsat.org';
 	$ident = 'AMSAT-OSCAR 7';
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
 	$aircraft_name = $sat;
 	$launch_date = '15 November 1974';
-} elseif (strpos($sat,'santaclaus') !== false) {
+} elseif (strpos($sat, 'santaclaus') !== false) {
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
 	$image_copyright = 'Jonathan G Meath';
 	$ident = 'Santa Claus';
@@ -81,8 +81,8 @@ 
 //	$launch_date = '15 November 1974';
 } else {
 	$ident = $sat;
-	if (strpos($sat,'(')) $satname = $sat;
-	else $satname = str_replace(array(' '),'-',$sat);
+	if (strpos($sat, '(')) $satname = $sat;
+	else $satname = str_replace(array(' '), '-', $sat);
 }
 if (!isset($satname)) $satname = $sat;
 $info = $Satellite->get_info(strtolower(trim($satname)));
@@ -145,7 +145,7 @@ 
 		print '<div><span>'._("Orbit").'</span>'.$info['orbit'].'</div>';
 	}
 	if ($info['launch_date'] != '') {
-		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d',strtotime($info['launch_date'])).'</div>';
+		print '<div><span>'._("Launch Date").'</span>'.date('Y-m-d', strtotime($info['launch_date'])).'</div>';
 	}
 	if ($info['launch_site'] != '') {
 		print '<div><span>'._("Launch Site").'</span>'.$info['launch_site'].'</div>';

statistics.php

Spacing +148 added lines, -148 removed lines

@@ -23,7 +23,7 @@ 
 }
 
 if (!isset($filter_name)) $filter_name = '';
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -32,7 +32,7 @@ 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
 	if (isset($airline_info[0]['name'])) {
 		$airline_name = $airline_info[0]['name'];
-	} elseif (strpos($airline_icao,'alliance_') !== FALSE) {
+	} elseif (strpos($airline_icao, 'alliance_') !== FALSE) {
 		$alliance_name = $airline_icao;
 	}
 }
@@ -42,8 +42,8 @@ 
 	$title = _("Statistics");
 }
 
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
 
 require_once('header.php');
 
@@ -70,7 +70,7 @@ 
 		date_default_timezone_set('UTC');
 		$lastupdate = strtotime($last_update[0]['value']);
 		if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
-		print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
+		print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
 	}
 }
 ?>
@@ -82,31 +82,31 @@ 
 <?php
 if ($type == 'aircraft') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>
@@ -114,8 +114,8 @@ 
 	if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) {
 		if ($airline_icao == '' || $airline_icao == 'all') {
 ?>
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 		}
 	}
@@ -123,22 +123,22 @@ 
 <?php
 } elseif ($type == 'marine') {
 ?>
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 } elseif ($type == 'tracker') {
 ?>
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 }
 ?>
     </p>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
     <div class="specific-stats">
 <?php
 if ($type == 'aircraft') {
@@ -147,13 +147,13 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
 <?php
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
 	if (count($aircraft_array) == 0) {
 		print _("No data available");
 	} else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$aircraft_data = '';
-		foreach($aircraft_array as $aircraft_item) {
+		foreach ($aircraft_array as $aircraft_item) {
 			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
 		}
@@ -182,16 +182,16 @@ 
 ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	if ($airline_icao == '' || $airline_icao == 'all') {
-		$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
+		$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
 		if (count($airline_array) > 0) {
 			print '<div class="col-md-6">';
 			print '<h2>'._("Top 10 Most Common Airline").'</h2>';
 			print '<div id="chart2" class="chart" width="100%"></div><script>';
 			$airline_data = '';
-			foreach($airline_array as $airline_item) {
+			foreach ($airline_array as $airline_item) {
 				$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
 			}
 			$airline_data = substr($airline_data, 0, -1);
@@ -216,7 +216,7 @@ 
 		}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 }
@@ -228,12 +228,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
 <?php
-	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
+	$marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month);
 	if (count($marine_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$marine_data = '';
-		foreach($marine_array as $marine_item) {
+		foreach ($marine_array as $marine_item) {
 			$marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
 		}
 		$marine_data = substr($marine_data, 0, -1);
@@ -263,7 +263,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -273,12 +273,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
 <?php
-	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
+	$tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month);
 	if (count($tracker_array) == 0) print _("No data available");
 	else {
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
 		$tracker_data = '';
-		foreach($tracker_array as $tracker_item) {
+		foreach ($tracker_array as $tracker_item) {
 			$tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],';
 		}
 		$tracker_data = substr($tracker_data, 0, -1);
@@ -308,7 +308,7 @@ 
             	    ?>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <!--	</div>-->
 <?php
 }
@@ -323,7 +323,7 @@ 
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -343,7 +343,7 @@ 
                 </div>
                 -->
             </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
 <?php
@@ -352,7 +352,7 @@ 
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($countries_array as $owner_item) {
+			foreach ($countries_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['country_name'].'",'.$owner_item['country_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -373,7 +373,7 @@ 
                 -->
             </div>
             
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 ²	</div>
         <div class="row column">
             <div class="col-md-6">
@@ -384,7 +384,7 @@ 
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$launch_site_data = '';
-			foreach($launch_site_array as $launch_site_item) {
+			foreach ($launch_site_array as $launch_site_item) {
 				$launch_site_data .= '["'.$launch_site_item['launch_site'].'",'.$launch_site_item['launch_site_count'].'],';
 			}
 			$launch_site_data = substr($launch_site_data, 0, -1);
@@ -411,7 +411,7 @@ 
 ?>
         <div class="row column">
 <?php
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
 	//if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 		if (empty($flightover_array)) {
@@ -422,12 +422,12 @@ 
 ?>
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
 <?php
-		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
+		$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
 		if (count($pilot_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$pilot_data = '';
-			foreach($pilot_array as $pilot_item) {
+			foreach ($pilot_array as $pilot_item) {
 				$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
 			}
 			$pilot_data = substr($pilot_data, 0, -1);
@@ -448,7 +448,7 @@ 
 ?>
             </div>
 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	// else {
@@ -457,12 +457,12 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
 <?php
-		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
+		$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
 		if (count($owner_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
 			$owner_data = '';
-			foreach($owner_array as $owner_item) {
+			foreach ($owner_array as $owner_item) {
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
 			}
 			$owner_data = substr($owner_data, 0, -1);
@@ -481,7 +481,7 @@ 
                 </div>
             </div>
         
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 	if (!empty($flightover_array)) {
@@ -495,7 +495,7 @@ 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
 			print 'var series = [';
 			$flightover_data = '';
-			foreach($flightover_array as $flightover_item) {
+			foreach ($flightover_array as $flightover_item) {
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 			}
 			$flightover_data = substr($flightover_data, 0, -1);
@@ -540,7 +540,7 @@ 
 	}
 ?>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 }
@@ -556,7 +556,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -613,7 +613,7 @@ 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
 		print 'var series = [';
 		$flightover_data = '';
-		foreach($flightover_array as $flightover_item) {
+		foreach ($flightover_array as $flightover_item) {
 			$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 		}
 		$flightover_data = substr($flightover_data, 0, -1);
@@ -663,14 +663,14 @@ 
         <div class="row column">
             <div class="col-md-6">
 <?php
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array) > 0) {
 		print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
 		print '<div id="chart3" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array as $airport_item) {
+		foreach ($airport_airport_array as $airport_item) {
 			$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
 		}
 		$airport_data = substr($airport_data, 0, -1);
@@ -720,18 +720,18 @@ 
 	}
 ?>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
 <?php
-	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
 	if (count($airport_airport_array2) > 0) {
 		print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
 		print '<div id="chart4" class="chart" width="100%"></div><script>';
 		print "\n";
 		print 'var series = [';
 		$airport_data = '';
-		foreach($airport_airport_array2 as $airport_item)
+		foreach ($airport_airport_array2 as $airport_item)
 		{
 			$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 		}
@@ -783,7 +783,7 @@ 
 ?>
             </div>
         </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php 
 }
 if ($type == 'aircraft') {
@@ -795,18 +795,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -819,22 +819,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -847,23 +847,23 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -876,22 +876,22 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -904,7 +904,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -920,18 +920,18 @@ 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
 <?php
-		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
+		$year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name);
 		if (count($year_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -945,22 +945,22 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
-		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
+		$month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name);
 		if (count($month_array) == 0) print _("No data available");
 		else {
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -973,23 +973,23 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 <?php
-		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
+		$date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name);
 		if (empty($date_array)) print _("No data available");
 		else {
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1002,22 +1002,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
+		$hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1030,7 +1030,7 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1052,12 +1052,12 @@ 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart8",
 			    data: { x: "x",
@@ -1071,7 +1071,7 @@ 
                 </div>
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
 <?php
@@ -1081,12 +1081,12 @@ 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
 			$month_data = '';
 			$month_cnt = '';
-			foreach($month_array as $month_item) {
+			foreach ($month_array as $month_item) {
 				$month_data .= '"'.$month_item['date_name'].'",';
 				$month_cnt .= $month_item['date_count'].',';
 			}
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
-			$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
+			$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart9",
 			    data: { x: "x",
@@ -1099,7 +1099,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
@@ -1110,12 +1110,12 @@ 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
 			$date_data = '';
 			$date_cnt = '';
-			foreach($date_array as $date_item) {
+			foreach ($date_array as $date_item) {
 				$date_data .= '"'.$date_item['date_name'].'",';
 				$date_cnt .= $date_item['date_count'].',';
 			}
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
-			$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
+			$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart5",
 			    data: { x: "x",
@@ -1128,22 +1128,22 @@ 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
 <?php
-		$hour_array = $Tracker->countAllHours('hour',true);
+		$hour_array = $Tracker->countAllHours('hour', true);
 		if (empty($hour_array)) print _("No data available");
 		else {
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
 			$hour_data = '';
 			$hour_cnt = '';
-			foreach($hour_array as $hour_item) {
+			foreach ($hour_array as $hour_item) {
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
 				$hour_cnt .= $hour_item['hour_count'].',';
 			}
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
-			$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
+			$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart6",
 			    data: {
@@ -1156,7 +1156,7 @@ 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1178,12 +1178,12 @@ 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart21",
 			    data: { x: "x",
@@ -1199,7 +1199,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
             <div class="col-md-6">
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
 <?php
@@ -1209,12 +1209,12 @@ 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year_name'].'-01-01'.'",';
 				$year_cnt .= $year_item['date_count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart22",
 			    data: { x: "x",
@@ -1230,7 +1230,7 @@ 
             -->
             </div>
             
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
         </div>
 <?php
 	}
@@ -1252,12 +1252,12 @@ 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-01-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart32",
 			    data: { x: "x",
@@ -1270,7 +1270,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 
         <div class="row column">
             <div class="col-md-6">
@@ -1282,12 +1282,12 @@ 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
 			$year_data = '';
 			$year_cnt = '';
-			foreach($year_array as $year_item) {
+			foreach ($year_array as $year_item) {
 				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
 				$year_cnt .= $year_item['count'].',';
 			}
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart33",
 			    data: { x: "x",
@@ -1300,7 +1300,7 @@ 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
                 </div>
             </div>
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <br/>
 <?php
 	}
@@ -1314,19 +1314,19 @@ 
 	//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d'));
+			$polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$polar = $Stats->getStatsSource('polar',$year,$month);
+			$polar = $Stats->getStatsSource('polar', $year, $month);
 		} elseif ($type == 'marine') {
-			$polar = $Stats->getStatsSource('polar_marine',$year,$month);
+			$polar = $Stats->getStatsSource('polar_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$polar = $Stats->getStatsSource('polar_tracker',$year,$month);
+			$polar = $Stats->getStatsSource('polar_tracker', $year, $month);
 		}
 	}
 	if (!empty($polar)) {
@@ -1335,7 +1335,7 @@ 
 			unset($polar_data);
 			$Spotter = new Spotter();
 			$data = json_decode($eachpolar['source_data']);
-			foreach($data as $value => $key) {
+			foreach ($data as $value => $key) {
 				$direction = $Spotter->parseDirection(($value*22.5));
 				$distance = $key;
 				$unit = 'km';
@@ -1355,7 +1355,7 @@ 
 ?>
             <div class="col-md-6">
                 <h4><?php print $eachpolar['source_name']; ?></h4>
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
         	<script>
         	    (function() {
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
@@ -1379,7 +1379,7 @@ 
 		      color: color,
 		      unit: '<?php echo $unit; ?>'
 		    };
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
 		    })();
 		</script>
             </div>
@@ -1394,19 +1394,19 @@ 
 	//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d'));
+			$msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$msg = $Stats->getStatsSource('msg',$year,$month);
+			$msg = $Stats->getStatsSource('msg', $year, $month);
 		} elseif ($type == 'marine') {
-			$msg = $Stats->getStatsSource('msg_marine',$year,$month);
+			$msg = $Stats->getStatsSource('msg_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$msg = $Stats->getStatsSource('msg_tracker',$year,$month);
+			$msg = $Stats->getStatsSource('msg_tracker', $year, $month);
 		}
 	}
 	if (!empty($msg)) {
@@ -1414,13 +1414,13 @@ 
 		foreach ($msg as $eachmsg) {
 			//$eachmsg = $msg[0];
 			$data = $eachmsg['source_data'];
-			if ($data > 500) $max = (round(($data+100)/100))*100;
+			if ($data > 500) $max = (round(($data + 100)/100))*100;
 			else $max = 500;
 ?>
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
         	<script>
 		      var g = new JustGage({
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
 			    value: <?php echo $data; ?>,
 			    min: 0,
 			    max: <?php print $max; ?>,
@@ -1442,19 +1442,19 @@ 
 	//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
 	if ($year == '' && $month == '') {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d'));
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d'));
+			$hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d'));
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$hist = $Stats->getStatsSource('hist',$year,$month);
+			$hist = $Stats->getStatsSource('hist', $year, $month);
 		} elseif ($type == 'marine') {
-			$hist = $Stats->getStatsSource('hist_marine',$year,$month);
+			$hist = $Stats->getStatsSource('hist_marine', $year, $month);
 		} elseif ($type == 'tracker') {
-			$hist = $Stats->getStatsSource('hist_tracker',$year,$month);
+			$hist = $Stats->getStatsSource('hist_tracker', $year, $month);
 		}
 	}
 	foreach ($hist as $hists) {
@@ -1464,7 +1464,7 @@ 
 		$source = $hists['source_name'];
 		$hist_array = json_decode($hists['source_data']);
 		$unit = 'km';
-		foreach($hist_array as $distance => $nb) {
+		foreach ($hist_array as $distance => $nb) {
 			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 				$distance = round($distance*0.539957);
 				$unit = 'nm';
@@ -1484,18 +1484,18 @@ 
 		$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
 ?>
             <div class="col-md-6">
-                <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2>
+                <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2>
 <?php
-		print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
+		print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
 		print 'c3.generate({
-		    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
+		    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
 		    data: { x: "x",
 		    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
 		    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
 		print '</script>';
 ?>
     	    </div>
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
 <?php
 	}
 ?>

scripts/update_db.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
 	exec("ps ux", $output, $result);
 	$j = 0;
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
+	foreach ($output as $line) if (strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
 	if ($j > 1) {
 		echo "Script is already runnning...";
 		die();

scripts/daemon-acars.php

Spacing +6 added lines, -6 removed lines

@@ -17,10 +17,10 @@ 
 
 $debug = true;
 
-$ACARS=new ACARS(null,true);
+$ACARS = new ACARS(null, true);
 date_default_timezone_set('UTC');
 // signal handler - playing nice with sockets and dump1090
-pcntl_signal(SIGINT,  function($signo) {
+pcntl_signal(SIGINT, function($signo) {
     global $sock;
     echo "\n\nctrl-c or kill signal received. Tidying up ... ";
     socket_shutdown($sock, 0);
@@ -36,7 +36,7 @@ 
 $sock = socket_create(AF_INET, SOCK_DGRAM, 0) or die("Unable to create socket\n");
 
 // Bind the source address
-if( !socket_bind($sock, $globalACARSHost , $globalACARSPort) )
+if (!socket_bind($sock, $globalACARSHost, $globalACARSPort))
 {
     $errorcode = socket_last_error();
     $errormsg = socket_strerror($errorcode);
@@ -45,7 +45,7 @@ 
 }
 
 echo "LISTEN UDP MODE \n\n";
-while(1) {
+while (1) {
     $r = socket_recvfrom($sock, $buffer, 512, 0, $remote_ip, $remote_port);
 
     // lets play nice and handle signals such as ctrl-c/kill properly
@@ -54,8 +54,8 @@ 
     //  (null) 2 23/02/2015 14:46:06 0 -16 X .D-AIPW ! 1L 7 M82A LH077P 010952342854:VP-MIBI+W+0)-V+(),GB1
     echo $buffer."\n";
     $ACARS->add(trim($buffer));
-    socket_sendto($sock, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+    socket_sendto($sock, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
     $ACARS->deleteLiveAcarsData();
 }
-pcntl_exec($_,$argv);
+pcntl_exec($_, $argv);
 ?>

require/class.SpotterImport.php

Spacing +153 added lines, -153 removed lines

@@ -34,12 +34,12 @@ 
 		$currentdate = date('Y-m-d');
 		$sourcestat = $Stats->getStatsSource($currentdate);
 		if (!empty($sourcestat)) {
-		    foreach($sourcestat as $srcst) {
+		    foreach ($sourcestat as $srcst) {
 		    	$type = $srcst['stats_type'];
 			if ($type == 'polar' || $type == 'hist') {
 			    $source = $srcst['source_name'];
 			    $data = $srcst['source_data'];
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
 	    		}
 		    }
 		}
@@ -51,14 +51,14 @@ 
 	if (isset($globalGeoid) && $globalGeoid) {
 		try {
 			$GeoidClass = new GeoidHeight();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
 			$GeoidClass = FALSE;
 		}
 	}
     }
 
-    public function get_Schedule($id,$ident) {
+    public function get_Schedule($id, $ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -83,8 +83,8 @@ 
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
 		    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']));
+		    $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
 		    if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -104,7 +104,7 @@ 
 			    }
 			}
 		    }
-		    $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']);
+		    $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;
@@ -112,7 +112,7 @@ 
        if ($scheduleexist) {
 		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']));
+		$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']));
        }
 	$Spotter->db = null;
 	$Schedule->db = null;
@@ -139,7 +139,7 @@ 
 		    //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']);
         	}
 	    }
 	}
@@ -153,7 +153,7 @@ 
         $airport_time = '';
         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);
+	    $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'];
@@ -168,7 +168,7 @@ 
         		    break;
         		}
         	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
@@ -181,7 +181,7 @@ 
         } else {
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
         }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
     }
 
 
@@ -192,7 +192,7 @@ 
 	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)) {
+		if ($flight['lastupdate'] < (time() - 5900)) {
 		    $this->delKey($key);
 		}
 	    }
@@ -208,7 +208,7 @@ 
 			$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']);
+				$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";
 			}
 		}
@@ -241,7 +241,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
+	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['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
@@ -277,25 +277,25 @@ 
 		if (!isset($this->all_flights[$id])) {
 		    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()));
+		    $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($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($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']));
+		     } 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']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
 		}
 		
 		//print_r($this->all_flights);
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -304,27 +304,27 @@ 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			    $Spotter = new Spotter($this->db);
 			    if (isset($this->all_flights[$id]['source_type'])) {
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
 			    } else {
 				$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 (isset($line['id']) && !isset($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => ''));
 	        }
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
 			$icao = $line['aircraft_icao'];
 			$Spotter = new Spotter($this->db);
 			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));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -332,7 +332,7 @@ 
 				$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'])) {
@@ -340,15 +340,15 @@ 
 			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($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'));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
 		}
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
 		    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']));
+			$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";
@@ -359,31 +359,31 @@ 
 				*/
 				return '';
 		    }
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n";
 			return '';
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
+		} 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]['id']." - 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')));
+			$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']."!!!";
 			return '';
 		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id'])));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name'])));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
@@ -391,13 +391,13 @@ 
 		    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";
-				$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']));
+				$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']));
 			} else {
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+			    $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);
@@ -407,13 +407,13 @@ 
 				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);
+            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
 				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'])) {
@@ -423,25 +423,25 @@ 
 		        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) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
 		    }
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
 		    }
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$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' => ''));
+		    		$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' => ''));
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
 				$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";
+		    		$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";
                         }
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -455,35 +455,35 @@ 
 				$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']) {
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $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']));
-		    		$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']));
+		    		$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 (!$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']));
 			}
 		    }
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
 		    //$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
 		    if ($distance > 1000 && $distance < 10000) {
 		    // use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) {
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
+				$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";
 	  		} else {
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
@@ -498,9 +498,9 @@ 
 	    	    	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']);
+	    	    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']);
+	    	    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']) 
@@ -524,14 +524,14 @@ 
 	    	    	|| ($timediff > 30 
 	    	    	    && isset($this->all_flights[$id]['latitude']) 
 	    	    	    && isset($this->all_flights[$id]['longitude']) 
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
+	    	    	    && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'))
 	    	    	    )
 	    	    	) {
 
 			if ((isset($timediff) && !isset($timediff_archive)) || (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude']))) {
 			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
-				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+				|| !$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -541,11 +541,11 @@ 
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+					$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'] = '';
 					$Spotter->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";
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
 				    }
 				}
@@ -571,13 +571,13 @@ 
 					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				//if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) {
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -599,13 +599,13 @@ 
 					$this->all_flights[$id]['time_last_coord'] = time();
 				}
 				//if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) {
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -623,46 +623,46 @@ 
 		    } else if ($globalDebug && $timediff > 30) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
 		    }
 		}
 		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;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
 		    //$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
 		    //$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// 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']));
+			$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 ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+		    $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;
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			    $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';
@@ -671,66 +671,66 @@ 
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Spotter = new Spotter($this->db);
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+				    $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;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) {
 				if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') {
-					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2);
+					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2);
 					//if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n";
 					$line['altitude'] = $line['altitude'] - $geoid;
 				}
 			}
 		    //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;
-			$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']));
+			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";
-				$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']));
+				$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']));
 			}
 		    }
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude']));
 		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
 		}
 		
 		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;
-		    $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));
+		    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;
+  		    $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]['id']." : ".$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));
+  		    $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
@@ -741,7 +741,7 @@ 
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
 		    $this->all_flights[$id]['lastupdate'] = time();
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    //print_r($this->all_flights);
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -752,61 +752,61 @@ 
 				    $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";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } else $recent_ident = '';
-				    $SpotterLive->db=null;
+				    $SpotterLive->db = null;
 				    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));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				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
 				$ignoreImport = false;
-				foreach($globalAirportIgnore as $airportIgnore) {
+				foreach ($globalAirportIgnore as $airportIgnore) {
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
 				    }
 				}
 				if (count($globalAirportAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+				    foreach ($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 					    $ignoreImport = true;
 					}
 				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				    foreach ($globalAirlineAccept as $airlineAccept) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 					    $ignoreImport = false;
 					}
@@ -818,32 +818,32 @@ 
 				    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 (!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']);
+					    $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 ($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 : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        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']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -881,14 +881,14 @@ 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $SpotterLive = new SpotterLive($this->db);
 					    $SpotterLive->deleteLiveSpotterData();
-					    $SpotterLive->db=null;
+					    $SpotterLive->db = null;
 					}
 				    }
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
 			    } else {
-				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'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
+				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'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
 				    $this->all_flights[$id]['id'] = $recent_ident;
 				    $this->all_flights[$id]['addedSpotter'] = 1;
 				}
@@ -896,7 +896,7 @@ 
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
 					    $Spotter->db = null;
 					}
 				    }
@@ -922,37 +922,37 @@ 
 		    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"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
+		    foreach ($globalAirportIgnore as $airportIgnore) {
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 			    $ignoreImport = true;
 			}
 		    }
 		    if (count($globalAirportAccept) > 0) {
 		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
+		        foreach ($globalAirportIgnore as $airportIgnore) {
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 				$ignoreImport = true;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+			foreach ($globalAirlineAccept as $airlineAccept) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 			        $ignoreImport = false;
 			    }
@@ -960,23 +960,23 @@ 
 		    }
 
 		    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($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')));
 				$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 : ";
 					$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']);
+					$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 (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']);
+					$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') {
@@ -995,19 +995,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$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 (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -1022,9 +1022,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						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;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -1037,7 +1037,7 @@ 
 				$this->all_flights[$id]['lastupdate'] = time();
 				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) {