Ysurac / FlightAirMap

require/class.APRS.php

Doc Comments +7 added lines

@@ -89,6 +89,10 @@ 
 	'y' => 'Yagi At QTH');
 	
 
+    /**
+     * @param integer $n
+     * @param integer $s
+     */
     private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
 	    (($n & 0x7fffffff) >> $s) | 
@@ -462,6 +466,9 @@ 
 	}
     }
     
+    /**
+     * @param string $data
+     */
     function send($data) {
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);

Spacing +94 added lines, -95 removed lines

@@ -90,8 +90,7 @@ 
 	
 
     private function urshift($n, $s) {
-	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+	return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
 		(0x40000000 >> ($s - 1));
     }
 
@@ -103,7 +102,7 @@ 
 	//$split_input = str_split($input);
 
 	/* Find the end of header checking for NULL bytes while doing it. */
-	$splitpos = strpos($input,':');
+	$splitpos = strpos($input, ':');
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -113,15 +112,15 @@ 
 	
 	if ($debug) echo 'input : '.$input."\n";
 	/* Save header and body. */
-	$body = substr($input,$splitpos+1,$input_len);
+	$body = substr($input, $splitpos + 1, $input_len);
 	$body_len = strlen($body);
-	$header = substr($input,0,$splitpos);
+	$header = substr($input, 0, $splitpos);
 	//$header_len = strlen($header);
 	if ($debug) echo 'header : '.$header."\n";
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
-	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
+	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
 	    $ident = $matches[1];
 	    if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
@@ -134,14 +133,14 @@ 
 	    if ($debug) echo 'ident : '.$ident."\n";
 	    $result['ident'] = $ident;
 	} else return false;
-	$elements = explode(',',$all_elements);
+	$elements = explode(',', $all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
 	        //echo "ok";
 	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+	    } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
 	    }
@@ -154,10 +153,10 @@ 
 	    */
 	}
 	
-	$type = substr($body,0,1);
+	$type = substr($body, 0, 1);
 	if ($debug) echo 'type : '.$type."\n";
 	if ($type == ';') {
-		$result['ident'] = trim(substr($body,1,9));
+		$result['ident'] = trim(substr($body, 1, 9));
 	} elseif ($type == ',') {
 		// Invalid data or test data
 		return false;
@@ -165,24 +164,24 @@ 
 	
 	// Check for Timestamp
 	$find = false;
-	$body_parse = substr($body,1);
+	$body_parse = substr($body, 1);
 	//echo 'Body : '.$body."\n";
-	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
+	if (preg_match('/^;(.){9}\*/', $body, $matches)) {
+	    $body_parse = substr($body_parse, 10);
 	    $find = true;
 	    //echo $body_parse."\n";
 	}
-	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
+	if (preg_match('/^`(.*)\//', $body, $matches)) {
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
 	    $find = true;
 	    //echo $body_parse."\n";
 	}
-	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
+	if (preg_match("/^'(.*)\//", $body, $matches)) {
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
 	    $find = true;
 	    //echo $body_parse."\n";
 	}
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
 	    $find = true;
 	    //print_r($matches);
 	    $timestamp = $matches[0];
@@ -197,19 +196,19 @@ 
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
 	    }
-	    $body_parse = substr($body_parse,7);
+	    $body_parse = substr($body_parse, 7);
 	    $result['timestamp'] = $timestamp;
 	    //echo date('Ymd H:i:s',$timestamp);
 	}
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
 	    $find = true;
 	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
+	    $body_parse = substr($body_parse, 8);
 	    $result['timestamp'] = $timestamp;
 	    //echo date('Ymd H:i:s',$timestamp);
 	}
 	//if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
 	    $find = true;
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
@@ -235,11 +234,11 @@ 
 	    */
 		$latitude = $lat + floatval($lat_min)/60;
 		$longitude = $lon + floatval($lon_min)/60;
-		if ($sind == 'S') $latitude = 0-$latitude;
-		if ($wind == 'W') $longitude = 0-$longitude;
+		if ($sind == 'S') $latitude = 0 - $latitude;
+		if ($wind == 'W') $longitude = 0 - $longitude;
 		$result['latitude'] = $latitude;
 		$result['longitude'] = $longitude;
-		$body_parse = substr($body_parse,18);
+		$body_parse = substr($body_parse, 18);
 		$body_parse_len = strlen($body_parse);
 	    }
 	    $body_parse_len = strlen($body_parse);
