Ysurac / FlightAirMap

require/class.Marine.php

Spacing +208 added lines, -208 removed lines

@@ -2,7 +2,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_query = "SELECT marine_output.* FROM marine_output";
 
-class Marine{
+class Marine {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -17,33 +17,33 @@ 
 	* @return Array the SQL part
 	*/
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -75,7 +75,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -90,7 +90,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -110,13 +110,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$spotter_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -151,10 +151,10 @@ 
 			}
 			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 
-			if(isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
+			if (isset($temp_array['mmsi']) && $temp_array['mmsi'] != "")
 			{
 				$Image = new Image($this->db);
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']);
 				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
 				unset($Image);
 				if (count($image_array) > 0) {
@@ -190,17 +190,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -233,8 +233,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -248,8 +248,8 @@ 
 		} else {
 			$orderby_query = " ORDER BY marine_output.date DESC";
 		}
-		$query  = $global_query.$filter_query." ".$orderby_query;
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$query = $global_query.$filter_query." ".$orderby_query;
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
 		return $spotter_array;
 	}
     
@@ -267,8 +267,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "marine_output.fammarine_id = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_query." WHERE ".$additional_query." ";
-		$spotter_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_query." WHERE ".$additional_query." ";
+		$spotter_array = $this->getDataFromDB($query, $query_values);
 		return $spotter_array;
 	}
 
@@ -287,7 +287,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -303,8 +303,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -343,7 +343,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if (!is_string($type))
 		{
 			return false;
@@ -356,8 +356,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -381,7 +381,7 @@ 
 		return $spotter_array;
 	}
 	
-	public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
 		
@@ -389,7 +389,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -415,8 +415,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -447,11 +447,11 @@ 
 	* @return Array list of source name
 	*
 	*/
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT marine_output.source_name 
+		$query = "SELECT DISTINCT marine_output.source_name 
 				FROM marine_output".$filter_query." marine_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -466,7 +466,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -483,8 +483,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident
 								FROM marine_output".$filter_query." marine_output.ident <> '' 
 								ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -494,7 +494,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -511,7 +511,7 @@ 
 	*/
 	public function getIdentity($mmsi)
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
 		$query  = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':mmsi' => $mmsi));
@@ -524,23 +524,23 @@ 
 	* Add identity
 	*
 	*/
-	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
+	public function addIdentity($mmsi, $imo, $ident, $callsign, $type)
 	{
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
 		if ($mmsi != '') {
-			$imo = filter_var($imo,FILTER_SANITIZE_NUMBER_INT);
-			$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-			$type = filter_var($type,FILTER_SANITIZE_STRING);
+			$imo = filter_var($imo, FILTER_SANITIZE_NUMBER_INT);
+			$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
+			$type = filter_var($type, FILTER_SANITIZE_STRING);
 			$identinfo = $this->getIdentity($mmsi);
 			if (empty($identinfo)) {
-				$query  = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
+				$query = "INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:type)";
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':call_sign' => $callsign,':ship_name' => $ident,':type' => $type));
+				$sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':call_sign' => $callsign, ':ship_name' => $ident, ':type' => $type));
 			} elseif ($ident != '' && $identinfo['ship_name'] != $ident) {
-				$query  = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
+				$query = "UPDATE marine_identity SET ship_name = :ship_name,type = :type WHERE mmsi = :mmsi";
 				$sth = $this->db->prepare($query);
-				$sth->execute(array(':mmsi' => $mmsi,':ship_name' => $ident,':type' => $type));
+				$sth->execute(array(':mmsi' => $mmsi, ':ship_name' => $ident, ':type' => $type));
 			}
 		}
 	}
@@ -561,12 +561,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM marine_output
 								WHERE marine_output.date <> '' 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
@@ -578,7 +578,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -596,10 +596,10 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
+	public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -617,10 +617,10 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
+	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '', $fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
-		$query_values = array(':fammarine_id' => $fammarine_id,':arrival_code' => $arrival_code);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':arrival_code' => $arrival_code);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -639,11 +639,11 @@ 
 	* @return String success or false
 	*
 	*/
-	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
+	public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -666,7 +666,7 @@ 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+                $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -704,7 +704,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
+	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '')
 	{
 		global $globalURL, $globalMarineImageFetch;
 		
@@ -771,32 +771,32 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
-		$type_id = filter_var($typeid,FILTER_SANITIZE_NUMBER_INT);
-		$status_id = filter_var($statusid,FILTER_SANITIZE_NUMBER_INT);
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
+		$type_id = filter_var($typeid, FILTER_SANITIZE_NUMBER_INT);
+		$status_id = filter_var($statusid, FILTER_SANITIZE_NUMBER_INT);
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
 		if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) {
 			$Image = new Image($this->db);
-			$image_array = $Image->getMarineImage($mmsi,$imo,$ident);
+			$image_array = $Image->getMarineImage($mmsi, $imo, $ident);
 			if (!isset($image_array[0]['mmsi'])) {
-				$Image->addMarineImage($mmsi,$imo,$ident);
+				$Image->addMarineImage($mmsi, $imo, $ident);
 			}
 			unset($Image);
 		}
@@ -809,10 +809,10 @@ 
 		if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
 		if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
 		if ($arrival_date == '') $arrival_date = NULL;
-		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date) 
+		$query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, type_id, status,status_id,imo,arrival_port_name,arrival_port_date) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date)";
 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':type_id' => $type_id,':status' => $status,':status_id' => $status_id,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':type_id' => $type_id, ':status' => $status, ':status_id' => $status_id, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -836,13 +836,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND marine_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT marine_output.ident FROM marine_output 
+			$query = "SELECT marine_output.ident FROM marine_output 
 								WHERE marine_output.ident = :ident 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
@@ -851,8 +851,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -878,8 +878,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(marine_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -887,11 +887,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND marine_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output 
+			$query = "SELECT marine_output.* FROM marine_output 
 				WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -910,16 +910,16 @@ 
 	*
 	*/
 
-	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		require_once('class.SpotterLive.php');
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			$MarineLive = new MarineLive($this->db);
-			$filter_query = $MarineLive->getFilter($filters,true,true);
+			$filter_query = $MarineLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -939,7 +939,7 @@ 
 		} else {
 			require_once(dirname(__FILE__)."/class.MarineArchive.php");
 			$MarineArchive = new MarineArchive($this->db);
-			$filter_query = $MarineArchive->getFilter($filters,true,true);
+			$filter_query = $MarineArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -967,7 +967,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_count'] = $row['nb'];
 			$temp_array['marine_country'] = $row['name'];
@@ -986,11 +986,11 @@ 
 	* @return Array the callsign list
 	*
 	*/
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -1004,28 +1004,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
@@ -1037,7 +1037,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -1089,7 +1089,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1115,7 +1115,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -1136,7 +1136,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1161,7 +1161,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1182,7 +1182,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1229,7 +1229,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1258,7 +1258,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1279,7 +1279,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1299,7 +1299,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1347,7 +1347,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1369,8 +1369,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1378,12 +1378,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1395,7 +1395,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1417,8 +1417,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1426,12 +1426,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." marine_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1439,12 +1439,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1463,33 +1463,33 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarine($filters = array(),$year = '',$month = '')
+	public function countOverallMarine($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output";
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1502,32 +1502,32 @@ 
 	* @return Integer the number of vessels
 	*
 	*/
-	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
+	public function countOverallMarineTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
+		$queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1544,7 +1544,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1552,12 +1552,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1569,7 +1569,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1588,9 +1588,9 @@ 
 	*/
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT marine_output.marine_id
+		$query = "SELECT marine_output.marine_id
 				FROM marine_output 
 				WHERE marine_output.fammarine_id = '".$fammarine_id."'";
         
@@ -1598,7 +1598,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['marine_id'];
 		}
@@ -1623,23 +1623,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1662,63 +1662,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1735,11 +1735,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1779,7 +1779,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1827,7 +1827,7 @@ 
 		
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 
@@ -1841,11 +1841,11 @@ 
 	* @return Array the vessel type list
 	*
 	*/
-	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count, marine_output.type_id AS marine_type_id 
 		    FROM marine_output ".$filter_query." marine_output.type <> '' AND marine_output.type_id IS NOT NULL";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1865,28 +1865,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY marine_output.type, marine_output.type_id ORDER BY marine_type_count DESC";
@@ -1895,7 +1895,7 @@ 
 		$sth->execute($query_values);
 		$marine_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['marine_type'] = $row['marine_type'];
 			$temp_array['marine_type_id'] = $row['marine_type_id'];
@@ -1911,13 +1911,13 @@ 
 	* @return Array the tracker information
 	*
 	*/
-	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1925,8 +1925,8 @@ 
 				return false;
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
 					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
@@ -1938,42 +1938,42 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		if ($mmsi != "")
 		{
-			$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
+			$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
 			if (!is_numeric($mmsi))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.mmsi = :mmsi";
-				$query_values = array_merge($query_values,array(':mmsi' => $mmsi));
+				$query_values = array_merge($query_values, array(':mmsi' => $mmsi));
 			}
 		}
 		if ($imo != "")
 		{
-			$imo = filter_var($imo,FILTER_SANITIZE_STRING);
+			$imo = filter_var($imo, FILTER_SANITIZE_STRING);
 			if (!is_numeric($imo))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND marine_output.imo = :imo";
-				$query_values = array_merge($query_values,array(':imo' => $imo));
+				$query_values = array_merge($query_values, array(':imo' => $imo));
 			}
 		}
 		if ($date_posted != "")
 		{
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -2000,8 +2000,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -2019,28 +2019,28 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$query="SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance 
+				$query = "SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND marine_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and marine_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
 			} else {
-				$query="SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+				$query = "SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
 			}
 		} else {
-			$query  = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
+			$query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$marine_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$marine_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $marine_array;
 	}
 
 	public function getOrderBy()
 	{
-		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
+		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY marine_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY marine_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
 		
 		return $orderby;
 		

aircraft-statistics-time.php

Spacing +10 added lines, -10 removed lines

@@ -8,15 +8,15 @@ 
         die();
 }
 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day from %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Time of Day from %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -25,9 +25,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -53,7 +53,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByAircraft($aircraft_type);
 	print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
