Ysurac / FlightAirMap

require/class.APRS.php

Indentation +138 added lines, -138 removed lines

@@ -2,10 +2,10 @@ 
 require_once(dirname(__FILE__).'/settings.php');
 require_once(dirname(__FILE__).'/class.Common.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('!' => 'Police',
+	protected $symbols = array('!' => 'Police',
 	'#' => 'DIGI',
 	'$' => 'Phone',
 	'%' => 'DX Cluster',
@@ -89,13 +89,13 @@ 
 	'y' => 'Yagi At QTH');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -107,8 +107,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -122,31 +122,31 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else return false;
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $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)) {
+		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)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -171,49 +171,49 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$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);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$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);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$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)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$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)) {
-	    $find = true;
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$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)) {
-	    $find = true;
+		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));
 		
@@ -230,7 +230,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -244,9 +244,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -276,86 +276,86 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$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);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				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);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        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));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				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));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
-			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+			// DAO
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+				$dao = $matches[1];
+				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['ident'] = $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
+			}
+			// 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}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$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);
@@ -385,53 +385,53 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
+			// parse weather
+			//$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)) {
-			    $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)) {
+			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_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)) {
+				$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)) {
+				$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);
-		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+				$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);
-		    }
+			}
 		}
 		} 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 ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    function connect() {
+	function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -454,24 +454,24 @@ 
 		$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;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 	}
-    }
+	}
     
-    function send($data) {
+	function send($data) {
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) $this->connect();
-    }
+	}
 }
 
 class APRSSpotter extends APRS {

Spacing +95 added lines, -96 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];
 	    $all_elements = $matches[2];
 	    if ($ident == 'AIRCRAFT') {
@@ -135,14 +134,14 @@ 
 		$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;
 	    }
@@ -155,12 +154,12 @@ 
 	    */
 	}
 	
-	$type = substr($body,0,1);
+	$type = substr($body, 0, 1);
 	if ($debug) echo 'type : '.$type."\n";
 	if ($type == ';') {
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
-			$result['address'] = trim(substr($body,1,9));
-		} else $result['ident'] = trim(substr($body,1,9));
+			$result['address'] = trim(substr($body, 1, 9));
+		} else $result['ident'] = trim(substr($body, 1, 9));
 	} elseif ($type == ',') {
 		// Invalid data or test data
 		return false;
@@ -168,24 +167,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];
@@ -200,19 +199,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));
@@ -238,11 +237,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);
@@ -270,7 +269,7 @@ 
 		//echo $body_parse;
 			//if ($type != ';' && $type != '>') {
 			if ($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];
@@ -281,16 +280,16 @@ 
 		    //$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);
 		    		$result['speed'] = intval($speed);
 		    	    }
-		    	    $body_parse = substr($body_parse,7);
+		    	    $body_parse = substr($body_parse, 7);
 		        }
 		        // Check PHGR, PHG, RNG
 		    } 
@@ -300,12 +299,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));
 		        }
 		    }
 		    
@@ -316,56 +315,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['ident'] = $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";
@@ -382,7 +381,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;
 		    }
@@ -394,72 +393,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;
 			}
@@ -469,20 +468,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 = '';
@@ -499,19 +498,19 @@ 
 				$custom .= 'AI='.$aircraft_icao;
 			}
 			if ($custom != '') $custom = ' '.$custom;
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.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.'^'.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 = '';
@@ -537,7 +536,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");
 		}
 	}
 }

Braces +152 added lines, -58 removed lines

@@ -107,17 +107,23 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+	    if ($globalDebug) {
+	    	echo '!!! APRS invalid : '.$input."\n";
+	    }
 	    return false;
 	}
 	
-	if ($debug) echo 'input : '.$input."\n";
+	if ($debug) {
+		echo 'input : '.$input."\n";
+	}
 	/* Save header and body. */
 	$body = substr($input,$splitpos+1,$input_len);
 	$body_len = strlen($body);
 	$header = substr($input,0,$splitpos);
 	//$header_len = strlen($header);
-	if ($debug) echo 'header : '.$header."\n";
+	if ($debug) {
+		echo 'header : '.$header."\n";
+	}
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -131,10 +137,14 @@ 
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
 	    } else {
-		if ($debug) echo 'ident : '.$ident."\n";
+		if ($debug) {
+			echo 'ident : '.$ident."\n";
+		}
 		$result['ident'] = $ident;
 	    }