@@ -266,7 +265,7 @@ 
 		//}
 		//echo $body_parse;
 			if ($type != ';' && $type != '>') {
-			$body_parse = substr($body_parse,1);
+			$body_parse = substr($body_parse, 1);
 			$body_parse_len = strlen($body_parse);
 			$result['symbol_code'] = $symbol_code;
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
@@ -277,15 +276,15 @@ 
 		    //$body_parse_len = strlen($body_parse);
 		    if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
+		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
+		    	    $course = substr($body_parse, 0, 3);
 		    	    $tmp_s = intval($course);
 		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
+		    	    $speed = substr($body_parse, 4, 3);
 		    	    if ($speed != '...') {
 		    		    $result['speed'] = round($speed*1.852);
 		    	    }
-		    	    $body_parse = substr($body_parse,7);
+		    	    $body_parse = substr($body_parse, 7);
 		        }
 		        // Check PHGR, PHG, RNG
 		    } 
@@ -295,12 +294,12 @@ 
 		    }
 		    */
 		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
 		            $altitude = intval($matches[1]);
 		            //$result['altitude'] = round($altitude*0.3048);
 		            $result['altitude'] = $altitude;
 		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
 		        }
 		    }
 		    
@@ -311,56 +310,56 @@ 
 		    }
 		    */
 		    // DAO
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+		    if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
 			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+			    if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
 				$dao_split = str_split($dao);
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+			        $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
+			        $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
 			    
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 				else $result['latitude'] += $lat_off;
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 				else $result['longitude'] += $lon_off;
 			    }
-		            $body_parse = substr($body_parse,6);
+		            $body_parse = substr($body_parse, 6);
 		    }
 		    
-		    if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) {
+		    if (preg_match('/CS=([0-9A-Z]*)/', $body_parse, $matches)) {
 			$result['callsign'] = $matches[1];
 		    }
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+		    if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
 			$result['squawk'] = $matches[1];
 		    }
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+		    if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
 			$result['aircraft_icao'] = $matches[1];
 		    }
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+		    if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
 			$result['typeid'] = $matches[1];
 		    }
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+		    if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
 			$result['imo'] = $matches[1];
 		    }
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+		    if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
 			$result['arrival_date'] = $matches[1];
 		    }
-		    if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) {
+		    if (preg_match('/AC=([0-9A-Z]*)/', $body_parse, $matches)) {
 			$result['arrival_code'] = $matches[1];
 		    }
 		    // OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
 		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+		    if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
 			$id = $matches[1];
 			//$mode = substr($id,0,2);
-			$address = substr($id,2);
+			$address = substr($id, 2);
 			//print_r($matches);
-			$addressType = (intval(substr($id,0,2),16))&3;
+			$addressType = (intval(substr($id, 0, 2), 16))&3;
 			if ($addressType == 0) $result['addresstype'] = "RANDOM";
 			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
 			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
 			elseif ($addressType == 3) $result['addresstype'] = "OGN";
-			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
+			$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
 			$result['aircrafttype_code'] = $aircraftType;
 			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
 			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -377,7 +376,7 @@ 
 			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
 			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
 			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
-			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
+			$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
 		    }
@@ -389,72 +388,72 @@ 
 		    //$body_parse = substr($body_parse,1);
 		    //$body_parse_len = strlen($body_parse);
 
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 			    $result['wind_dir'] = intval($matches[1]);
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			    $result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
+			    $result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
+			    $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
+		    	    $body_parse = substr($body_parse, strlen($matches[0]) + 1);
+		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 			$result['wind_dir'] = intval($matches[1]);
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
-			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
+			$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 			$result['wind_dir'] = intval($matches[1]);
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
 			$result['wind_dir'] = intval($matches[1]);
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
 		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