@@ -63,9 +63,9 @@ 
 	$hour_data = '';
 	$hour_cnt = '';
 	$last = 0;
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
-		while($last != $hour_item['hour_name']) {
+		while ($last != $hour_item['hour_name']) {
 			$hour_data .= '"'.$last.':00",';
 			$hour_cnt .= '0,';
 			$last++;
@@ -75,7 +75,7 @@ 
 		$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: "#chartHour",
 	    data: {
@@ -98,7 +98,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($hour_array as $hour_item)
+		foreach ($hour_array as $hour_item)
 		{
 			print '<tr>';
 			print '<td>'.$hour_item['hour_name'].':00</td>';

aircraft-statistics-arrival-airport.php

Spacing +8 added lines, -8 removed lines

@@ -9,15 +9,15 @@ 
         die();
 }
 
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Arrival Airports for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -26,9 +26,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -55,7 +55,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 	$airport_airport_array = $Spotter->countAllArrivalAirportsByAircraft($aircraft_type);
 	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>';
@@ -64,7 +64,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_arrival_icao_count'].'", "'.$airport_item['airport_arrival_name'].' ('.$airport_item['airport_arrival_icao'].')",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
 	}
@@ -119,7 +119,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>';

aircraft-statistics-departure-airport-country.php

Spacing +8 added lines, -8 removed lines

@@ -7,14 +7,14 @@ 
         header('Location: '.$globalURL.'/aircraft');
         die();
 }
-$aircraft_type = filter_input(INPUT_GET,'aircraft_type',FILTER_SANITIZE_STRING);
+$aircraft_type = filter_input(INPUT_GET, 'aircraft_type', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAircraft($aircraft_type, "0,1", "");
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']);
+	$title = sprintf(_("Most Common Departure Airports by Country for %s (%s)"), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/aircraft" method="get">';
@@ -23,9 +23,9 @@ 
 	$Stats = new Stats();
 	$aircraft_types = $Stats->getAllAircraftTypes();
 	if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-	foreach($aircraft_types as $aircrafttype)
+	foreach ($aircraft_types as $aircrafttype)
 	{
-		if($aircraft_type == $aircrafttype['aircraft_icao'])
+		if ($aircraft_type == $aircrafttype['aircraft_icao'])
 		{
 			print '<option value="'.$aircrafttype['aircraft_icao'].'" selected="selected">'.$aircrafttype['aircraft_name'].' ('.$aircrafttype['aircraft_icao'].')</option>';
 		} else {
@@ -51,7 +51,7 @@ 
 	include('aircraft-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."),$spotter_array[0]['aircraft_name'],$spotter_array[0]['aircraft_type']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s (%s)</strong>."), $spotter_array[0]['aircraft_name'], $spotter_array[0]['aircraft_type']).'</p>';
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAircraft($aircraft_type);
 	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>';
@@ -59,7 +59,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -107,7 +107,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

scripts/daemon-spotter.php

Spacing +196 added lines, -196 removed lines

@@ -50,20 +50,20 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
     }
 }
 
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['s']);
 } elseif (isset($options['source'])) {
     $globalSources = array();
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
     else $globalSources[] = array('host' => $options['source']);
 }
 if (isset($options['aprsserverhost'])) {
@@ -104,13 +104,13 @@ 
 else $id_source = 1;
 if (isset($globalServer) && $globalServer) {
     if ($globalDebug) echo "Using Server Mode\n";
-    $SI=new SpotterServer();
+    $SI = new SpotterServer();
 /*
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
     $SI = new adsb2aprs();
     $SI->connect();
 */
-} else $SI=new SpotterImport($Connection->db);
+} else $SI = new SpotterImport($Connection->db);
 
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
 if (isset($globalMarine) && $globalMarine) {
@@ -124,17 +124,17 @@ 
     $MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
+$SBS = new SBS();
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
-	$ACARS=new ACARS($Connection->db,true);
-	$Source=new Source($Connection->db);
+	$ACARS = new ACARS($Connection->db, true);
+	$Source = new Source($Connection->db);
 }
-$Common=new Common();
+$Common = new Common();
 date_default_timezone_set('UTC');
 //$servertz = system('date +%Z');
 // signal handler - playing nice with sockets and dump1090
 if (function_exists('pcntl_fork')) {
-    pcntl_signal(SIGINT,  function() {
+    pcntl_signal(SIGINT, function() {
         global $sockets;
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
         die("Bye!\n");
@@ -150,30 +150,30 @@ 
 
 function connect_all($hosts) {
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
     $reset++;
     if ($globalDebug) echo 'Connect to all...'."\n";
     foreach ($hosts as $id => $value) {
 	$host = $value['host'];
 	$globalSources[$id]['last_exec'] = 0;
 	// Here we check type of source(s)
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
-            if (preg_match('/deltadb.txt$/i',$host)) {
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
+            if (preg_match('/deltadb.txt$/i', $host)) {
         	//$formats[$id] = 'deltadbtxt';
         	$globalSources[$id]['format'] = 'deltadbtxt';
         	//$last_exec['deltadbtxt'] = 0;
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
         	//$formats[$id] = 'vatsimtxt';
         	$globalSources[$id]['format'] = 'vatsimtxt';
         	//$last_exec['vatsimtxt'] = 0;
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'aircraftlistjson';
         	//$last_exec['aircraftlistjson'] = 0;
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
-    	    } else if (preg_match('/opensky/i',$host)) {
+    	    } else if (preg_match('/opensky/i', $host)) {
         	//$formats[$id] = 'aircraftlistjson';
         	$globalSources[$id]['format'] = 'opensky';
         	//$last_exec['aircraftlistjson'] = 0;
@@ -190,7 +190,7 @@ 
         	    exit(0);
         	}
     	    */
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -199,37 +199,37 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'phpvmacars';
         	//$last_exec['phpvmacars'] = 0;
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
+            } else if (preg_match('/\/api\/v1\/acars\/data$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vaos';
         	//$last_exec['phpvmacars'] = 0;
         	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
         	//$formats[$id] = 'phpvmacars';
         	$globalSources[$id]['format'] = 'vam';
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
-            } else if (preg_match('/whazzup/i',$host)) {
+            } else if (preg_match('/whazzup/i', $host)) {
         	//$formats[$id] = 'whazzup';
         	$globalSources[$id]['format'] = 'whazzup';
         	//$last_exec['whazzup'] = 0;
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
-            } else if (preg_match('/blitzortung/i',$host)) {
+            } else if (preg_match('/blitzortung/i', $host)) {
         	$globalSources[$id]['format'] = 'blitzortung';
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
-            } else if (preg_match('/airwhere/i',$host)) {
+            } else if (preg_match('/airwhere/i', $host)) {
         	$globalSources[$id]['format'] = 'airwhere';
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
-            } else if (preg_match('/recentpireps/i',$host)) {
+            } else if (preg_match('/recentpireps/i', $host)) {
         	//$formats[$id] = 'pirepsjson';
         	$globalSources[$id]['format'] = 'pirepsjson';
         	//$last_exec['pirepsjson'] = 0;
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'fr24json';
         	//$last_exec['fr24json'] = 0;
@@ -238,7 +238,7 @@ 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
         	    exit(0);
         	}
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
         	//$formats[$id] = 'fr24json';
         	$globalSources[$id]['format'] = 'myshiptracking';
         	//$last_exec['fr24json'] = 0;
@@ -248,21 +248,21 @@ 
         	    exit(0);
         	}
             //} else if (preg_match('/10001/',$host)) {
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
         	//$formats[$id] = 'tsv';
         	$globalSources[$id]['format'] = 'tsv';
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
             }
-        } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
+        } elseif (filter_var($host, FILTER_VALIDATE_URL)) {
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
     		    if ($idf !== false) {
     			$httpfeeds[$id] = $idf;
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
     		} elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
-	    $hostport = explode(':',$host);
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
+	    $hostport = explode(':', $host);
 	    if (isset($hostport[1])) {
 		$port = $hostport[1];
 		$hostn = $hostport[0];
@@ -272,19 +272,19 @@ 
 	    }
 	    $Common = new Common();
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
     	    } else {
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
 	    }
 	    if ($s) {
     	        $sockets[$id] = $s;
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
 			//$formats[$id] = 'aprs';
 			$globalSources[$id]['format'] = 'aprs';
 			//$aprs_connect = 0;
 			//$use_aprs = true;
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
 			$globalSources[$id]['format'] = 'vrstcp';
     		    } elseif ($port == '10001') {
         		//$formats[$id] = 'tsv';
@@ -323,7 +323,7 @@ 
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
 else $timeout = 20;
 $errno = '';
-$errstr='';
+$errstr = '';
 
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
 /* Initiate connections to all the hosts simultaneously */
@@ -331,7 +331,7 @@ 
 //connect_all($globalSources);
 
 if (isset($globalProxy) && $globalProxy) {
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
 } else {
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
 }
@@ -361,16 +361,16 @@ 
 
 if ($use_aprs) {
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
-	$APRS=new APRS();
+	$APRS = new APRS();
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
 	if ($aprs_full) $aprs_filter = '';
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
 	else $aprs_pass = '-1';
@@ -384,12 +384,12 @@ 
 sleep(1);
 if ($globalDebug) echo "SCAN MODE \n\n";
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
-$endtime = time()+$globalCronEnd;
+$endtime = time() + $globalCronEnd;
 $i = 1;
 $tt = array();
 // Delete all ATC
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -397,7 +397,7 @@ 
 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
 while ($i > 0) {
-    if (!$globalDaemon) $i = $endtime-time();
+    if (!$globalDaemon) $i = $endtime - time();
     // Delete old ATC
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -411,7 +411,7 @@ 
 	}
 	if ($max != $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -430,8 +430,8 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
     		if ($line != '' && count($line) > 7) {
     		    $line = explode(',', $line);
@@ -464,11 +464,11 @@ 
 	    )
 	) {
 	    date_default_timezone_set('CET');
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
 	    date_default_timezone_set('UTC');
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
 		if ($line != '') {
 		    //echo "'".$line."'\n";
@@ -476,7 +476,7 @@ 
 		    $ais_data = $AIS->parse_line(trim($line));
 		    $data = array();
 		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -488,7 +488,7 @@ 
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 		    if (isset($ais_data['timestamp'])) {
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
 			    $add = true;
@@ -511,21 +511,21 @@ 
 	    $w = $e = null;
 	    
 	    if (isset($arr[$id])) {
-		$nn = stream_select($arr,$w,$e,$timeout);
+		$nn = stream_select($arr, $w, $e, $timeout);
 		if ($nn > 0) {
 		    foreach ($httpfeeds as $feed) {
-			$buffer = stream_get_line($feed,2000,"\n");
+			$buffer = stream_get_line($feed, 2000, "\n");
 			if ($buffer === FALSE) {
 			    connect_all($globalSources);
 			}
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-			$buffer = explode('\n',$buffer);
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+			$buffer = explode('\n', $buffer);
 			foreach ($buffer as $line) {
 			    if ($line != '') {
 				$ais_data = $AIS->parse_line(trim($line));
 				$data = array();
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -537,9 +537,9 @@ 
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 				if (isset($ais_data['timestamp'])) {
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 				} else {
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				}
@@ -571,10 +571,10 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		//echo $buffer;
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		//print_r($all_data);
 		if (isset($all_data[0]['DATA'])) {
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -583,7 +583,7 @@ 
 			    $data['ident'] = $line['NAME'];
 			    $data['mmsi'] = $line['MMSI'];
 			    if (strlen($data['mmsi']) > 9) {
-				$data['mmsi'] = substr($data['mmsi'],-9);
+				$data['mmsi'] = substr($data['mmsi'], -9);
 			    }
 			    $data['speed'] = $line['SOG'];
 			    $data['heading'] = $line['COG'];
@@ -593,8 +593,8 @@ 
 			    //$data['type_id'] = $line['TYPE'];
 			    $data['imo'] = $line['IMO'];
 			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s', strtotime($line['ARV']));
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
 			    $data['format_source'] = 'myshiptracking';
 			    $data['id_source'] = $id_source;
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -611,16 +611,16 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
 	    )
 	) {
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data[0]['mmsi'])) {
 		    foreach ($all_data as $line) {
 			if ($line != '') {
 			    $data = array();
 			    $data['ident'] = $line['shipname'];
 			    $data['callsign'] = $line['callsign'];
-			    $data['mmsi'] = substr($line['mmsi'],-9);
+			    $data['mmsi'] = substr($line['mmsi'], -9);
 			    $data['speed'] = $line['sog'];
 			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
 			    $data['latitude'] = $line['latitude'];
@@ -647,14 +647,14 @@ 
 	) {
 	    $buffer = $Common->getData($value['host']);
 	    if ($buffer != '') {
-		$all_data = json_decode($buffer,true);
+		$all_data = json_decode($buffer, true);
 		if (isset($all_data['features'][0]['id'])) {
 		    foreach ($all_data['features'] as $line) {
 			print_r($line);
 			$data = array();
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
+			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9);
 			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
 			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
 			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
@@ -681,31 +681,31 @@ 
 	    )
 	) {
 	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
 	    echo 'done !'."\n";
 	    // FIXME: Need more work
 	    if ($buffer != '') $reset = 0;
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    foreach ($buffer as $line) {
 		if ($line != '') {
 		    $data = array();
 		    echo $line."\n";
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
-		    $data['status_id'] = substr($line,21,2);
-		    $data['type_id'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
+		    $data['mmsi'] = (int) substr($line, 0, 9);
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
+		    $data['status_id'] = substr($line, 21, 2);
+		    $data['type_id'] = substr($line, 24, 3);
+		    $data['latitude'] = substr($line, 29, 9);
+		    $data['longitude'] = substr($line, 41, 9);
+		    $data['speed'] = round(substr($line, 51, 5));
 		    //$data['course'] = substr($line,57,5);
-		    $data['heading'] = round(substr($line,63,3));
+		    $data['heading'] = round(substr($line, 63, 3));
 		    //$data['draft'] = substr($line,67,4);
 		    //$data['length'] = substr($line,72,3);
 		    //$data['beam'] = substr($line,76,2);
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
+		    $data['ident'] = trim(utf8_encode(substr($line, 78, 20)));
 		    //$data['callsign'] = trim(substr($line,100,7);
-		    $data['arrival_code'] = substr($line,108,20);
+		    $data['arrival_code'] = substr($line, 108, 20);
 		    //$data['etaDate'] = substr($line,129,5);
 		    //$data['etaTime'] = substr($line,135,5);
 		    $data['format_source'] = 'shipplotter';
@@ -736,8 +736,8 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-	    $buffer = explode('\n',$buffer);
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+	    $buffer = explode('\n', $buffer);
 	    $reset = 0;
 	    foreach ($buffer as $line) {
     		if ($line != '') {
@@ -748,7 +748,7 @@ 
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
 			$data['pilot_id'] = $line[1];
 			$data['pilot_name'] = $line[2];
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
 			$data['ident'] = $line[0]; // ident
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
 			$data['speed'] = $line[8]; // speed
@@ -764,7 +764,7 @@ 
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
 			//if (isset($line[37])) $data['last_update'] = $line[37];
 		        $data['departure_airport_icao'] = $line[11];
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
 		        $data['arrival_airport_icao'] = $line[13];
 			$data['frequency'] = $line[4];
 			$data['type'] = $line[18];
@@ -773,7 +773,7 @@ 
     			$data['id_source'] = $id_source;
 	    		//$data['arrival_airport_time'] = ;
 	    		if ($line[9] != '') {
-	    		    $aircraft_data = explode('/',$line[9]);
+	    		    $aircraft_data = explode('/', $line[9]);
 	    		    if (isset($aircraft_data[1])) {
 	    			$data['aircraft_icao'] = $aircraft_data[1];
 	    		    }
@@ -788,9 +788,9 @@ 
     			if ($line[3] == 'PILOT') $SI->add($data);
 			elseif ($line[3] == 'ATC') {
 				//print_r($data);
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
-				$typec = substr($data['ident'],-3);
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+				$typec = substr($data['ident'], -3);
 				if ($typec == 'APP') $data['type'] = 'Approach';
 				elseif ($typec == 'TWR') $data['type'] = 'Tower';
 				elseif ($typec == 'OBS') $data['type'] = 'Observer';
@@ -802,8 +802,8 @@ 
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
 				if (!isset($data['source_name'])) $data['source_name'] = '';
 				if (isset($ATC)) {
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
+					else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
 				}
 			}
     			unset($data);
@@ -819,24 +819,24 @@ 
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
     	    )
     	) {
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
-			$data['latitude'] = (float)$line['pktLatitude'];
-			$data['longitude'] = (float)$line['pktLongitude'];
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
+			$data['latitude'] = (float) $line['pktLatitude'];
+			$data['longitude'] = (float) $line['pktLongitude'];
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['pilot_id'] = (int)$line['pktPilotID'];
+			$data['pilot_id'] = (int) $line['pktPilotID'];
 			$data['aircraft_icao'] = 'PARAGLIDER';
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
 			$data['format_source'] = $value['format'];
 			$SI->add($data);
@@ -844,22 +844,22 @@ 
 		}
 	    }
 	    $Source->deleteOldLocationByType('gs');
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
 		$all_data = simplexml_load_string($buffer);
-		foreach($all_data->children() as $childdata) {
+		foreach ($all_data->children() as $childdata) {
 			$data = array();
 			$line = $childdata;
-			$data['id'] = (int)$line['gsID'];
-			$data['latitude'] = (float)$line['gsLatitude'];
-			$data['longitude'] = (float)$line['gsLongitude'];
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
+			$data['id'] = (int) $line['gsID'];
+			$data['latitude'] = (float) $line['gsLatitude'];
+			$data['longitude'] = (float) $line['gsLongitude'];
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
 			$data['altitude_relative'] = 'AMSL';
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			} else {
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
 			}
 			unset($data);
 		}
@@ -877,9 +877,9 @@ 
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
 	    )
 	) {
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
 	    if ($buffer != '') {
-	        $all_data = json_decode($buffer,true);
+	        $all_data = json_decode($buffer, true);
 		if (isset($all_data['acList'])) {
 		    $reset = 0;
 		    foreach ($all_data['acList'] as $line) {
@@ -895,7 +895,7 @@ 
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
 			$data['emergency'] = ''; // emergency
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			//$data['datetime'] = date('Y-m-d H:i:s');
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -920,7 +920,7 @@ 
 			$data['verticalrate'] = $line['vrt']; // verticale rate
 			$data['squawk'] = $line['squawk']; // squawk
 			$data['emergency'] = ''; // emergency
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
 			else $data['datetime'] = date('Y-m-d H:i:s');
 			$data['format_source'] = 'aircraftlistjson';
 			$data['id_source'] = $id_source;
@@ -941,7 +941,7 @@ 
     	    )
     	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['planes'])) {
 		$reset = 0;
 		foreach ($all_data['planes'] as $key => $line) {
@@ -958,12 +958,12 @@ 
 		    $data['emergency'] = ''; // emergency
 		    $data['registration'] = $line[2];
 		    $data['aircraft_icao'] = $line[0];
-		    $deparr = explode('-',$line[1]);
+		    $deparr = explode('-', $line[1]);
 		    if (count($deparr) == 2) {
 			$data['departure_airport_icao'] = $deparr[0];
 			$data['arrival_airport_icao'] = $deparr[1];
 		    }
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
 	    	    $data['format_source'] = 'planeupdatefaa';
     		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -981,7 +981,7 @@ 
 	    )
 	) {
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (isset($all_data['states'])) {
 		$reset = 0;
 		foreach ($all_data['states'] as $key => $line) {
@@ -998,7 +998,7 @@ 
 		    //$data['emergency'] = ''; // emergency
 		    //$data['registration'] = $line[2];
 		    //$data['aircraft_icao'] = $line[0];
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
 		    $data['format_source'] = 'opensky';
 		    $data['id_source'] = $id_source;
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1017,7 +1017,7 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if (!empty($all_data)) $reset = 0;
 	    foreach ($all_data as $key => $line) {
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1055,11 +1055,11 @@ 
 	    )
 	) {
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
 	    //echo $buffer;
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
-	    $all_data = json_decode($buffer,true);
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
+	    $all_data = json_decode($buffer, true);
 	    if (json_last_error() != JSON_ERROR_NONE) {
 		die(json_last_error_msg());
 	    }
@@ -1082,7 +1082,7 @@ 
 			//$data['departure_airport_iata'] = $line[11];
 			//$data['arrival_airport_iata'] = $line[12];
 	    		//$data['emergency'] = ''; // emergency
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
 	    		$data['format_source'] = 'radarvirtueljson';
     			$data['id_source'] = $id_source;
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1103,14 +1103,14 @@ 
 	) {
 	    //$buffer = $Common->getData($hosts[$id]);
 	    $buffer = $Common->getData($value['host'].'?'.time());
-	    $all_data = json_decode(utf8_encode($buffer),true);
+	    $all_data = json_decode(utf8_encode($buffer), true);
 	    
 	    if (isset($all_data['pireps'])) {
 		$reset = 0;
 	        foreach ($all_data['pireps'] as $line) {
 		    $data = array();
 		    $data['id'] = $line['id'];
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
 		    $data['ident'] = $line['callsign']; // ident
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1140,9 +1140,9 @@ 
 			$SI->add($data);
 		    //    print_r($data);
     		    } elseif ($line['icon'] == 'ct') {
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
-			$typec = substr($data['ident'],-3);
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
+			$typec = substr($data['ident'], -3);
 			$data['type'] = '';
 			if ($typec == 'APP') $data['type'] = 'Approach';
 			elseif ($typec == 'TWR') $data['type'] = 'Tower';
@@ -1153,7 +1153,7 @@ 
 			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
 			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 			else $data['type'] = 'Observer';
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
+			if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']);
 		    }
 		    unset($data);
 		}
@@ -1170,14 +1170,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1192,7 +1192,7 @@ 
 	    	    //$data['datetime'] = $line['lastupdate'];
 	    	    //$data['last_update'] = $line['lastupdate'];
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1208,14 +1208,14 @@ 
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
 		    if (isset($line['aircraftname'])) {
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
-	    		$aircraft_data = explode('-',$line['aircraftname']);
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
+	    		$aircraft_data = explode('-', $line['aircraftname']);
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
 	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
 	    		}
 	    	    }
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1240,7 +1240,7 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
 		$reset = 0;
 		foreach ($all_data['ACARSData'] as $line) {
@@ -1251,7 +1251,7 @@ 
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
 	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
 	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
+	    	    $data['ident'] = str_replace(' ', '', $line['bid']['flightnum']); // ident
 	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
 	    	    $data['altitude'] = $line['altitude']; // altitude
 	    	    $data['speed'] = $line['groundspeed']; // speed
@@ -1262,7 +1262,7 @@ 
 	    	    //$data['squawk'] = ''; // squawk
 	    	    //$data['emergency'] = ''; // emergency
 	    	    if (isset($value['timezone'])) {
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
+	    		$datetime = new DateTime($line['updated_at'], new DateTimeZone($value['timezone']));
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1298,14 +1298,14 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '' && is_array($all_data)) {
 		$reset = 0;
 		foreach ($all_data as $line) {
 	    	    $data = array();
 	    	    //$data['id'] = $line['id']; // id not usable
 	    	    $data['id'] = trim($line['flight_id']);
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
 	    	    $data['pilot_name'] = $line['pilot_name'];
 	    	    $data['pilot_id'] = $line['pilot_id'];
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1349,24 +1349,24 @@ 
 	    //$buffer = $Common->getData($hosts[$id]);
 	    if ($globalDebug) echo 'Get Data...'."\n";
 	    $buffer = $Common->getData($value['host']);
-	    $all_data = json_decode($buffer,true);
+	    $all_data = json_decode($buffer, true);
 	    if ($buffer != '') {
 		$Source->deleteLocationBySource('blitzortung');
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-		$buffer = explode('\n',$buffer);
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
+		$buffer = explode('\n', $buffer);
 		foreach ($buffer as $buffer_line) {
-		    $line = json_decode($buffer_line,true);
+		    $line = json_decode($buffer_line, true);
 		    if (isset($line['time'])) {
 			$data = array();
 			$data['altitude'] = $line['alt']; // altitude
 			$data['latitude'] = $line['lat']; // lat
 			$data['longitude'] = $line['lon']; // long
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
 			$data['id_source'] = $id_source;
 			$data['format_source'] = 'blitzortung';
 			$SI->add($data);
 			if ($globalDebug) echo '☈ Lightning added'."\n";
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
 			unset($data);
 		    }
 		}
@@ -1391,11 +1391,11 @@ 
 		    //$value = $formats[$nb];
 		    $format = $globalSources[$nb]['format'];
 		    if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
 		    } elseif ($format == 'vrstcp') {
 			$buffer = @socket_read($r, 6000);
 		    } else {
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
 		    }
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
 		    //echo $buffer."\n";
@@ -1405,8 +1405,8 @@ 
 		    //$SI::del();
 		    if ($buffer !== FALSE) {
 			if ($format == 'vrstcp') {
-			    $buffer = explode('},{',$buffer);
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+			    $buffer = explode('},{', $buffer);
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
 		    }
 		    // SBS format is CSV format
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1430,7 +1430,7 @@ 
 			    $ais_data = $AIS->parse_line(trim($buffer));
 			    $data = array();
 			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
+			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
 			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
 			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
 			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -1441,13 +1441,13 @@ 
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
 
 			    if (isset($ais_data['timestamp'])) {
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
 			    } else {
 				$data['datetime'] = date('Y-m-d H:i:s');
 			    }
@@ -1458,10 +1458,10 @@ 
                         } elseif ($format == 'flightgearsp') {
                     	    //echo $buffer."\n";
                     	    if (strlen($buffer) > 5) {
-				$line = explode(',',$buffer);
+				$line = explode(',', $buffer);
 				$data = array();
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
 				$data['ident'] = $line[6];
 				$data['aircraft_name'] = $line[7];
 				$data['longitude'] = $line[1];
@@ -1478,16 +1478,16 @@ 
                         } elseif ($format == 'acars') {
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
 			    $ACARS->add(trim($buffer));
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
 			    $ACARS->deleteLiveAcarsData();
 			} elseif ($format == 'flightgearmp') {
-			    if (substr($buffer,0,1) != '#') {
+			    if (substr($buffer, 0, 1) != '#') {
 				$data = array();
 				//echo $buffer."\n";
-				$line = explode(' ',$buffer);
+				$line = explode(' ', $buffer);
 				if (count($line) == 11) {
-				    $userserver = explode('@',$line[0]);
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
+				    $userserver = explode('@', $line[0]);
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
 				    $data['ident'] = $userserver[0];
 				    $data['registration'] = $userserver[0];
 				    $data['latitude'] = $line[4];
@@ -1495,8 +1495,8 @@ 
 				    $data['altitude'] = $line[6];
 				    $data['datetime'] = date('Y-m-d H:i:s');
 				    $aircraft_type = $line[10];
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
 				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				}
@@ -1505,8 +1505,8 @@ 
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
 			    die;
 			} elseif ($format == 'vrstcp') {
-			    foreach($buffer as $all_data) {
-				$line = json_decode('{'.$all_data.'}',true);
+			    foreach ($buffer as $all_data) {
+				$line = json_decode('{'.$all_data.'}', true);
 				$data = array();
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1532,16 +1532,16 @@ 
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
 				unset($data);
 			    }
-			} elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') {
+			} elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') {
 			    $line = explode("\t", $buffer);
-			    for($k = 0; $k < count($line); $k=$k+2) {
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
 				$key = $line[$k];
-			        $lined[$key] = $line[$k+1];
+			        $lined[$key] = $line[$k + 1];
 			    }
     			    if (count($lined) > 3) {
     				$data['hex'] = $lined['hexid'];
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
-    				$data['datetime'] = date('Y-m-d H:i:s');;
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1560,23 +1560,23 @@ 
     			    } else $error = true;
 			} elseif ($format == 'aprs' && $use_aprs) {
 			    if ($aprs_connect == 0) {
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
 				$aprs_connect = 1;
 			    }
 			    
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
 				$aprs_last_tx = time();
 				$data_aprs = "# Keep alive";
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
 			    
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
 			    //echo 'APRS data : '.$buffer."\n";
-			    $buffer = str_replace('APRS <- ','',$buffer);
-			    $buffer = str_replace('APRS -> ','',$buffer);
+			    $buffer = str_replace('APRS <- ', '', $buffer);
+			    $buffer = str_replace('APRS -> ', '', $buffer);
 			    //echo $buffer."\n";
 			    date_default_timezone_set('UTC');
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
 				$line = $APRS->parse($buffer);
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1591,7 +1591,7 @@ 
 				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
 				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
 				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
 				    else $data['datetime'] = date('Y-m-d H:i:s');
 				    //$data['datetime'] = date('Y-m-d H:i:s');
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1674,29 +1674,29 @@ 
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
 					$Source->deleteOldLocationByType('gs');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
 					}
 				    } elseif (isset($line['symbol']) && $line['symbol'] == 'Weather Station') {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '# Weather Station added'."\n";
 					$Source->deleteOldLocationByType('wx');
 					$weather_data = json_encode($line);
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
 					}
 				    } elseif (isset($line['symbol']) && ($line['symbol'] == 'Lightning' || $line['symbol'] == 'Thunderstorm')) {
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
 					if ($globalDebug) echo '☈ Lightning added'."\n";
 					$Source->deleteOldLocationByType('lightning');
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					} else {
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
 					}
 				    } elseif ($globalDebug) {
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1705,7 +1705,7 @@ 
 				    unset($data);
 				}
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
 				}
 				/*
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) {
@@ -1714,7 +1714,7 @@ 
 				*/
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
 				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
 					$Source->deleteOldLocationByType('lightning');
 					$Source->deleteOldLocationByType('wx');
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1799,7 +1799,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    } 
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -1809,14 +1809,14 @@ 
 	    } else {
 		$error = socket_strerror(socket_last_error());
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
 			if (isset($globalDebug)) echo "Restarting...\n";
 			// Restart the script if possible
 			if (is_array($sockets)) {
 			    if ($globalDebug) echo "Shutdown all sockets...";
 			    
 			    foreach ($sockets as $sock) {
-				@socket_shutdown($sock,2);
+				@socket_shutdown($sock, 2);
 				@socket_close($sock);
 			    }
 			    

require/class.MarineImport.php

Spacing +88 added lines, -88 removed lines

@@ -59,7 +59,7 @@ 
 		if (isset($this->all_tracked[$key]['id'])) {
 		    //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
     		    $Marine = new Marine($this->db);
-    		    $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+    		    $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
 		}
 	    }
 	}
@@ -71,7 +71,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
+        	if ($flight['lastupdate'] < (time() - 3000)) {
             	    if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
             		if (isset($this->all_tracked[$key]['id'])) {
             		    if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
@@ -83,7 +83,7 @@ 
             		    //$real_arrival = $this->arrival($key);
             		    $Marine = new Marine($this->db);
             		    if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
-				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+				$result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			    }
 			    // Put in archive
@@ -97,14 +97,14 @@ 
     }
 
     public function add($line) {
-	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine;
+	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine;
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02';
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && isset($line['mmsi'])) {
+	if (is_array($line) && isset($line['mmsi'])) {
 	    //print_r($line);
   	    if (isset($line['mmsi'])) {
 
@@ -129,25 +129,25 @@ 
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'status_id' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => ''));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi')));
+		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id']));
 		    if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi']));
 		    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			$Marine = new Marine($this->db);
 			$identity = $Marine->getIdentity($line['mmsi']);
 			if (!empty($identity)) {
 			    $this->all_tracked[$id]['ident'] = $identity['ship_name'];
 			    $this->all_tracked[$id]['type'] = $identity['type'];
-			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($identity['type'])));
+			    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($identity['type'])));
 			}
 			//print_r($identity);
 			unset($Marine);
@@ -155,23 +155,23 @@ 
 		    }
 		}
 		if (isset($line['type_id'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $line['type_id']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $line['type_id']));
 		}
 		if (isset($line['type']) && $line['type'] != '' && $this->all_tracked[$id]['type'] == '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('typeid' => $AIS->getShipTypeID($line['type'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('typeid' => $AIS->getShipTypeID($line['type'])));
 		}
 		if (isset($line['status']) && $line['status'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status']));
 		}
 		if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status_id' => $line['status_id']));
 		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Marine = new Marine($this->db);
-				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']);
+				$Marine->updateStatusMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['status']);
 				unset($Marine);
 			    }
 			}
@@ -180,24 +180,24 @@ 
 
 
 		if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type']));
 		}
 		if (isset($line['imo']) && $line['imo'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo']));
 		}
 		if (isset($line['callsign']) && $line['callsign'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign']));
 		}
 		if (isset($line['arrival_code']) && $line['arrival_code'] != '') {
 		    if (!isset($this->all_tracked[$id]['arrival_code'])) {
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code']));
 			if ($globalDebug) echo $this->all_tracked[$id]['id'].' => New arrival: '.$line['arrival_code']."\n";
 			if ($this->all_tracked[$id]['addedMarine'] != 0) {
 			    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Marine = new Marine($this->db);
 				    $fromsource = NULL;
-				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['arrival_code'],$fromsource);
+				    $Marine->updateArrivalPortNameMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['arrival_code'], $fromsource);
 				    $Marine->db = null;
 				}
 			    }
@@ -213,7 +213,7 @@ 
 		    }
 		}
 		if (isset($line['arrival_date']) && $line['arrival_date'] != '') {
-		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date']));
+		    if (strtotime($line['arrival_date']) > time()) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date']));
 		}
 
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
@@ -222,44 +222,44 @@ 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			    $timeelapsed = microtime(true);
 			    $Marine = new Marine($this->db);
-			    $Marine->addIdentity($this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['type']);
+			    $Marine->addIdentity($this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['type']);
 			    $Marine->db = null;
 			}
 		    }
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident'])));
 		    if ($this->all_tracked[$id]['addedMarine'] == 1) {
 			if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$timeelapsed = microtime(true);
 				$Marine = new Marine($this->db);
 				$fromsource = NULL;
-				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+				$result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 				$Marine->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			    }
 			}
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident']));
 		}
 
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-30*60 && strtotime($line['datetime']) < time()+20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 30*60 && strtotime($line['datetime']) < time() + 20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) {
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n";
 				return '';
 		    }
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time()-30*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) <= time() - 30*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\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 ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!\n";
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s')));
 		} else {
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." date: ".$line['datetime']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -267,24 +267,24 @@ 
 
 
 		if (isset($line['speed'])) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm');
 		    if ($distance > 1000 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -293,10 +293,10 @@ 
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Marine = new Marine($this->db);
-				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+				    $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 				    if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
 				    $Marine->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
@@ -305,55 +305,55 @@ 
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
-				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
-				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude']));
 			}
 
 		    } else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -";
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading)));
+		    if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
@@ -363,7 +363,7 @@ 
 		if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) {
 		    $this->all_tracked[$id]['lastupdate'] = time();
 		    if ($this->all_tracked[$id]['addedMarine'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    if ($globalDebug) echo "Check if vessel is already in DB...";
@@ -371,37 +371,37 @@ 
 				    $MarineLive = new MarineLive($this->db);
 				    if (isset($line['id'])) {
 					$recent_ident = $MarineLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') {
 					$recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 					$recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } else $recent_ident = '';
-				    $MarineLive->db=null;
+				    $MarineLive->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_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0));
 			    }
 			    //if there was no vessel with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
+			    if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '')
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : ";
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi')));
 				    if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $timeelapsed = microtime(true);
 					    $Marine = new Marine($this->db);