-	} else return false;
+	} else {
+		return false;
+	}
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
@@ -143,7 +153,9 @@ 
 	        //echo "ok";
 	        //if ($element == 'TCPIP*') return false;
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
-		if ($debug) echo 'element : '.$element."\n";
+		if ($debug) {
+			echo 'element : '.$element."\n";
+		}
 		return false;
 	    }
 	    /*
@@ -156,11 +168,15 @@ 
 	}
 	
 	$type = substr($body,0,1);
-	if ($debug) echo 'type : '.$type."\n";
+	if ($debug) {
+		echo 'type : '.$type."\n";
+	}
 	if ($type == ';') {
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
 			$result['address'] = trim(substr($body,1,9));
-		} else $result['ident'] = trim(substr($body,1,9));
+		} else {
+			$result['ident'] = trim(substr($body,1,9));
+		}
 	} elseif ($type == ',') {
 		// Invalid data or test data
 		return false;
@@ -228,7 +244,9 @@ 
 		//$symbol_table = $matches[4];
 		$lat = intval($lat_deg);
 		$lon = intval($lon_deg);
-		if ($lat > 89 || $lon > 179) return false;
+		if ($lat > 89 || $lon > 179) {
+			return false;
+		}
 	    
 	    /*
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -238,8 +256,12 @@ 
 	    */
 		$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);
@@ -273,7 +295,9 @@ 
 			$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];
+			if (isset($this->symbols[$symbol_code])) {
+				$result['symbol'] = $this->symbols[$symbol_code];
+			}
 			if ($symbol_code != '_') {
 			}
 		    //$body_parse = substr($body_parse,1);
@@ -284,7 +308,9 @@ 
 		        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);
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
+		    	    	$result['heading'] = intval($course);
+		    	    }
 		    	    $speed = substr($body_parse,4,3);
 		    	    if ($speed != '...') {
 		    		//$result['speed'] = round($speed*1.852);
@@ -323,10 +349,16 @@ 
 			        $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;
+				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);
 		    }
@@ -361,27 +393,48 @@ 
 			$address = substr($id,2);
 			//print_r($matches);
 			$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";
+			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);
 			$result['aircrafttype_code'] = $aircraftType;
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+			if ($aircraftType == 0) {
+				$result['aircrafttype'] = "UNKNOWN";
+			} elseif ($aircraftType == 1) {
+				$result['aircrafttype'] = "GLIDER";
+			} elseif ($aircraftType == 2) {
+				$result['aircrafttype'] = "TOW_PLANE";
+			} elseif ($aircraftType == 3) {
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+			} elseif ($aircraftType == 4) {
+				$result['aircrafttype'] = "PARACHUTE";
+			} elseif ($aircraftType == 5) {
+				$result['aircrafttype'] = "DROP_PLANE";
+			} elseif ($aircraftType == 6) {
+				$result['aircrafttype'] = "HANG_GLIDER";
+			} elseif ($aircraftType == 7) {
+				$result['aircrafttype'] = "PARA_GLIDER";
+			} elseif ($aircraftType == 8) {
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
+			} elseif ($aircraftType == 9) {
+				$result['aircrafttype'] = "JET_AIRCRAFT";
+			} elseif ($aircraftType == 10) {
+				$result['aircrafttype'] = "UFO";
+			} elseif ($aircraftType == 11) {
+				$result['aircrafttype'] = "BALLOON";
+			} 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;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
@@ -421,13 +474,21 @@ 
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
 		    }
 		}
-		} else $result['comment'] = trim($body_parse);
+		} 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 ($debug) print_r($result);
+	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;
     }
     
@@ -436,12 +497,21 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalServerAPRSssid)) {
+		$aprs_ssid = $globalServerAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalServerAPRSpass)) {
+		$aprs_pass = $globalServerAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 	
 	$aprs_filter  = '';
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
@@ -468,9 +538,13 @@ 
     }
     
     function send($data) {
-	if ($this->connected === false) $this->connect();
+	if ($this->connected === false) {
+		$this->connect();
+	}
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
-	if ($send === FALSE) $this->connect();
+	if ($send === FALSE) {
+		$this->connect();
+	}
     }
 }
 
@@ -487,18 +561,26 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($squawk != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SQ='.$squawk;
 			}
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AI='.$aircraft_icao;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.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");
 		}
 	}
@@ -516,26 +598,38 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($typeid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'TI='.$typeid;
 			}
 			if ($imo != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'IMO='.$imo;
 			}
 			if ($arrival_date != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AD='.strtotime($arrival_date);
 			}
 			if ($arrival_code != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AC='.$arrival_code;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			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");
 		}