-			$result['temp'] = round(5/9*(($matches[1])-32),1);
+		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/', $body_parse, $matches)) {
+			$result['temp'] = round(5/9*(($matches[1]) - 32), 1);
 		    }
 		}
 		} else $result['comment'] = trim($body_parse);
 
 	    }
 	//}
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
+	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
+	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
 	if ($debug) print_r($result);
 	return $result;
     }
     
     function connect() {
-	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
+	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$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($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
 	else $aprs_pass = '-1';
 	
-	$aprs_filter  = '';
+	$aprs_filter = '';
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 	$Common = new Common();
-	$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
+	$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
 	if ($s !== false) {
 		echo 'Connected to APRS server! '."\n";
 		$authstart = time();
 		$this->socket = $s;
-		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
-		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
+		$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
+		while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
 			    echo 'APRS user verified !'."\n";
 			    $this->connected = true;
 			    return true;
 			    break;
 			}
-			if (time()-$authstart > 5) {
+			if (time() - $authstart > 5) {
 			    echo 'APRS timeout'."\n";
 			    break;
 			}
@@ -464,20 +463,20 @@ 
     
     function send($data) {
 	if ($this->connected === false) $this->connect();
-	$send = socket_send( $this->socket  , $data , strlen($data),0);
+	$send = socket_send($this->socket, $data, strlen($data), 0);
 	if ($send === FALSE) $this->connect();
     }
 }
 
 class APRSSpotter extends APRS {
-	function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
+	function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		if ($latitude != '' && $longitude != '') {
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = str_pad($latitude['deg'].number_format($latitude['min'],2,'.',''),7,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.str_pad($longitude['deg'].number_format($longitude['min'],2,'.',''),8,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = str_pad($latitude['deg'].number_format($latitude['min'], 2, '.', ''), 7, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.str_pad($longitude['deg'].number_format($longitude['min'], 2, '.', ''), 8, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
@@ -494,19 +493,19 @@ 
 				$custom .= 'AI='.$aircraft_icao;
 			}
 			if ($custom != '') $custom = ' '.$custom;
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }
 class APRSMarine extends APRS {
-	function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source,$source_name,$over_country) {
+	function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $noarchive, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		if ($latitude != '' && $longitude != '') {
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = str_pad($latitude['deg'].number_format($latitude['min'],2,'.',''),7,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.str_pad($longitude['deg'].number_format($longitude['min'],2,'.',''),8,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = str_pad($latitude['deg'].number_format($latitude['min'], 2, '.', ''), 7, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.str_pad($longitude['deg'].number_format($longitude['min'], 2, '.', ''), 8, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
@@ -532,7 +531,7 @@ 
 			}
 			if ($custom != '') $custom = ' '.$custom;
 			$altitude = 0;
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }

scripts/daemon-spotter.php

Spacing +132 added lines, -132 removed lines

@@ -45,11 +45,11 @@ 
 	    die;
 	}
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
     }
 }
 
-$options = getopt('s::',array('source::','server','idsource::'));
+$options = getopt('s::', array('source::', 'server', 'idsource::'));
 //if (isset($options['s'])) $hosts = array($options['s']);
 //elseif (isset($options['source'])) $hosts = array($options['source']);
 if (isset($options['s'])) {
@@ -64,27 +64,27 @@ 
 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) $TI = new TrackerImport($Connection->db);
 if (isset($globalMarine) && $globalMarine) {
     $AIS = new AIS();
     $MI = new MarineImport($Connection->db);
 }
 //$APRS=new APRS($Connection->db);
-$SBS=new SBS();
-$ACARS=new ACARS($Connection->db);
-$Common=new Common();
+$SBS = new SBS();
+$ACARS = new ACARS($Connection->db);
+$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");
@@ -100,35 +100,35 @@ 
 
 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;
         	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
-    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
+    	    } else if (preg_match('/radarvirtuel.com\/file.json$/i', $host)) {
         	//$formats[$id] = 'radarvirtueljson';
         	$globalSources[$id]['format'] = 'radarvirtueljson';
         	//$last_exec['radarvirtueljson'] = 0;
@@ -137,7 +137,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('/planeUpdateFAA.php$/i',$host)) {
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
         	//$formats[$id] = 'planeupdatefaa';
         	$globalSources[$id]['format'] = 'planeupdatefaa';
         	//$last_exec['planeupdatefaa'] = 0;
@@ -146,26 +146,26 @@ 
         	    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('/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('/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;
@@ -174,7 +174,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;
@@ -184,22 +184,22 @@ 
         	    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];
@@ -209,14 +209,14 @@ 
 	    }
 	    $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;
@@ -258,7 +258,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 */
@@ -266,7 +266,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)));
 }
@@ -293,16 +293,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';
@@ -317,12 +317,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($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
-	$ATC=new ATC($Connection->db);
+	$ATC = new ATC($Connection->db);
 }
 if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	$ATC->deleteAll();
@@ -330,7 +330,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($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -345,7 +345,7 @@ 
 	}
 	if ($max != $globalMinFetch) {
 	    if ($globalDebug) echo 'Sleeping...'."\n";
-	    sleep($globalMinFetch-$max+2);
+	    sleep($globalMinFetch - $max + 2);
 	}
     }
 
@@ -358,8 +358,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);
@@ -386,11 +386,11 @@ 
     	    $last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
 	    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";
@@ -408,7 +408,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;
@@ -431,12 +431,12 @@ 
 	    $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=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
-		    $buffer = explode('\n',$buffer);
+		    $buffer = stream_get_line($feed, 2000, "\n");
+		    $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));
@@ -452,9 +452,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');
 			    }