-					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+					    $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']);
 					    $Marine->db = null;
 					    if ($globalDebug && isset($result)) echo $result."\n";
-					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 					}
 				    }
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
@@ -409,15 +409,15 @@ 
 					$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_marine',$date);
-				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date);
+				    	    	    if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_marine', $date);
+				    	    	    if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_marine', $date);
 				    		    if (isset($sourced['msg'])) {
 				    			if (time() - $sourced['msg']['date'] > 10) {
 				    		    	    $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		    	    echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date);
+				    		    	    echo $Stats->addStatSource($nbmsg, $source, 'msg_marine', $date);
 			    			    	    unset($this->stats[$date][$source]['msg']);
 			    				}
 			    			    }
@@ -441,7 +441,7 @@ 
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$MarineLive = new MarineLive($this->db);
 					$MarineLive->deleteLiveMarineData();
-					$MarineLive->db=null;
+					$MarineLive->db = null;
 					if ($globalDebug) echo " Done\n";
 				    }
 				    $this->last_delete = time();
@@ -452,7 +452,7 @@ 
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    if (isset($globalDaemon) && !$globalDaemon) {
 					$Marine = new Marine($this->db);
-					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
+					$Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']);
 					$Marine->db = null;
 				    }
 				}
@@ -467,20 +467,20 @@ 
 		    $ignoreImport = false;
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				if (!isset($globalNoImport) || $globalNoImport !== TRUE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$timeelapsed = microtime(true);
 					$MarineLive = new MarineLive($this->db);
-					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
+					$result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
 					$MarineLive->db = null;
 					if ($globalDebug) echo $result."\n";
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) {
-				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
+				    $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
 				}
 				$this->all_tracked[$id]['putinarchive'] = false;
 
@@ -499,19 +499,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_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!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;
@@ -526,9 +526,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;
@@ -540,7 +540,7 @@ 
 
 				$this->all_tracked[$id]['lastupdate'] = time();
 				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			

require/class.AIS.php

Spacing +129 added lines, -129 removed lines

@@ -117,31 +117,31 @@ 
 
 	private function make_latf($temp) { // unsigned long 
 		$flat = 0.0; // float
-		$temp = $temp & 0x07FFFFFF;
-		if ($temp & 0x04000000) {
-			$temp = $temp ^ 0x07FFFFFF;
+		$temp = $temp&0x07FFFFFF;
+		if ($temp&0x04000000) {
+			$temp = $temp^0x07FFFFFF;
 			$temp += 1;
-			$flat = (float)($temp / (60.0 * 10000.0));
+			$flat = (float) ($temp/(60.0*10000.0));
 			$flat *= -1.0;
-		} else $flat = (float)($temp / (60.0 * 10000.0));
+		} else $flat = (float) ($temp/(60.0*10000.0));
 		return $flat; // float
 	}
 
 	private function make_lonf($temp) { // unsigned long
 		$flon = 0.0; // float
-		$temp = $temp & 0x0FFFFFFF;
-		if ($temp & 0x08000000) {
-			$temp = $temp ^ 0x0FFFFFFF;
+		$temp = $temp&0x0FFFFFFF;
+		if ($temp&0x08000000) {
+			$temp = $temp^0x0FFFFFFF;
 			$temp += 1;
-			$flon = (float)($temp / (60.0 * 10000.0));
+			$flon = (float) ($temp/(60.0*10000.0));
 			$flon *= -1.0;
-		} else $flon = (float)($temp / (60.0 * 10000.0));
+		} else $flon = (float) ($temp/(60.0*10000.0));
 		return $flon;
 	}
 
 	private function ascii_2_dec($chr) {
-		$dec=ord($chr);//get decimal ascii code
-		$hex=dechex($dec);//convert decimal to hex
+		$dec = ord($chr); //get decimal ascii code
+		$hex = dechex($dec); //convert decimal to hex
 		return ($dec);
 	}
 	