@@ -468,10 +468,10 @@ 
 		}
 	    }
 	} elseif ($value['format'] == 'myshiptracking' && (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) {
@@ -486,7 +486,7 @@ 
 			//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
 			$data['imo'] = $line['IMO'];
 			//$data['arrival_code'] = $ais_data['destination'];
-			$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
+			$data['datetime'] = date('Y-m-d H:i:s', $line['T']);
 			$data['format_source'] = 'myshiptracking';
 			$data['id_source'] = $id_source;
 			$MI->add($data);
@@ -498,9 +498,9 @@ 
 	    }
     	    $last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'boatbeaconapp' && (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 != '') {
@@ -527,27 +527,27 @@ 
     	    $last_exec[$id]['last'] = time();
 	} elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) {
 	    echo 'download...';
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
 	    echo 'done !'."\n";
 	    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();
-		    $data['mmsi'] = (int)substr($line,0,9);
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
+		    $data['mmsi'] = (int) substr($line, 0, 9);
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
 		    //$data['status'] = substr($line,21,2);
 		    //$data['type'] = substr($line,24,3);
-		    $data['latitude'] = substr($line,29,9);
-		    $data['longitude'] = substr($line,41,9);
-		    $data['speed'] = round(substr($line,51,5));
+		    $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,79,20)));
+		    $data['ident'] = trim(utf8_encode(substr($line, 79, 20)));
 		    //$data['callsign'] = trim(substr($line,100,7);
 		    //$data['dest'] = substr($line,108,20);
 		    //$data['etaDate'] = substr($line,129,5);
@@ -565,8 +565,8 @@ 
 	} elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) {
 	    //$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 != '') {
@@ -577,7 +577,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
@@ -593,7 +593,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];
@@ -602,7 +602,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];
 	    		    }
@@ -616,9 +616,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';
@@ -629,7 +629,7 @@ 
 				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
 				elseif ($data['type'] == '') $data['type'] = 'Observer';
 				if (!isset($data['source_name'])) $data['source_name'] = '';
-				if (isset($ATC)) 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 (isset($ATC)) 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);
     		    }
@@ -640,9 +640,9 @@ 
     	    $last_exec[$id]['last'] = time();
     	//} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'aircraftlistjson' && (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) {
@@ -698,7 +698,7 @@ 
     	//} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    $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) {
@@ -715,12 +715,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['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -732,7 +732,7 @@ 
     	    $last_exec[$id]['last'] = time();
     	} elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    $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) {
@@ -749,7 +749,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;
 		    $SI->add($data);
@@ -762,7 +762,7 @@ 
     	} elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$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') {
@@ -794,11 +794,11 @@ 
     	//} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
     	} elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$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());
 	    }
@@ -821,7 +821,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['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -836,14 +836,14 @@ 
     	} elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
 	    //$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
@@ -872,9 +872,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';
@@ -885,7 +885,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);
 		}
@@ -897,14 +897,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
@@ -927,12 +927,12 @@ 
 		    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]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
 	    		else {
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
 	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
 	    		    else $data['aircraft_icao'] = $line['aircraftname'];
 	    		}
@@ -954,14 +954,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
@@ -1012,9 +1012,9 @@ 
 		    //$value = $formats[$nb];
 		    $format = $globalSources[$nb]['format'];
         	    if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') {
-        		$buffer = socket_read($r, 6000,PHP_NORMAL_READ);
+        		$buffer = socket_read($r, 6000, PHP_NORMAL_READ);
         	    } 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";
@@ -1022,7 +1022,7 @@ 
 		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
 		    $error = false;
 		    //$SI::del();
-		    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
+		    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
 		    // SBS format is CSV format
 		    if ($buffer != '') {
 			$tt[$format] = 0;
@@ -1054,10 +1054,10 @@ 
 			    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');
 			    }
@@ -1068,10 +1068,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];
@@ -1082,21 +1082,21 @@ 
 				$data['datetime'] = date('Y-m-d H:i:s');
 				$data['format_source'] = 'flightgearsp';
 				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
 			    }
                         } 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];
@@ -1104,24 +1104,24 @@ 
 				    $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 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
 				}
 			    }
 			} elseif ($format == 'beast') {
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
 			    die;
-			} 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'];
@@ -1139,22 +1139,22 @@ 
     			    } 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";
-			    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);
 				//print_r($line);
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
@@ -1163,7 +1163,7 @@ 
 				    $data = array();
 				    //print_r($line);
 				    if (isset($line['address'])) $data['hex'] = $line['address'];
-				    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');
 				    $data['ident'] = $line['ident'];
@@ -1189,7 +1189,7 @@ 
 				    $currentdate = date('Y-m-d H:i:s');
 				    $aprsdate = strtotime($data['datetime']);
 				    // Accept data if time <= system time + 20s
-				    if (($data['source_type'] == 'sbs') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
+				    if (($data['source_type'] == 'sbs') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate) + 20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
 					$send = $SI->add($data);
 				    } elseif (isset($line['stealth'])) {
 					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
@@ -1286,7 +1286,7 @@ 
 				connect_all($sourceee);
 				$sourceee = array();
 				//connect_all($globalSources);
-				$tt[$format]=0;
+				$tt[$format] = 0;
 				break;
 			    }
 			}
@@ -1295,14 +1295,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);
 			    }