@@ -160,15 +160,15 @@ 
 		//only process in the following range: 48-87, 96-119
 		if ($ascii < 48) { }
 		else {
-			if($ascii>119) { }
+			if ($ascii > 119) { }
 			else {
-				if ($ascii>87 && $ascii<96) ;
+				if ($ascii > 87 && $ascii < 96);
 				else {
-					$ascii=$ascii+40;
-					if ($ascii>128){
-						$ascii=$ascii+32;
+					$ascii = $ascii + 40;
+					if ($ascii > 128) {
+						$ascii = $ascii + 32;
 					} else {
-						$ascii=$ascii+40;
+						$ascii = $ascii + 40;
 					}
 				}
 			}
@@ -177,7 +177,7 @@ 
 	}
 
 	private function dec_2_6bit($dec) {
-		$bin=decbin($dec);
+		$bin = decbin($dec);
 		return(substr($bin, -6)); 
 	}
 
@@ -195,11 +195,11 @@ 
 		);
 		// "
 		$rv = '';
-		if ($_size % 6 == 0) {
-			$len = $_size / 6;
-			for ($i=0; $i<$len; $i++) {
-				$offset = $i * 6;
-				$rv .= $ais_chars[ bindec(substr($_str,$_start + $offset,6)) ];
+		if ($_size%6 == 0) {
+			$len = $_size/6;
+			for ($i = 0; $i < $len; $i++) {
+				$offset = $i*6;
+				$rv .= $ais_chars[bindec(substr($_str, $_start + $offset, 6))];
 			}
 		}
 		return $rv;
@@ -226,93 +226,93 @@ 
 		$ro->eta_hour = '';
 		$ro->eta_minute = '';
 		$ro->ts = time();
-		$ro->id = bindec(substr($_aisdata,0,6));
-		$ro->mmsi = bindec(substr($_aisdata,8,30));
+		$ro->id = bindec(substr($_aisdata, 0, 6));
+		$ro->mmsi = bindec(substr($_aisdata, 8, 30));
 		if ($ro->id >= 1 && $ro->id <= 3) {
-			$ro->cog = bindec(substr($_aisdata,116,12))/10;
-			$ro->sog = bindec(substr($_aisdata,50,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
+			$ro->cog = bindec(substr($_aisdata, 116, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 50, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 4) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,79,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,107,27)));
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 79, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 107, 27)));
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 5) {
-			$ro->imo = bindec(substr($_aisdata,40,30));
-			$ro->callsign = $this->binchar($_aisdata,70,42);
-			$ro->name = $this->binchar($_aisdata,112,120);
-			$ro->typeid = bindec(substr($_aisdata,232,8));
+			$ro->imo = bindec(substr($_aisdata, 40, 30));
+			$ro->callsign = $this->binchar($_aisdata, 70, 42);
+			$ro->name = $this->binchar($_aisdata, 112, 120);
+			$ro->typeid = bindec(substr($_aisdata, 232, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,240,9));
 			//$ro->to_stern = bindec(substr($_aisdata,249,9));
 			//$ro->to_port = bindec(substr($_aisdata,258,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,264,6));
-			$ro->eta_month = bindec(substr($_aisdata,274,4));
-			$ro->eta_day = bindec(substr($_aisdata,278,5));
-			$ro->eta_hour = bindec(substr($_aisdata,283,5));
-			$ro->eta_minute = bindec(substr($_aisdata,288,6));
+			$ro->eta_month = bindec(substr($_aisdata, 274, 4));
+			$ro->eta_day = bindec(substr($_aisdata, 278, 5));
+			$ro->eta_hour = bindec(substr($_aisdata, 283, 5));
+			$ro->eta_minute = bindec(substr($_aisdata, 288, 6));
 			//$ro->draught = bindec(substr($_aisdata,294,8));
-			$ro->destination = $this->binchar($_aisdata,302,120);
+			$ro->destination = $this->binchar($_aisdata, 302, 120);
 			$ro->cls = 1; // class A
 		} else if ($ro->id == 9) {
 			// Search and Rescue aircraft position report
 		} else if ($ro->id == 18) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,57,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,85,27)));
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 57, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 85, 27)));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 19) {
-			$ro->cog = bindec(substr($_aisdata,112,12))/10;
-			$ro->sog = bindec(substr($_aisdata,46,10))/10;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,61,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,89,27)));
-			$ro->name = $this->binchar($_aisdata,143,120);
+			$ro->cog = bindec(substr($_aisdata, 112, 12))/10;
+			$ro->sog = bindec(substr($_aisdata, 46, 10))/10;
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 61, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 89, 27)));
+			$ro->name = $this->binchar($_aisdata, 143, 120);
 			$ro->cls = 2; // class B
-			$ro->heading = bindec(substr($_aisdata,124,9));
+			$ro->heading = bindec(substr($_aisdata, 124, 9));
 			if ($ro->heading == 511) $ro->heading = '';
-			$ro->typeid = bindec(substr($_aisdata,263,8));
+			$ro->typeid = bindec(substr($_aisdata, 263, 8));
 			$ro->type = $this->getShipType($ro->typeid);
 			//$ro->to_bow = bindec(substr($_aisdata,271,9));
 			//$ro->to_stern = bindec(substr($_aisdata,280,9));
 			//$ro->to_port = bindec(substr($_aisdata,289,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,295,6));
 		} else if ($ro->id == 21) {
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,164,28)));
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,192,27)));
-			$ro->name = $this->binchar($_aisdata,43,120);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 164, 28)));
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 192, 27)));
+			$ro->name = $this->binchar($_aisdata, 43, 120);
 			//$ro->to_bow = bindec(substr($_aisdata,219,9));
 			//$ro->to_stern = bindec(substr($_aisdata,228,9));
 			//$ro->to_port = bindec(substr($_aisdata,237,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,243,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 24) {
-			$pn = bindec(substr($_aisdata,38,2));
+			$pn = bindec(substr($_aisdata, 38, 2));
 			if ($pn == 0) {
-				$ro->name = $this->binchar($_aisdata,40,120);
+				$ro->name = $this->binchar($_aisdata, 40, 120);
 			}
-			$ro->typeid = bindec(substr($_aisdata,40,8));
+			$ro->typeid = bindec(substr($_aisdata, 40, 8));
 			$ro->type = $this->getShipType($ro->typeid);
-			$ro->callsign = $this->binchar($_aisdata,90,42);
+			$ro->callsign = $this->binchar($_aisdata, 90, 42);
 			//$ro->to_bow = bindec(substr($_aisdata,132,9));
 			//$ro->to_stern = bindec(substr($_aisdata,141,9));
 			//$ro->to_port = bindec(substr($_aisdata,150,6));
 			//$ro->to_starboard = bindec(substr($_aisdata,156,6));
 			$ro->cls = 2; // class B
 		} else if ($ro->id == 27) {
-			$ro->cog = bindec(substr($_aisdata,85,9));
+			$ro->cog = bindec(substr($_aisdata, 85, 9));
 			if ($ro->cog == 511) $ro->cog = 0.0;
-			$ro->sog = bindec(substr($_aisdata,79,6));
+			$ro->sog = bindec(substr($_aisdata, 79, 6));
 			if ($ro->sog == 63) $ro->sog = 0.0;
-			$ro->lon = $this->make_lonf(bindec(substr($_aisdata,44,18))*10);
-			$ro->lat = $this->make_latf(bindec(substr($_aisdata,62,17))*10);
+			$ro->lon = $this->make_lonf(bindec(substr($_aisdata, 44, 18))*10);
+			$ro->lat = $this->make_latf(bindec(substr($_aisdata, 62, 17))*10);
 			$ro->cls = 1; // class A
 		
 		}
-		$ro->statusid = bindec(substr($_aisdata,38,4));
+		$ro->statusid = bindec(substr($_aisdata, 38, 4));
 		$ro->status = $this->getStatus($ro->statusid);
 		return $ro;
 	}
@@ -359,7 +359,7 @@ 
 	}
 
 	public function getShipTypeID($type) {
-		$typeid = array_search($type,$this->shiptype);
+		$typeid = array_search($type, $this->shiptype);
 		if ($typeid !== FALSE) return $typeid;
 		else return '';
 	}
@@ -367,14 +367,14 @@ 
 	public function process_ais_itu($_itu, $_len, $_filler, $aux /*, $ais_ch*/) {
 		global $port; // tcpip port...
 		static $debug_counter = 0;
-		$aisdata168='';//six bit array of ascii characters
+		$aisdata168 = ''; //six bit array of ascii characters
 		$ais_nmea_array = str_split($_itu); // convert to an array
 		foreach ($ais_nmea_array as $value) {
 			$dec = $this->ascii_2_dec($value);
 			$bit8 = $this->asciidec_2_8bit($dec);
 			$bit6 = $this->dec_2_6bit($bit8);
 			//echo $value ."-" .$bit6 ."";
-			$aisdata168 .=$bit6;
+			$aisdata168 .= $bit6;
 		}
 		//echo $aisdata168 . "<br/>";
 		//return $this->decode_ais($aisdata168, $aux);
@@ -397,24 +397,24 @@ 
 		// calculate checksum after ! till *
 		// assume 1st ! is valid
 		// find * ensure that it is at correct position
-		$end = strrpos ( $rawdata , '*' );
+		$end = strrpos($rawdata, '*');
 		if ($end === FALSE) return -1; // check for NULLS!!!
-		$cs = substr( $rawdata, $end + 1 );
-		if ( strlen($cs) != 2 ) return -1; // correct cs length
-		$dcs = (int)hexdec( $cs );
-		for ( $alias=1; $alias<$end; $alias++) $chksum ^= ord( $rawdata[$alias] ); // perform XOR for NMEA checksum
-		if ( $chksum == $dcs ) { // NMEA checksum pass
+		$cs = substr($rawdata, $end + 1);
+		if (strlen($cs) != 2) return -1; // correct cs length
+		$dcs = (int) hexdec($cs);
+		for ($alias = 1; $alias < $end; $alias++) $chksum ^= ord($rawdata[$alias]); // perform XOR for NMEA checksum
+		if ($chksum == $dcs) { // NMEA checksum pass
 			$pcs = explode(',', $rawdata);
 			// !AI??? identifier
 			if (!isset($pcs[1])) {
 				echo "ERROR,INVALID_DATA ".time()." $rawdata\n";
 				return -1;
 			}
-			$num_seq = (int)$pcs[1]; // number of sequences
-			$seq = (int)$pcs[2]; // get sequence
+			$num_seq = (int) $pcs[1]; // number of sequences
+			$seq = (int) $pcs[2]; // get sequence
 			// get msg sequence id
 			if ($pcs[3] == '') $msg_sid = -1; // non-multipart message, set to -1
-			else $msg_sid = (int)$pcs[3]; // multipart message
+			else $msg_sid = (int) $pcs[3]; // multipart message
 			$ais_ch = $pcs[4]; // get AIS channel
 			// message sequence checking
 			if ($num_seq < 1 || $num_seq > 9) {
@@ -447,7 +447,7 @@ 
 					}
 				}
 				$itu = $itu.$pcs[5]; // get itu message
-				$filler += (int)$pcs[6][0]; // get filler
+				$filler += (int) $pcs[6][0]; // get filler
 				if ($num_seq == 1 // valid single message
 				    || $num_seq == $pseq // valid multi-part message
 				) {
@@ -469,13 +469,13 @@ 
 		$cbuf = $cbuf.$ibuf;
 		$last_pos = 0;
 		$result = new stdClass();
-		while ( ($start = strpos($cbuf,"VDM",$last_pos)) !== FALSE) {
+		while (($start = strpos($cbuf, "VDM", $last_pos)) !== FALSE) {
 		//while ( ($start = strpos($cbuf,"!AI",$last_pos)) !== FALSE) {
 			//DEBUG echo $cbuf;
-			if ( ($end = strpos($cbuf,"\r\n", $start)) !== FALSE) { //TBD need to trim?
+			if (($end = strpos($cbuf, "\r\n", $start)) !== FALSE) { //TBD need to trim?
 				$tst = substr($cbuf, $start - 3, ($end - $start + 3));
 				//DEBUG echo "[$start $end $tst]\n";
-				$result = $this->process_ais_raw( $tst, "" );
+				$result = $this->process_ais_raw($tst, "");
 				$last_pos = $end + 1;
 			} else break;
 		}
@@ -487,41 +487,41 @@ 
 	// incoming data from serial or IP comms
 	public function process_ais_line($cbuf) {
 		$result = new stdClass();
-		$start = strpos($cbuf,"VDM");
+		$start = strpos($cbuf, "VDM");
 		$tst = substr($cbuf, $start - 3);
-		$result = $this->process_ais_raw( $tst, "" );
+		$result = $this->process_ais_raw($tst, "");
 		return $result;
 	}
 
 	/* AIS Encoding
 	*/
-	private function mk_ais_lat( $lat ) {
+	private function mk_ais_lat($lat) {
 		//$lat = 1.2569;
-		if ($lat<0.0) {
+		if ($lat < 0.0) {
 			$lat = -$lat;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$latd = 0x00000000;
-		$latd = intval ($lat * 600000.0);
-		if ($neg==true) {
+		$latd = intval($lat*600000.0);
+		if ($neg == true) {
 			$latd = ~$latd;
-			$latd+=1;
+			$latd += 1;
 			$latd &= 0x07FFFFFF;
 		}
 		return $latd;
 	}
 
-	private function mk_ais_lon( $lon ) {
+	private function mk_ais_lon($lon) {
 		//$lon = 103.851;
-		if ($lon<0.0) {
+		if ($lon < 0.0) {
 			$lon = -$lon;
-			$neg=true;
-		} else $neg=false;
+			$neg = true;
+		} else $neg = false;
 		$lond = 0x00000000;
-		$lond = intval ($lon * 600000.0);
-		if ($neg==true) {
+		$lond = intval($lon*600000.0);
+		if ($neg == true) {
 			$lond = ~$lond;
-			$lond+=1;
+			$lond += 1;
 			$lond &= 0x0FFFFFFF;
 		}
 		return $lond;
@@ -529,8 +529,8 @@ 
 
 	private function char2bin($name, $max_len) {
 		$len = strlen($name);
-		if ($len > $max_len) $name = substr($name,0,$max_len);
-		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len) * 6);
+		if ($len > $max_len) $name = substr($name, 0, $max_len);
+		if ($len < $max_len) $pad = str_repeat('0', ($max_len - $len)*6);
 		else $pad = '';
 		$rv = '';
 		$ais_chars = array(
@@ -547,26 +547,26 @@ 
 		if ($_a) foreach ($_a as $_1) {
 			if (isset($ais_chars[$_1])) $dec = $ais_chars[$_1];
 			else $dec = 0;
-			$bin = str_pad(decbin( $dec ), 6, '0', STR_PAD_LEFT);
+			$bin = str_pad(decbin($dec), 6, '0', STR_PAD_LEFT);
 			$rv .= $bin;
 			//echo "$_1 $dec ($bin)<br/>";
 		}
 		return $rv.$pad;
 	}
 
-	private function mk_ais($_enc, $_part=1,$_total=1,$_seq='',$_ch='A') {
+	private function mk_ais($_enc, $_part = 1, $_total = 1, $_seq = '', $_ch = 'A') {
 		$len_bit = strlen($_enc);
-		$rem6 = $len_bit % 6;
+		$rem6 = $len_bit%6;
 		$pad6_len = 0;
 		if ($rem6) $pad6_len = 6 - $rem6;
 		//echo  $pad6_len.'<br>';
 		$_enc .= str_repeat("0", $pad6_len); // pad the text...
-		$len_enc = strlen($_enc) / 6;
+		$len_enc = strlen($_enc)/6;
 		//echo $_enc.' '.$len_enc.'<br/>';
 		$itu = '';
-		for ($i=0; $i<$len_enc; $i++) {
-			$offset = $i * 6;
-			$dec = bindec(substr($_enc,$offset,6));
+		for ($i = 0; $i < $len_enc; $i++) {
+			$offset = $i*6;
+			$dec = bindec(substr($_enc, $offset, 6));
 			if ($dec < 40) $dec += 48;
 			else $dec += 56;
 			//echo chr($dec)." $dec<br/>";
@@ -576,15 +576,15 @@ 
 		$chksum = 0;
 		$itu = "AIVDM,$_part,$_total,$_seq,$_ch,".$itu.",0";
 		$len_itu = strlen($itu);
-		for ($i=0; $i<$len_itu; $i++) {
-			$chksum ^= ord( $itu[$i] );
+		for ($i = 0; $i < $len_itu; $i++) {
+			$chksum ^= ord($itu[$i]);
 		}
-		$hex_arr = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
-		$lsb = $chksum & 0x0F;
-		if ($lsb >=0 && $lsb <= 15 ) $lsbc = $hex_arr[$lsb];
+		$hex_arr = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+		$lsb = $chksum&0x0F;
+		if ($lsb >= 0 && $lsb <= 15) $lsbc = $hex_arr[$lsb];
 		else $lsbc = '0';
-		$msb = (($chksum & 0xF0) >> 4) & 0x0F;
-		if ($msb >=0 && $msb <= 15 ) $msbc = $hex_arr[$msb];
+		$msb = (($chksum&0xF0) >> 4)&0x0F;
+		if ($msb >= 0 && $msb <= 15) $msbc = $hex_arr[$msb];
 		else $msbc = '0';
 		$itu = '!'.$itu."*{$msbc}{$lsbc}\r\n";
 		return $itu;
@@ -610,14 +610,14 @@ 
 
 	public function mmsitype($mmsi) {
 		if (strlen($mmsi) == 9) {
-			if (substr($mmsi,0,3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
-			elseif (substr($mmsi,0,3) == '972') return 'MOB (Man Overboard) device';
-			elseif (substr($mmsi,0,3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
-			elseif (substr($mmsi,0,3) == '111') return 'SAR (Search and Rescue) aircraft';
-			elseif (substr($mmsi,0,2) == '98') return 'Auxiliary craft associated with a parent ship';
-			elseif (substr($mmsi,0,2) == '99') return 'Aids to Navigation';
-			elseif (substr($mmsi,0,2) == '00') return 'Coastal stations';
-			elseif (substr($mmsi,0,1) == '0') return 'Group of ships';
+			if (substr($mmsi, 0, 3) == '974') return 'EPIRB (Emergency Position Indicating Radio Beacon) AIS';
+			elseif (substr($mmsi, 0, 3) == '972') return 'MOB (Man Overboard) device';
+			elseif (substr($mmsi, 0, 3) == '970') return 'AIS SART (Search and Rescue Transmitter)';
+			elseif (substr($mmsi, 0, 3) == '111') return 'SAR (Search and Rescue) aircraft';
+			elseif (substr($mmsi, 0, 2) == '98') return 'Auxiliary craft associated with a parent ship';
+			elseif (substr($mmsi, 0, 2) == '99') return 'Aids to Navigation';
+			elseif (substr($mmsi, 0, 2) == '00') return 'Coastal stations';
+			elseif (substr($mmsi, 0, 1) == '0') return 'Group of ships';
 			else return 'Ship';
 		}
 
@@ -627,19 +627,19 @@ 
 	public function parse_line($buffer) {
 		global $globalDebug;
 		$result = array();
-		$start = strpos($buffer,"VDM");
+		$start = strpos($buffer, "VDM");
 		$tst = substr($buffer, $start - 3);
-		$data = $this->process_ais_raw( $tst, "" );
+		$data = $this->process_ais_raw($tst, "");
 		if (!is_object($data)) {
 			//if ($globalDebug) echo '==== Line format not supported : '.$buffer."\n";
 			return array();
 		}
 		if ($data->lon != 0) $result['longitude'] = $data->lon;
 		if ($data->lat != 0) $result['latitude'] = $data->lat;
-		$result['ident'] = trim(str_replace('@','',$data->name));
+		$result['ident'] = trim(str_replace('@', '', $data->name));
 		$result['timestamp'] = $data->ts;
 		$result['mmsi'] = $data->mmsi;
-		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'],0,3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
+		if (strlen($result['mmsi']) == 8 && substr($result['mmsi'], 0, 3) == '669') $result['mmsi'] = '3'.$result['mmsi'];
 		$result['mmsi_type'] = $this->mmsitype($result['mmsi']);
 		if ($data->sog != -1.0) $result['speed'] = $data->sog;
 		if ($data->heading !== '') $result['heading'] = $data->heading;
@@ -649,16 +649,16 @@ 
 		if ($data->type !== '') $result['type'] = $data->type;
 		if ($data->typeid !== '') $result['typeid'] = $data->typeid;
 		if ($data->imo !== '') $result['imo'] = $data->imo;
-		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@','',$data->callsign));
+		if ($data->callsign !== '') $result['callsign'] = trim(str_replace('@', '', $data->callsign));
 		if (is_numeric($data->eta_month) && $data->eta_month != 0 && is_numeric($data->eta_day) && $data->eta_day != 0 && $data->eta_hour !== '' && $data->eta_minute !== '') {
-			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d",$data->eta_month).'-'.sprintf("%02d",$data->eta_day).' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y').'-'.sprintf("%02d", $data->eta_month).'-'.sprintf("%02d", $data->eta_day).' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		} elseif (is_numeric($data->eta_hour) && is_numeric($data->eta_minute)) {
-			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d",$data->eta_hour).':'.sprintf("%02d",$data->eta_minute).':00');
+			$eta_ts = strtotime(date('Y-m-d').' '.sprintf("%02d", $data->eta_hour).':'.sprintf("%02d", $data->eta_minute).':00');
 			if ($eta_ts != '') $result['eta_ts'] = $eta_ts;
 		}
 		if ($data->destination != '') {
-			$dest = trim(str_replace('@','',$data->destination));
+			$dest = trim(str_replace('@', '', $data->destination));
 			if ($dest != '') $result['destination'] = $dest;
 		}
 		$result['all'] = (array) $data;

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 = 49;
 
-	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);

install/class.update_schema.php

Spacing +237 added lines, -237 removed lines

@@ -14,11 +14,11 @@ 
             try {
             	$sth = $Connection->db->prepare($query);
 		$sth->execute();
-    	    } catch(PDOException $e) {
+    	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage()."\n";
     	    }
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
     	    }
 	
 	}
@@ -50,7 +50,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		// Copy schedules data to routes table
@@ -60,7 +60,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
     		}
     		// Add source column
@@ -68,7 +68,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Delete unused column
@@ -76,7 +76,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
     		}
 		// Add ModeS column
@@ -84,14 +84,14 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
     		}
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
     		}
     		// Add auto_increment for aircraft_modes
@@ -99,7 +99,7 @@ 
     		try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -110,7 +110,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -123,7 +123,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -134,7 +134,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -147,7 +147,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
     		}
     		// Add image_source_website column to spotter_image
@@ -155,7 +155,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -164,7 +164,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -182,7 +182,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -196,7 +196,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to aircraft
@@ -204,7 +204,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
     		}
     		// Add aircraft_shadow column to spotter_live
@@ -212,7 +212,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		$error = '';
@@ -225,7 +225,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -233,7 +233,7 @@ 
 
 	private static function update_from_6() {
     		$Connection = new Connection();
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
 			ALTER TABLE spotter_output ADD INDEX(date);
 			ALTER TABLE spotter_output ADD INDEX(ident);
@@ -250,7 +250,7 @@ 
         	    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (add some indexes) : ".$e->getMessage()."\n";
     		    }
     		}
@@ -265,7 +265,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -274,12 +274,12 @@ 
 	private static function update_from_7() {
 		global $globalDBname, $globalDBdriver;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -287,7 +287,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -299,15 +299,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -320,7 +320,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -339,14 +339,14 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
     		}
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -354,12 +354,12 @@ 
 
 	private static function update_from_9() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -371,7 +371,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -379,11 +379,11 @@ 
 
 	private static function update_from_10() {
     		$Connection = new Connection();
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
     		}
 		$error = '';
@@ -401,7 +401,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -410,18 +410,18 @@ 
 	private static function update_from_11() {
 		global $globalDBdriver, $globalDBname;
     		$Connection = new Connection();
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
     		}
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
     		}
     		if ($globalDBdriver == 'mysql') {
@@ -429,7 +429,7 @@ 
 		    try {
             		$sth = $Connection->db->prepare($query);
 			$sth->execute();
-    		    } catch(PDOException $e) {
+    		    } catch (PDOException $e) {
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
     		    }
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -441,15 +441,15 @@ 
 				DROP TABLE spotter_archive;
 				RENAME TABLE copy TO spotter_archive;";
             	    } else {
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
             	    }
                 } else {
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
                 }
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
     		}
 
@@ -459,7 +459,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -487,7 +487,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -495,12 +495,12 @@ 
 
 	private static function update_from_13() {
     		$Connection = new Connection();
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-	    		} catch(PDOException $e) {
+	    		} catch (PDOException $e) {
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
     			}
 		}
@@ -509,7 +509,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -527,7 +527,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -538,11 +538,11 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Add tables
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
 		if ($error != '') return $error;
@@ -550,7 +550,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -571,7 +571,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -589,7 +589,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -598,12 +598,12 @@ 
     		$Connection = new Connection();
 		$error = '';
     		// Modify stats_airport table
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
     	        	try {
 	            	    $sth = $Connection->db->prepare($query);
 			    $sth->execute();
-    			} catch(PDOException $e) {
+    			} catch (PDOException $e) {
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
@@ -612,7 +612,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -629,73 +629,73 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
     		}
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
     		}
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
 			// Add column over_country
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
 			try {
             			$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -704,7 +704,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -719,13 +719,13 @@ 
 			$error .= create_db::import_file('../db/airlines.sql');
 			if ($error != '') return 'Import airlines.sql : '.$error;
 		}
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
 			// Add column over_country
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
         		try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
@@ -741,7 +741,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -750,13 +750,13 @@ 
 	private static function update_from_21() {
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
 			// Rename type to stats_type
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
 			if ($error != '') return $error;
@@ -765,7 +765,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -788,7 +788,7 @@ 
         	try {
             	    $sth = $Connection->db->prepare($query);
 		    $sth->execute();
-    		} catch(PDOException $e) {
+    		} catch (PDOException $e) {
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
     		}
 		return $error;
@@ -814,17 +814,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
 			// Add aircraft_manufacturer to stats_aircraft
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
     			}
     		}
@@ -833,7 +833,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -849,23 +849,23 @@ 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
 		if ($error != '') return 'Import airlines.sql : '.$error;
-		if (!$Connection->checkColumnName('airlines','forsource')) {
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add forsource column) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -877,17 +877,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -899,17 +899,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -921,36 +921,36 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
 			}
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
 				// Add unique key
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			} else {
@@ -963,18 +963,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -986,17 +986,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1008,17 +1008,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1030,7 +1030,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1039,7 +1039,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1049,13 +1049,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1067,17 +1067,17 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1089,7 +1089,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1097,7 +1097,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1107,12 +1107,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('atc','format_source')) {
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1120,7 +1120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1130,13 +1130,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			// Add unique key
@@ -1148,7 +1148,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1156,7 +1156,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1166,23 +1166,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
 			// Add unique key
 			$query = "alter table spotter_live add index(latitude,longitude)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
 			// Add mfr to aircraft
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1198,7 +1198,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1208,13 +1208,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if ($Connection->checkColumnName('aircraft','mfr')) {
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
 			// drop mfr to aircraft
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1230,7 +1230,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1240,33 +1240,33 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('notam','ref_idx')) {
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
 			// Add index key
 			$query = "create index ref_idx on notam (ref)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','registration_idx')) {
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
 			// Add index key
 			$query = "create index registration_idx on accidents (registration)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
 			}
                 }
-		if (!$Connection->indexExists('accidents','rdts')) {
+		if (!$Connection->indexExists('accidents', 'rdts')) {
 			// Add index key
 			$query = "create index rdts on accidents (registration,date,type,source)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1275,7 +1275,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1285,23 +1285,23 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
 			// Add airline_name to accidents
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
 			// Add airline_icao to accidents
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1309,7 +1309,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1319,13 +1319,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','alliance')) {
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
 			// Add alliance to airlines
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1352,7 +1352,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1362,13 +1362,13 @@ 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
 			// Add ban_eu to airlines
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1376,7 +1376,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1387,19 +1387,19 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
 				}
 				
@@ -1407,7 +1407,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
 				}
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
@@ -1458,7 +1458,7 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (fix date) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1543,7 +1543,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1552,13 +1552,13 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->indexExists('accidents','type')) {
+		if (!$Connection->indexExists('accidents', 'type')) {
 			// Add index key
 			$query = "create index type on accidents (type,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1566,7 +1566,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1576,12 +1576,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1647,7 +1647,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1699,7 +1699,7 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
 			}
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -1708,18 +1708,18 @@ 
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
 				}
 			}
 		}
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
 			// Add index key
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
 			}
                 }
@@ -1727,7 +1727,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1738,148 +1738,148 @@ 
 		$Connection = new Connection();
 		$error = '';
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
 				}
 			}
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1888,7 +1888,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1903,14 +1903,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		} else {
@@ -1918,14 +1918,14 @@ 
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
 			}
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
 			}
 		}
@@ -1933,7 +1933,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1943,32 +1943,32 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
 		} else {
-			if (!$Connection->checkColumnName('source_location','location_id')) {
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
 				try {
 					$sth = $Connection->db->prepare($query);
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
 				}
 			}
@@ -1977,7 +1977,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -1987,12 +1987,12 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('source_location','description')) {
+		if (!$Connection->checkColumnName('source_location', 'description')) {
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2000,7 +2000,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2010,39 +2010,39 @@ 
 		global $globalDBdriver;
 		$Connection = new Connection();
 		$error = '';
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
 			}
 		}
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
 			try {
 				$sth = $Connection->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
 			}
 		}
@@ -2050,7 +2050,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2072,14 +2072,14 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
 		}
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2120,7 +2120,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2143,7 +2143,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2193,7 +2193,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2216,7 +2216,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2239,7 +2239,7 @@ 
 		try {
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error (update schema_version) : ".$e->getMessage()."\n";
 		}
 		return $error;
@@ -2262,7 +2262,7 @@ 
 					try {
 						$sth = $Connection->db->prepare($query);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (check_version): ".$e->getMessage()."\n";
 					}
 					$result = $sth->fetch(PDO::FETCH_ASSOC);