Ysurac / FlightAirMap

install/class.create_db.php

Doc Comments +4 added lines

@@ -3,6 +3,10 @@
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 
 class create_db {
+
+	/**
+	 * @param string $filename
+	 */
 	public static function import_file($filename) {
 		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
 		$Connection = new Connection();

Spacing +18 added lines, -18 removed lines

@@ -4,24 +4,24 @@ 
 
 class create_db {
 	public static function import_file($filename) {
-		$filename = filter_var($filename,FILTER_SANITIZE_STRING);
+		$filename = filter_var($filename, FILTER_SANITIZE_STRING);
 		$Connection = new Connection();
 		//Connection::$db->beginTransaction();
 		$templine = '';
-		$handle = @fopen($filename,"r");
+		$handle = @fopen($filename, "r");
 		if ($handle) {
 			//$lines = file($filename);
 			//foreach ($lines as $line)
-			while (($line = fgets($handle,4096)) !== false)
+			while (($line = fgets($handle, 4096)) !== false)
 			{
-				if (substr($line,0,2) == '--' || $line == '') continue;
+				if (substr($line, 0, 2) == '--' || $line == '') continue;
 				$templine .= $line;
-				if (substr(trim($line), -1,1) == ';')
+				if (substr(trim($line), -1, 1) == ';')
 				{
 					try {
 						$sth = $Connection->db->prepare($templine);
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error (import ".$filename.") : ".$e->getMessage()."\n";
 					}
 					$templine = '';
@@ -38,27 +38,27 @@ 
 		$error = '';
 		$dh = opendir($directory);
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
-		while(false !== ($filename = readdir($dh)))
+		while (false !== ($filename = readdir($dh)))
 		{
-		    if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename);
+		    if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename);
 		}
 		return $error;
 	}
 
-	public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host) {
-		$root = filter_var($root,FILTER_SANITIZE_STRING);
-		$root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING);
-		$user = filter_var($user,FILTER_SANITIZE_STRING);
-		$password = filter_var($pass,FILTER_SANITIZE_STRING);
-		$db = filter_var($db,FILTER_SANITIZE_STRING);
-		$db_type = filter_var($db_type,FILTER_SANITIZE_STRING);
-		$host = filter_var($host,FILTER_SANITIZE_STRING);
+	public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host) {
+		$root = filter_var($root, FILTER_SANITIZE_STRING);
+		$root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING);
+		$user = filter_var($user, FILTER_SANITIZE_STRING);
+		$password = filter_var($pass, FILTER_SANITIZE_STRING);
+		$db = filter_var($db, FILTER_SANITIZE_STRING);
+		$db_type = filter_var($db_type, FILTER_SANITIZE_STRING);
+		$host = filter_var($host, FILTER_SANITIZE_STRING);
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
 		    $grantright = $_SERVER['SERVER_ADDR'];
 		} else $grantright = 'localhost';
 		try {
-			$dbh = new PDO($db_type.':host='.$host,$root,$root_pass);
+			$dbh = new PDO($db_type.':host='.$host, $root, $root_pass);
 			$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 			if ($db_type == 'mysql') {
 				$dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
@@ -68,7 +68,7 @@ 
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';
 					GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";");
 			}
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			$dbh = null;
 			return "error : ".$e->getMessage();
 		}

install/libs/sparqllib.php

Doc Comments +10 added lines

@@ -13,6 +13,9 @@ 
 function sparql_connect( $endpoint ) { return new sparql_connection( $endpoint ); }
 
 function sparql_ns( $short, $long, $db = null ) { return _sparql_a_connection( $db )->ns( $short, $long ); }
+/**
+ * @param string $sparql
+ */
 function sparql_query( $sparql, $db = null ) { return _sparql_a_connection( $db )->query( $sparql ); }
 function sparql_errno( $db = null ) { return _sparql_a_connection( $db )->errno(); }
 function sparql_error( $db = null ) { return _sparql_a_connection( $db )->error(); }
@@ -84,6 +87,9 @@ 
 		$this->params = $params;
 	}
 
+	/**
+	 * @param integer $timeout
+	 */
 	function query( $query, $timeout=null )
 	{	
 		$prefixes = "";
@@ -324,6 +330,10 @@ 
 	var $fields;
 	var $db;
 	var $i = 0;
+
+	/**
+	 * @param sparql_connection $db
+	 */
 	function __construct( $db, $rows, $fields )
 	{
 		$this->rows = $rows;

Spacing +114 added lines, -114 removed lines

@@ -10,37 +10,37 @@ 
 
 # to document: CGIParams
 
-function sparql_connect( $endpoint ) { return new sparql_connection( $endpoint ); }
+function sparql_connect($endpoint) { return new sparql_connection($endpoint); }
 
-function sparql_ns( $short, $long, $db = null ) { return _sparql_a_connection( $db )->ns( $short, $long ); }
-function sparql_query( $sparql, $db = null ) { return _sparql_a_connection( $db )->query( $sparql ); }
-function sparql_errno( $db = null ) { return _sparql_a_connection( $db )->errno(); }
-function sparql_error( $db = null ) { return _sparql_a_connection( $db )->error(); }
+function sparql_ns($short, $long, $db = null) { return _sparql_a_connection($db)->ns($short, $long); }
+function sparql_query($sparql, $db = null) { return _sparql_a_connection($db)->query($sparql); }
+function sparql_errno($db = null) { return _sparql_a_connection($db)->errno(); }
+function sparql_error($db = null) { return _sparql_a_connection($db)->error(); }
 
-function sparql_fetch_array( $result ) { return $result->fetch_array(); }
-function sparql_num_rows( $result ) { return $result->num_rows(); }
-function sparql_field_array( $result ) { return $result->field_array(); }
-function sparql_field_name( $result, $i ) { return $result->field_name( $i ); }
+function sparql_fetch_array($result) { return $result->fetch_array(); }
+function sparql_num_rows($result) { return $result->num_rows(); }
+function sparql_field_array($result) { return $result->field_array(); }
+function sparql_field_name($result, $i) { return $result->field_name($i); }
 
-function sparql_fetch_all( $result ) { return $result->fetch_all(); }
+function sparql_fetch_all($result) { return $result->fetch_all(); }
 
-function sparql_get( $endpoint, $sparql ) 
+function sparql_get($endpoint, $sparql) 
 { 
-	$db = sparql_connect( $endpoint );
-	if( !$db ) { return; }
-	$result = $db->query( $sparql );
-	if( !$result ) { return; }
+	$db = sparql_connect($endpoint);
+	if (!$db) { return; }
+	$result = $db->query($sparql);
+	if (!$result) { return; }
 	return $result->fetch_all(); 
 }
 
-function _sparql_a_connection( $db )
+function _sparql_a_connection($db)
 {
 	global $sparql_last_connection;
-	if( !isset( $db ) )
+	if (!isset($db))
 	{
-		if( !isset( $sparql_last_connection ) )
+		if (!isset($sparql_last_connection))
 		{
-			print( "No currect SPARQL connection (connection) in play!" );
+			print("No currect SPARQL connection (connection) in play!");
 			return;
 		}
 		$db = $sparql_last_connection;
@@ -62,14 +62,14 @@ 
 	var $params = null;
 	# capabilities are either true, false or null if not yet tested.
 
-	function __construct( $endpoint )
+	function __construct($endpoint)
 	{
 		$this->endpoint = $endpoint;
 		global $sparql_last_connection;
 		$sparql_last_connection = $this;
 	}
 
-	function ns( $short, $long )
+	function ns($short, $long)
 	{
 		$this->ns[$short] = $long;
 	}
@@ -77,77 +77,77 @@ 
 	function errno() { return $this->errno; }
 	function error() { return $this->error; }
 
-	function cgiParams( $params = null )
+	function cgiParams($params = null)
 	{
-		if( $params === null ) { return $this->params; }
-		if( $params === "" ) { $this->params = null; return; }
+		if ($params === null) { return $this->params; }
+		if ($params === "") { $this->params = null; return; }
 		$this->params = $params;
 	}
 
-	function query( $query, $timeout=null )
+	function query($query, $timeout = null)
 	{	
 		$prefixes = "";
-		foreach( $this->ns as $k=>$v )
+		foreach ($this->ns as $k=>$v)
 		{
 			$prefixes .= "PREFIX $k: <$v>\n";
 		}
-		$output = $this->dispatchQuery( $prefixes.$query, $timeout );
-		if( $this->errno ) { return; }
+		$output = $this->dispatchQuery($prefixes.$query, $timeout);
+		if ($this->errno) { return; }
 		$parser = new xx_xml($output, 'contents');
-		if( $parser->error() ) 
+		if ($parser->error()) 
 		{ 
 			$this->errno = -1; # to not clash with CURLOPT return; }
 			$this->error = $parser->error();
 			return;
 		}
-		return new sparql_result( $this, $parser->rows, $parser->fields );
+		return new sparql_result($this, $parser->rows, $parser->fields);
 	}
 
-	function alive( $timeout=3 )
+	function alive($timeout = 3)
 	{
-		$result = $this->query( "SELECT * WHERE { ?s ?p ?o } LIMIT 1", $timeout );
+		$result = $this->query("SELECT * WHERE { ?s ?p ?o } LIMIT 1", $timeout);
 
-		if( $this->errno ) { return false; }
+		if ($this->errno) { return false; }
 
 		return true;
 	}	
 
-	function dispatchQuery( $sparql, $timeout=null )
+	function dispatchQuery($sparql, $timeout = null)
 	{
-		$url = $this->endpoint."?query=".urlencode( $sparql );
-		if( $this->params !== null )
+		$url = $this->endpoint."?query=".urlencode($sparql);
+		if ($this->params !== null)
 		{
 			$url .= "&".$this->params;
 		}
-		if( $this->debug ) { print "<div class='debug'><a href='".htmlspecialchars($url)."'>".htmlspecialchars($prefixes.$query)."</a></div>\n"; }
+		if ($this->debug) { print "<div class='debug'><a href='".htmlspecialchars($url)."'>".htmlspecialchars($prefixes.$query)."</a></div>\n"; }
 		$this->errno = null;
 		$this->error = null;
 		$ch = curl_init($url);
 		#curl_setopt($ch, CURLOPT_HEADER, 1);
-		if( $timeout !== null )
+		if ($timeout !== null)
 		{
-			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout );
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
 		}
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_HTTPHEADER,array (
+		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
 			"Accept: application/sparql-results+xml"
 		));
 
 		$output = curl_exec($ch);      
 		$info = curl_getinfo($ch);
-		if(curl_errno($ch))
+		if (curl_errno($ch))
 		{
-			$this->errno = curl_errno( $ch );
-			$this->error = 'Curl error: ' . curl_error($ch);
+			$this->errno = curl_errno($ch);
+			$this->error = 'Curl error: '.curl_error($ch);
 			return;
 		}
-		if( $output === '' )
+		if ($output === '')
 		{
 			$this->errno = "-1";
 			$this->error = 'URL returned no data';
 			return;
 		}
-		if( $info['http_code'] != 200) 
+		if ($info['http_code'] != 200) 
 		{
 			$this->errno = $info['http_code'];
 			$this->error = 'Bad response, '.$info['http_code'].': '.$output;
@@ -179,13 +179,13 @@ 
 
 	var $caps_cache;
 	var $caps_anysubject;
-	function capabilityCache( $filename, $dba_type='db4' )
+	function capabilityCache($filename, $dba_type = 'db4')
 	{
-		$this->caps_cache = dba_open($filename, "c", $dba_type );
+		$this->caps_cache = dba_open($filename, "c", $dba_type);
 	}
 	function capabilityCodes()
 	{
-		return array_keys( $this->caps_desc );
+		return array_keys($this->caps_desc);
 	}
 	function capabilityDescription($code)
 	{
@@ -194,19 +194,19 @@ 
 
 	# return true if the endpoint supports a capability
 	# nb. returns false if connecion isn't authoriased to use the feature, eg LOAD
-	function supports( $code ) 
+	function supports($code) 
 	{
-		if( isset( $this->caps[$code] ) ) { return $this->caps[$code]; }
+		if (isset($this->caps[$code])) { return $this->caps[$code]; }
 		$was_cached = false;
-		if( isset( $this->caps_cache ) )
+		if (isset($this->caps_cache))
 		{
 			$CACHE_TIMEOUT_SECONDS = 7*24*60*60;
 			$db_key = $this->endpoint.";".$code;
-			$db_val = dba_fetch( $db_key, $this->caps_cache );
-			if( $db_val !== false )
+			$db_val = dba_fetch($db_key, $this->caps_cache);
+			if ($db_val !== false)
 			{
-				list( $result, $when ) = preg_split( '/;/', $db_val );
-				if( $when + $CACHE_TIMEOUT_SECONDS > time() )
+				list($result, $when) = preg_split('/;/', $db_val);
+				if ($when + $CACHE_TIMEOUT_SECONDS > time())
 				{
 					return $result;
 				}
@@ -215,26 +215,26 @@ 
 		}
 		$r = null;
 
-		if( $code == "select" ) { $r = $this->test_select(); }
-		elseif( $code == "constant_as" ) { $r = $this->test_constant_as(); }
-		elseif( $code == "math_as" ) { $r = $this->test_math_as(); }
-		elseif( $code == "count" ) { $r = $this->test_count(); }
-		elseif( $code == "max" ) { $r = $this->test_max(); }
-		elseif( $code == "load" ) { $r = $this->test_load(); }
-		elseif( $code == "sample" ) { $r = $this->test_sample(); }
+		if ($code == "select") { $r = $this->test_select(); }
+		elseif ($code == "constant_as") { $r = $this->test_constant_as(); }
+		elseif ($code == "math_as") { $r = $this->test_math_as(); }
+		elseif ($code == "count") { $r = $this->test_count(); }
+		elseif ($code == "max") { $r = $this->test_max(); }
+		elseif ($code == "load") { $r = $this->test_load(); }
+		elseif ($code == "sample") { $r = $this->test_sample(); }
 		else { print "<p>Unknown capability code: '$code'</p>"; return false; }
 		$this->caps[$code] = $r;
-		if( isset( $this->caps_cache ) )
+		if (isset($this->caps_cache))
 		{
 			$db_key = $this->endpoint.";".$code;
 			$db_val = $r.";".time();
-			if( $was_cached )
+			if ($was_cached)
 			{
-				dba_replace( $db_key, $db_val, $this->caps_cache );
+				dba_replace($db_key, $db_val, $this->caps_cache);
 			}
 			else
 			{
-				dba_insert( $db_key, $db_val, $this->caps_cache );
+				dba_insert($db_key, $db_val, $this->caps_cache);
 			}
 		}
 		return $r;
@@ -242,11 +242,11 @@ 
 
 	function anySubject()
 	{
-		if( !isset( $this->caps_anysubject ) )
+		if (!isset($this->caps_anysubject))
 		{
 			$results = $this->query( 
 			  "SELECT * WHERE { ?s ?p ?o } LIMIT 1" );
-			if( sizeof($results)) 
+			if (sizeof($results)) 
 			{
 				$row = $results->fetch_array();
 				$this->caps_anysubject = $row["s"];
@@ -260,7 +260,7 @@ 
 	{
 		$output = $this->dispatchQuery( 
 		  "SELECT ?s ?p ?o WHERE { ?s ?p ?o } LIMIT 1" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	# return true if the endpoint supports AS
@@ -268,7 +268,7 @@ 
 	{
 		$output = $this->dispatchQuery( 
 		  "SELECT (1+2 AS ?bar) WHERE { ?s ?p ?o } LIMIT 1" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	# return true if the endpoint supports AS
@@ -276,7 +276,7 @@ 
 	{
 		$output = $this->dispatchQuery( 
 		  "SELECT (\"foo\" AS ?bar) WHERE { ?s ?p ?o } LIMIT 1" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	# return true if the endpoint supports SELECT (COUNT(?x) as ?n) ... GROUP BY 
@@ -284,35 +284,35 @@ 
 	{
 		# assumes at least one rdf:type predicate
 		$s = $this->anySubject();
-		if( !isset($s) ) { return false; }
+		if (!isset($s)) { return false; }
 		$output = $this->dispatchQuery( 
 		  "SELECT (COUNT(?p) AS ?n) ?o WHERE { <$s> ?p ?o } GROUP BY ?o" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	function test_max() 
 	{
 		$s = $this->anySubject();
-		if( !isset($s) ) { return false; }
+		if (!isset($s)) { return false; }
 		$output = $this->dispatchQuery( 
 		  "SELECT (MAX(?p) AS ?max) ?o WHERE { <$s> ?p ?o } GROUP BY ?o" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	function test_sample() 
 	{
 		$s = $this->anySubject();
-		if( !isset($s) ) { return false; }
+		if (!isset($s)) { return false; }
 		$output = $this->dispatchQuery( 
 		  "SELECT (SAMPLE(?p) AS ?sam) ?o WHERE { <$s> ?p ?o } GROUP BY ?o" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 	function test_load() 
 	{
 		$output = $this->dispatchQuery( 
 		  "LOAD <http://graphite.ecs.soton.ac.uk/sparqllib/examples/loadtest.rdf>" );
-		return !isset( $this->errno );
+		return !isset($this->errno);
 	}
 
 
@@ -324,7 +324,7 @@ 
 	var $fields;
 	var $db;
 	var $i = 0;
-	function __construct( $db, $rows, $fields )
+	function __construct($db, $rows, $fields)
 	{
 		$this->rows = $rows;
 		$this->fields = $fields;
@@ -333,17 +333,17 @@ 
 
 	function fetch_array()
 	{
-		if( !@$this->rows[$this->i] ) { return; }
+		if (!@$this->rows[$this->i]) { return; }
 		$r = array();
-		foreach( $this->rows[$this->i++]  as $k=>$v )
+		foreach ($this->rows[$this->i++]  as $k=>$v)
 		{
 			$r[$k] = $v["value"];
 			$r["$k.type"] = $v["type"];
-			if( isset( $v["language"] ) )
+			if (isset($v["language"]))
 			{
 				$r["$k.language"] = $v["language"];
 			}
-			if( isset( $v["datatype"] ) )
+			if (isset($v["datatype"]))
 			{
 				$r["$k.datatype"] = $v["datatype"];
 			}
@@ -355,16 +355,16 @@ 
 	{
 		$r = new sparql_results();
 		$r->fields = $this->fields;
-		foreach( $this->rows as $i=>$row )
+		foreach ($this->rows as $i=>$row)
 		{
-			$r []= $this->fetch_array();
+			$r [] = $this->fetch_array();
 		}
 		return $r;
 	}
 
 	function num_rows()
 	{
-		return sizeof( $this->rows );
+		return sizeof($this->rows);
 	}
 
 	function field_array()
@@ -400,7 +400,7 @@ 
 	var $type;
 
 	// function with the default parameter value
-	function xx_xml($url='http://www.opocot.com', $type='url') {
+	function xx_xml($url = 'http://www.opocot.com', $type = 'url') {
 		$this->type = $type;
 		$this->url  = $url;
 		$this->parse();
@@ -414,7 +414,7 @@ 
 		$this->rows = array();
 		$this->fields = array();
 		$data = '';
-		$this->parser = xml_parser_create ("UTF-8");
+		$this->parser = xml_parser_create("UTF-8");
 		xml_set_object($this->parser, $this);
 		xml_set_element_handler($this->parser, 'startXML', 'endXML');
 		xml_set_character_data_handler($this->parser, 'charXML');
@@ -439,9 +439,9 @@ 
 	 	} else if ($this->type == 'contents') {
 	  	// Now we can pass the contents, maybe if you want
 			// to use CURL, SOCK or other method.
-			$lines = explode("\n",$this->url);
+			$lines = explode("\n", $this->url);
 			foreach ($lines as $val) {
-				$data = $val . "\n";
+				$data = $val."\n";
 				if (!xml_parse($this->parser, $data)) {
 					$this->error = $data."\n".sprintf('XML error at line %d column %d',
 						xml_get_current_line_number($this->parser),
@@ -450,7 +450,7 @@ 
 				}
 			}
 		}
-		if( !$this->looks_legit ) 
+		if (!$this->looks_legit) 
 		{
 			$this->error = "Didn't even see a sparql element, is this really an endpoint?";
 		}
@@ -458,53 +458,53 @@ 
 
 	function startXML($parser, $name, $attr)	
 	{
-		if( $name == "sparql" ) { $this->looks_legit = true; }
-		if( $name == "result" )
+		if ($name == "sparql") { $this->looks_legit = true; }
+		if ($name == "result")
 		{
 			$this->result = array();
 		}
-		if( $name == "binding" )
+		if ($name == "binding")
 		{
 			$this->part = $attr["name"];
 		}
-		if( $name == "uri" || $name == "bnode" )
+		if ($name == "uri" || $name == "bnode")
 		{
 			$this->part_type = $name;
 			$this->chars = "";
 		}
-		if( $name == "literal" )
+		if ($name == "literal")
 		{
 			$this->part_type = "literal";
-			if( isset( $attr["datatype"] ) )
+			if (isset($attr["datatype"]))
 			{
 				$this->part_datatype = $attr["datatype"];
 			}
-			if( isset( $attr["xml:lang"] ) )
+			if (isset($attr["xml:lang"]))
 			{
 				$this->part_lang = $attr["xml:lang"];
 			}
 			$this->chars = "";
 		}
-		if( $name == "variable" )
+		if ($name == "variable")
 		{
 			$this->fields[] = $attr["name"];
 		}
 	}
 
-	function endXML($parser, $name)	{
-		if( $name == "result" )
+	function endXML($parser, $name) {
+		if ($name == "result")
 		{
 			$this->rows[] = $this->result;
 			$this->result = array();
 		}
-		if( $name == "uri" || $name == "bnode" || $name == "literal" )
+		if ($name == "uri" || $name == "bnode" || $name == "literal")
 		{
-			$this->result[$this->part] = array( "type"=>$name, "value"=>$this->chars );
-			if( isset( $this->part_lang ) )
+			$this->result[$this->part] = array("type"=>$name, "value"=>$this->chars);
+			if (isset($this->part_lang))
 			{
 				$this->result[$this->part]["lang"] = $this->part_lang;
 			}
-			if( isset( $this->part_datatype ) )
+			if (isset($this->part_datatype))
 			{
 				$this->result[$this->part]["datatype"] = $this->part_datatype;
 			}
@@ -513,7 +513,7 @@ 
 		}
 	}
 
-	function charXML($parser, $data)	{
+	function charXML($parser, $data) {
 		@$this->chars .= $data;
 	}
 
@@ -527,28 +527,28 @@ 
 	function render_table()
 	{
 		$html = "<table class='sparql-results'><tr>";
-		foreach( $this->fields as $i=>$field )
+		foreach ($this->fields as $i=>$field)
 		{
 			$html .= "<th>?$field</th>";
 		}
 		$html .= "</tr>";
-		foreach( $this as $row )
+		foreach ($this as $row)
 		{
-			$html.="<tr>";
-			foreach( $row as $cell )
+			$html .= "<tr>";
+			foreach ($row as $cell)
 			{
-				$html .= "<td>".htmlspecialchars( $cell )."</td>";
+				$html .= "<td>".htmlspecialchars($cell)."</td>";
 			}
-			$html.="</tr>";
+			$html .= "</tr>";
 		}
-		$html.="</table>
+		$html .= "</table>
 <style>
 table.sparql-results { border-collapse: collapse; }
 table.sparql-results tr td { border: solid 1px #000 ; padding:4px;vertical-align:top}
 table.sparql-results tr th { border: solid 1px #000 ; padding:4px;vertical-align:top ; background-color:#eee;}
 </style>
 ";
-		return $html;exit;
+		return $html; exit;
 	}
 
 }

require/class.APRS.php

Doc Comments +5 added lines

@@ -1,5 +1,10 @@
 <?php
 class aprs {
+
+    /**
+     * @param integer $n
+     * @param integer $s
+     */
     private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
     	    (($n & 0x7fffffff) >> $s) | 

Spacing +54 added lines, -55 removed lines

@@ -1,8 +1,7 @@ 
 <?php
 class aprs {
     private function urshift($n, $s) {
-	return ($n >= 0) ? ($n >> $s) :
-    	    (($n & 0x7fffffff) >> $s) | 
+	return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
         	(0x40000000 >> ($s - 1));
     }
 
@@ -14,7 +13,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) {
@@ -23,28 +22,28 @@ 
 	}
 	
 	/* 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 ($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)) {
 		return false;
 	    }
 	    /*
@@ -56,8 +55,8 @@ 
 	    */
 	}
 	// Check for Timestamp
-	$body_parse = substr($body,1);
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
+	$body_parse = substr($body, 1);
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
 	    $timestamp = $matches[0];
 	    if ($matches[4] == 'h') {
 		$timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]);
@@ -70,11 +69,11 @@ 
 		// This work or not ?
 		$timestamp = strtotime($matches[1].' '.$matches[2].':'.$matches[3]);
 	    }
-	    $body_parse = substr($body_parse,7);
+	    $body_parse = substr($body_parse, 7);
 	    $result['timestamp'] = $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)) {
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
 		
@@ -99,8 +98,8 @@ 
 	    */
 		$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;
 	    }
@@ -108,17 +107,17 @@ 
 		$body_split = str_split($body_parse);
 		$symbol_code = $body_split[18];
 		if ($symbol_code != '_') {
-		    $body_parse = substr($body_parse,19);
+		    $body_parse = substr($body_parse, 19);
 		    $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['course'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
+		    	    $speed = substr($body_parse, 4, 3);
 		    	    $result['speed'] = round($speed*1.852);
-		    	    $body_parse = substr($body_parse,7);
+		    	    $body_parse = substr($body_parse, 7);
 		        }
 		        // Check PHGR, PHG, RNG
 		    } 
@@ -128,10 +127,10 @@ 
 		    }
 		    */
 		    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);
-		            $body_parse = substr($body_parse,strlen($matches[0])+1);
+		            $body_parse = substr($body_parse, strlen($matches[0]) + 1);
 		        }
 		    }
 		    
@@ -142,34 +141,34 @@ 
 		    }
 		    */
 		    // 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);
 		    }
 		    
 		    // 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}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/', $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";
@@ -186,7 +185,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;
 		    }
@@ -195,40 +194,40 @@ 
 		    $result['comment'] = $body_parse;
 		} else {
 		    // parse weather
-		    $body_parse = substr($body_parse,19);
+		    $body_parse = substr($body_parse, 19);
 		    //$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'] = $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}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)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}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 			$result['wind_dir'] = $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'] = $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'] = $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);
 		    }
 		}
 	    }
 	}
-	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);
 	//print_r($result);
 	return $result;
     }

require/class.Language.php

Doc Comments +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 	/**
 	* Returns list of available locales
 	*
-	* @return array
+	* @return string[]
 	 */
 	public function listLocaleDir()
 	{

Spacing +49 added lines, -49 removed lines

@@ -24,54 +24,54 @@ 
 }
 
 class Language {
-	public $all_languages = array('ar_SA' => array('العَرَبِيَّةُ',	'ar',	'arabic'),
-				'bg_BG' => array('Български',		'bg',	'bulgarian'),
-				'id_ID' => array('Bahasa Indonesia',	'id',	'indonesian'),
-				'ms_MY' => array('Bahasa Melayu',	'ms',	'malay'),
-				'ca_ES' => array('Català',		'ca',	'catalan'), // ca_CA
-				'cs_CZ' => array('Čeština',		'cs',	'czech'),
-				'de_DE' => array('Deutsch',		'de',	'german'),
-				'da_DK' => array('Dansk',		'da',	'danish')     , // dk_DK
-				'et_EE' => array('Eesti',		'et',	'estonian'), // ee_ET
-				'en_GB' => array('English',		'en',	'english'),
-				'en_US' => array('English (US)',	'en',	'english'),
-				'es_AR' => array('Español (Argentina)',	'es',	'spanish'),
-				'es_CO' => array('Español (Colombia)',	'es',	'spanish'),
-				'es_ES' => array('Español (España)',	'es',	'spanish'),
-				'es_419' => array('Español (América Latina)',	'es',	'spanish'),
-				'es_MX' => array('Español (Mexico)',	'es',	'spanish'),
-				'es_VE' => array('Español (Venezuela)',	'es',	'spanish'),
-				'eu_ES' => array('Euskara',		'en',	'basque'),
-				'fr_FR' => array('Français',		'fr',	'french'),
-				'gl_ES' => array('Galego',		'gl',	'galician'),
-				'el_GR' => array('Ελληνικά',		'el',	'greek'), // el_EL
-				'he_IL' => array('עברית',		'he',	'hebrew'), // he_HE
-				'hr_HR' => array('Hrvatski',		'hr',	'croatian'),
-				'hu_HU' => array('Magyar',		'hu',	'hungarian'),
-				'it_IT' => array('Italiano',		'it',	'italian'),
-				'lv_LV' => array('Latviešu',		'lv',	'latvian'),
-				'lt_LT' => array('Lietuvių',		'lt',	'lithuanian'),
-				'nl_NL' => array('Nederlands',		'nl',	'dutch'),
-				'nb_NO' => array('Norsk (Bokmål)',	'nb',	'norwegian'), // no_NB
-				'nn_NO' => array('Norsk (Nynorsk)',	'nn',	'norwegian'), // no_NN
-				'fa_IR' => array('فارسی',		'fa',	'persian'),
-				'pl_PL' => array('Polski',		'pl',	'polish'),
-				'pt_PT' => array('Português',		'pt',	'portuguese'),
-				'pt_BR' => array('Português do Brasil',	'pt',	'brazilian portuguese'),
-				'ro_RO' => array('Română',		'en',	'romanian'),
-				'ru_RU' => array('Pусский',		'ru',	'russian'),
-				'sk_SK' => array('Slovenčina',		'sk',	'slovak'),
-				'sl_SI' => array('Slovenščina',		'sl',	'slovenian slovene'),
-				'sr_RS' => array('Srpski',		'sr',	'serbian'),
-				'fi_FI' => array('Suomi',		'fi',	'finish'),
-				'sv_SE' => array('Svenska',		'sv',	'swedish'),
-				'vi_VN' => array('Tiếng Việt',		'vi',	'vietnamese'),
-				'th_TH' => array('ภาษาไทย',		'th',	'thai'),
-				'tr_TR' => array('Türkçe',		'tr',	'turkish'),
-				'uk_UA' => array('Українська',		'en',	'ukrainian'), // ua_UA
-				'ja_JP' => array('日本語',		'ja',	'japanese'),
-				'zh_CN' => array('简体中文',		'zh',	'chinese'),
-				'zh_TW' => array('繁體中文',		'zh',	'chinese')
+	public $all_languages = array('ar_SA' => array('العَرَبِيَّةُ', 'ar', 'arabic'),
+				'bg_BG' => array('Български', 'bg', 'bulgarian'),
+				'id_ID' => array('Bahasa Indonesia', 'id', 'indonesian'),
+				'ms_MY' => array('Bahasa Melayu', 'ms', 'malay'),
+				'ca_ES' => array('Català', 'ca', 'catalan'), // ca_CA
+				'cs_CZ' => array('Čeština', 'cs', 'czech'),
+				'de_DE' => array('Deutsch', 'de', 'german'),
+				'da_DK' => array('Dansk', 'da', 'danish'), // dk_DK
+				'et_EE' => array('Eesti', 'et', 'estonian'), // ee_ET
+				'en_GB' => array('English', 'en', 'english'),
+				'en_US' => array('English (US)', 'en', 'english'),
+				'es_AR' => array('Español (Argentina)', 'es', 'spanish'),
+				'es_CO' => array('Español (Colombia)', 'es', 'spanish'),
+				'es_ES' => array('Español (España)', 'es', 'spanish'),
+				'es_419' => array('Español (América Latina)', 'es', 'spanish'),
+				'es_MX' => array('Español (Mexico)', 'es', 'spanish'),
+				'es_VE' => array('Español (Venezuela)', 'es', 'spanish'),
+				'eu_ES' => array('Euskara', 'en', 'basque'),
+				'fr_FR' => array('Français', 'fr', 'french'),
+				'gl_ES' => array('Galego', 'gl', 'galician'),
+				'el_GR' => array('Ελληνικά', 'el', 'greek'), // el_EL
+				'he_IL' => array('עברית', 'he', 'hebrew'), // he_HE
+				'hr_HR' => array('Hrvatski', 'hr', 'croatian'),
+				'hu_HU' => array('Magyar', 'hu', 'hungarian'),
+				'it_IT' => array('Italiano', 'it', 'italian'),
+				'lv_LV' => array('Latviešu', 'lv', 'latvian'),
+				'lt_LT' => array('Lietuvių', 'lt', 'lithuanian'),
+				'nl_NL' => array('Nederlands', 'nl', 'dutch'),
+				'nb_NO' => array('Norsk (Bokmål)', 'nb', 'norwegian'), // no_NB
+				'nn_NO' => array('Norsk (Nynorsk)', 'nn', 'norwegian'), // no_NN
+				'fa_IR' => array('فارسی', 'fa', 'persian'),
+				'pl_PL' => array('Polski', 'pl', 'polish'),
+				'pt_PT' => array('Português', 'pt', 'portuguese'),
+				'pt_BR' => array('Português do Brasil', 'pt', 'brazilian portuguese'),
+				'ro_RO' => array('Română', 'en', 'romanian'),
+				'ru_RU' => array('Pусский', 'ru', 'russian'),
+				'sk_SK' => array('Slovenčina', 'sk', 'slovak'),
+				'sl_SI' => array('Slovenščina', 'sl', 'slovenian slovene'),
+				'sr_RS' => array('Srpski', 'sr', 'serbian'),
+				'fi_FI' => array('Suomi', 'fi', 'finish'),
+				'sv_SE' => array('Svenska', 'sv', 'swedish'),
+				'vi_VN' => array('Tiếng Việt', 'vi', 'vietnamese'),
+				'th_TH' => array('ภาษาไทย', 'th', 'thai'),
+				'tr_TR' => array('Türkçe', 'tr', 'turkish'),
+				'uk_UA' => array('Українська', 'en', 'ukrainian'), // ua_UA
+				'ja_JP' => array('日本語', 'ja', 'japanese'),
+				'zh_CN' => array('简体中文', 'zh', 'chinese'),
+				'zh_TW' => array('繁體中文', 'zh', 'chinese')
 			);
 
 	/**
@@ -99,7 +99,7 @@ 
 
 	public function getLocale($locale)
 	{
-		return array($locale,$this->all_languages[$locale][1],$this->all_languages[$locale][2],$locale.'.utf8',$locale.'.UTF8');
+		return array($locale, $this->all_languages[$locale][1], $this->all_languages[$locale][2], $locale.'.utf8', $locale.'.UTF8');
 	}
 
 	/**

require/class.SBS.php

Doc Comments +8 added lines

@@ -178,6 +178,10 @@ 
 	return 1;
     }
     
+    /**
+     * @param double $lat
+     * @param integer $isodd
+     */
     function cprN($lat,$isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
 	if ($nl > 1) return $nl;
@@ -185,6 +189,10 @@ 
     }
 
 
+    /**
+     * @param string $msg
+     * @param string $bin
+     */
     function parityCheck($msg, $bin) {
 $modes_checksum_table = array(
 0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,

Spacing +49 added lines, -49 removed lines

@@ -6,83 +6,83 @@ 
 	// Not yet finished, no CRC checks
 	//echo $buffer."\n";
 	$data = array();
-	$typehex = substr($buffer,0,1);
-	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-	else $hex = substr($buffer,1,-1);
-	$bin = gmp_strval( gmp_init($hex,16), 2);
+	$typehex = substr($buffer, 0, 1);
+	if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1, -1);
+	elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -13);
+	else $hex = substr($buffer, 1, -1);
+	$bin = gmp_strval(gmp_init($hex, 16), 2);
 	//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 	if (strlen($hex) == 28) {
-	    $df = intval(substr($bin,0,5),2);
+	    $df = intval(substr($bin, 0, 5), 2);
 	    //$ca = intval(substr($bin,5,3),2);
 	    // Only support DF17 for now
 	    //if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
-	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
-		$icao = substr($hex,2,6);
+	    if (($df == 17 || $df == 18) && ($this->parityCheck($hex, $bin) || $typehex == '@')) {
+		$icao = substr($hex, 2, 6);
 		$data['hex'] = $icao;
-		$tc = intval(substr($bin,32,5),2);
+		$tc = intval(substr($bin, 32, 5), 2);
 		if ($tc >= 1 && $tc <= 4) {
 		    //callsign
-		    $csbin = substr($bin,40,56);
+		    $csbin = substr($bin, 40, 56);
 		    $charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
 		    $cs = '';
-		    $cs .= $charset[intval(substr($csbin,0,6),2)];
-		    $cs .= $charset[intval(substr($csbin,6,6),2)];
-		    $cs .= $charset[intval(substr($csbin,12,6),2)];
-		    $cs .= $charset[intval(substr($csbin,18,6),2)];
-		    $cs .= $charset[intval(substr($csbin,24,6),2)];
-		    $cs .= $charset[intval(substr($csbin,30,6),2)];
-		    $cs .= $charset[intval(substr($csbin,36,6),2)];
-		    $cs .= $charset[intval(substr($csbin,42,6),2)];
-		    $cs = str_replace('_','',$cs);
-		    $cs = str_replace('#','',$cs);
+		    $cs .= $charset[intval(substr($csbin, 0, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 6, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 12, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 18, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 24, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 30, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 36, 6), 2)];
+		    $cs .= $charset[intval(substr($csbin, 42, 6), 2)];
+		    $cs = str_replace('_', '', $cs);
+		    $cs = str_replace('#', '', $cs);
 		    $callsign = $cs;
 		    $data['ident'] = $callsign;
 		} elseif ($tc >= 9 && $tc <= 18) {
 		    // Check Q-bit
-		    $q = substr($bin,47,1);
+		    $q = substr($bin, 47, 1);
 		    if ($q) {
-			$n = intval(substr($bin,40,7).substr($bin,48,4),2);
-			$alt = $n*25-1000;
+			$n = intval(substr($bin, 40, 7).substr($bin, 48, 4), 2);
+			$alt = $n*25 - 1000;
 			$data['altitude'] = $alt;
 		    }
 		    // Check odd/even flag
-		    $oe = substr($bin,53,1);
+		    $oe = substr($bin, 53, 1);
 		    //if ($oe) => odd else even
 		    //  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
-		    $cprlat = intval(substr($bin,54,17),2)/131072.0;
-		    $cprlon = intval(substr($bin,71,17),2)/131072.0;
-		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+		    $cprlat = intval(substr($bin, 54, 17), 2)/131072.0;
+		    $cprlon = intval(substr($bin, 71, 17), 2)/131072.0;
+		    if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat, 'longitude' => $cprlon, 'created' => time());
 		    elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 			$cprlat_odd = $cprlat;
 			$cprlon_odd = $cprlon;
 			$cprlat_even = $this::$latlon[$icao]['latitude'];
 			$cprlon_even = $this::$latlon[$icao]['longitude'];
 		    
-			$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
-			$lat_even = (360.0/60)*($j%60+$cprlat_even);
-			$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
+			$j = 59*$cprlat_even - 60*$cprlat_odd + 0.5;
+			$lat_even = (360.0/60)*($j%60 + $cprlat_even);
+			$lat_odd = (360.0/59)*($j%59 + $cprlat_odd);
 			if ($lat_even >= 270) $lat_even = $lat_even - 360;
 			if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
 			// check latitude zone
 			if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 			    if ($this::$latlon[$icao]['created'] > time()) {
-				$ni = $this->cprN($lat_even,0);
-				$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
+				$ni = $this->cprN($lat_even, 0);
+				$m = floor($cprlon_even*($this->cprNL($lat_even) - 1) - $cprlon_odd*$this->cprNL($lat_even) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_even);
 				$lat = $lat_even;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 				    $data['latitude'] = $lat;
 				    $data['longitude'] = $lon;
 				}
 			    } else {
-				$ni = $this->cprN($lat_odd,1);
-				$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
-				$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
+				$ni = $this->cprN($lat_odd, 1);
+				$m = floor($cprlon_even*($this->cprNL($lat_odd) - 1) - $cprlon_odd*$this->cprNL($lat_odd) + 0.5);
+				$lon = (360.0/$ni)*($m%$ni + $cprlon_odd);
 				$lat = $lat_odd;
-				if ($lon > 180) $lon = $lon -360;
+				if ($lon > 180) $lon = $lon - 360;
 				if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 				    //if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 				    $data['latitude'] = $lat;
@@ -94,15 +94,15 @@ 
 		    }
 		} elseif ($tc == 19) {
 		    // speed & heading
-		    $v_ew_dir = intval(substr($bin,45,1));
-		    $v_ew = intval(substr($bin,46,10),2);
-		    $v_ns_dir = intval(substr($bin,56,1));
-		    $v_ns = intval(substr($bin,57,10),2);
+		    $v_ew_dir = intval(substr($bin, 45, 1));
+		    $v_ew = intval(substr($bin, 46, 10), 2);
+		    $v_ns_dir = intval(substr($bin, 56, 1));
+		    $v_ns = intval(substr($bin, 57, 10), 2);
 		    if ($v_ew_dir) $v_ew = -1*$v_ew;
 		    if ($v_ns_dir) $v_ns = -1*$v_ns;
-		    $speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
-		    $heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-		    if ($heading <0) $heading = $heading+360;
+		    $speed = sqrt($v_ns*$v_ns + $v_ew*$v_ew);
+		    $heading = atan2($v_ew, $v_ns)*360.0/(2*pi());
+		    if ($heading < 0) $heading = $heading + 360;
 		    $data['speed'] = $speed;
 		    $data['heading'] = $heading;
 		}
@@ -117,7 +117,7 @@ 
 
 	public function cprNL($lat) {
 	//Lookup table to convert the latitude to index.
-	if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
+	if ($lat < 0) $lat = -$lat; // Table is simmetric about the equator.
 	if ($lat < 10.47047130) return 59;
 	if ($lat < 14.82817437) return 58;
 	if ($lat < 18.18626357) return 57;
@@ -179,7 +179,7 @@ 
 	return 1;
     }
     
-    public function cprN($lat,$isodd) {
+    public function cprN($lat, $isodd) {
 	$nl = $this->cprNL($lat) - $isodd;
 	if ($nl > 1) return $nl;
 	else return 1;
@@ -205,10 +205,10 @@ 
 );
 
 	$crc = 0;
-	$checksum = intval(substr($msg,22,6),16);
+	$checksum = intval(substr($msg, 22, 6), 16);
 
 	for ($j = 0; $j < strlen($bin); $j++) {
-	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+	    if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j], 0);
 	}
 	if ($crc == $checksum) return true;
 	else {

require/class.SpotterImport.php

Doc Comments +4 added lines

@@ -40,6 +40,10 @@
 	}
     }
 
+    /**
+     * @param string $id
+     * @param string $ident
+     */
     function get_Schedule($id,$ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time

Spacing +127 added lines, -127 removed lines

@@ -29,18 +29,18 @@ 
 	$currentdate = date('Y-m-d');
 	$sourcestat = $Stats->getStatsSource($currentdate);
 	if (!empty($sourcestat)) {
-	    foreach($sourcestat as $srcst) {
+	    foreach ($sourcestat as $srcst) {
 	    	$type = $srcst['stats_type'];
 		if ($type == 'polar' || $type == 'hist') {
 		    $source = $srcst['source_name'];
 		    $data = $srcst['source_data'];
-		    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
+		    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
 	        }
 	    }
 	}
     }
 
-    public function get_Schedule($id,$ident) {
+    public function get_Schedule($id, $ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -64,8 +64,8 @@ 
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
 		    // Should also check if route schedule = route from DB
 		    if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -85,7 +85,7 @@ 
 			    }
 			}
 		    }
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
 		}
 	    }
 	}
@@ -115,7 +115,7 @@ 
 		//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
     		$Spotter = new Spotter($this->db);
         	$real_arrival = $this->arrival($key);
-        	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+        	$Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
             }
 	}
     }
@@ -128,7 +128,7 @@ 
         $airport_time = '';
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
     	    if (isset($closestAirports[0])) {
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -143,7 +143,7 @@ 
         		    break;
         		}
         	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
@@ -156,7 +156,7 @@ 
         } else {
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
         }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
     }
 
 
@@ -167,7 +167,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_flights as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
+        	if ($flight['lastupdate'] < (time() - 3000)) {
             	    if (isset($this->all_flights[$key]['id'])) {
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
 			/*
@@ -178,7 +178,7 @@ 
             		$real_arrival = $this->arrival($key);
             		$Spotter = new Spotter($this->db);
             		if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
@@ -214,7 +214,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && isset($line['hex'])) {
+	if (is_array($line) && isset($line['hex'])) {
 	    //print_r($line);
   	    if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
 
@@ -248,7 +248,7 @@ 
 		//print_r($this->all_flights);
 		if (!isset($this->all_flights[$id]['hex']) && ctype_xdigit($hex)) {
 		    $this->all_flights[$id] = array('hex' => $hex);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -258,7 +258,7 @@ 
 			$Spotter = new Spotter($this->db);
 			$aircraft_icao = $Spotter->getAllAircraftType($hex);
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
 			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
@@ -266,32 +266,32 @@ 
 			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
 			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
 			}
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 		    } else if (isset($line['aircraft_name'])) {
 			// Get aircraft ICAO from aircraft name
 			$Spotter = new Spotter($this->db);
 			$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
 			$Spotter->db = null;
-			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
-			else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+			if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
+			else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $line['aircraft_icao']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
 
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n";
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		
-		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+		if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) {
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
@@ -302,23 +302,23 @@ 
 				*/
 				return '';
 		    }
-		} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+		} else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id']));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name']));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			$timeelapsed = microtime(true);
             		$Spotter = new Spotter($this->db);
@@ -328,10 +328,10 @@ 
 			elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
 			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
 			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-            		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
+            		$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 		    }
 
 /*
@@ -342,24 +342,24 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 
 		    //$putinarchive = true;
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
 		    }
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
 		    }
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -372,34 +372,34 @@ 
 				$Translation->db = null;
 			}
 			$Spotter->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop']));
 		    	    }
 			}
 			if (!isset($globalFork)) $globalFork = TRUE;
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
 			}
 		    }
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
 		    //$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
 		    if ($distance > 1000 && $distance < 10000) {
 		    // use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
+			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n";
 		    }
 		}
@@ -407,11 +407,11 @@ 
 
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
+	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) {
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -419,10 +419,10 @@ 
 				if ($globalDebug) echo "\n".' ------- Check Country.... ';
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
-				$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+				$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 				if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
 			    }
@@ -431,13 +431,13 @@ 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -455,13 +455,13 @@ 
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -479,45 +479,45 @@ 
 		    } else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
 		    //$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
 		    //$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// Here we force archive of flight because after ground it's a new one (or should be)
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
+			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		    }
 		    if ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
 		    //$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 			    $highlight = '';
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -525,48 +525,48 @@ 
 			    if ($highlight != '') {
 				$timeelapsed = microtime(true);
 				$Spotter = new Spotter($this->db);
-				$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+				$Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
 				$Spotter->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				$this->all_flights[$id]['putinarchive'] = true;
 				//$putinarchive = true;
 				//$highlight = '';
 			    }
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true;
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true;
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
   		    // If not enough messages and ACARS set heading to 0
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
   		}
-		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
-		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
+		if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
+		elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
 
 //		print_r($this->all_flights[$id]);
 		//gets the callsign from the last hour
@@ -576,7 +576,7 @@ 
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
 		    $this->all_flights[$id]['lastupdate'] = time();
 		    if ($this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    //print_r($this->all_flights);
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -586,61 +586,61 @@ 
 				$SpotterLive = new SpotterLive($this->db);
 				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
 				    $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} elseif (isset($line['id'])) {
 				    $recent_ident = $SpotterLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 				    $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else $recent_ident = '';
-				$SpotterLive->db=null;
+				$SpotterLive->db = null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 			    } else {
 				$recent_ident = '';
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
 				$ignoreImport = false;
-				foreach($globalAirportIgnore as $airportIgnore) {
+				foreach ($globalAirportIgnore as $airportIgnore) {
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
 				    }
 				}
 				if (count($globalAirportAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+				    foreach ($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 					    $ignoreImport = true;
 					}
 				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				    foreach ($globalAirlineAccept as $airlineAccept) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 					    $ignoreImport = false;
 					}
@@ -652,27 +652,27 @@ 
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				    $timeelapsed = microtime(true);
 				    $Spotter = new Spotter($this->db);
-				    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name']);
+				    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name']);
 				    $Spotter->db = null;
 				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        foreach ($this->stats as $date => $data) {
+					    foreach ($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -708,18 +708,18 @@ 
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
 				    $SpotterLive = new SpotterLive($this->db);
 				    $SpotterLive->deleteLiveSpotterData();
-				    $SpotterLive->db=null;
+				    $SpotterLive->db = null;
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
 			    } else {
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
 				    $this->all_flights[$id]['id'] = $recent_ident;
 				    $this->all_flights[$id]['addedSpotter'] = 1;
 				}
 				if (isset($globalDaemon) && !$globalDaemon) {
 					$Spotter = new Spotter($this->db);
-					$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+					$Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
 					$Spotter->db = null;
 				}
 				
@@ -743,37 +743,37 @@ 
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
+		    foreach ($globalAirportIgnore as $airportIgnore) {
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 			    $ignoreImport = true;
 			}
 		    }
 		    if (count($globalAirportAccept) > 0) {
 		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
+		        foreach ($globalAirportIgnore as $airportIgnore) {
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 				$ignoreImport = true;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+			foreach ($globalAirlineAccept as $airlineAccept) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 			        $ignoreImport = false;
 			    }
@@ -781,13 +781,13 @@ 
 		    }
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
 				$SpotterLive = new SpotterLive($this->db);
-				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
+				$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
 				$SpotterLive->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				// Put statistics in $this->stats variable
 				//if ($line['format_source'] != 'aprs') {
@@ -805,19 +805,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -832,9 +832,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -847,7 +847,7 @@ 
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
 				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			

require/class.Translation.php

Doc Comments +8 added lines

@@ -58,6 +58,10 @@ 
                 } else return $ident;
         }
 
+       /**
+        * @param string $correct_ident
+        * @param string $source
+        */
        public function addOperator($ident,$correct_ident,$source) {
                 $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
                 $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
@@ -69,6 +73,10 @@ 
                 }
         }
 
+       /**
+        * @param string $correct_ident
+        * @param string $source
+        */
        public function updateOperator($ident,$correct_ident,$source) {
                 $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
                 $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);

Spacing +11 added lines, -11 removed lines

@@ -31,12 +31,12 @@ 
             } else return $ident;
         } else return $ident;
         if ($airline_icao == 'AF') {
-            if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-            else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+            if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+            else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
         } else {
             $identicao = $Spotter->getAllAirlineInfo($airline_icao);
             if (isset($identicao[0])) {
-                $icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+                $icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
             } else $icao = $ident;
         }
         return $icao;
@@ -49,7 +49,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -58,29 +58,29 @@ 
                 } else return $ident;
         }
 
-       public function addOperator($ident,$correct_ident,$source) {
+       public function addOperator($ident, $correct_ident, $source) {
                 $query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+                $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
 
-       public function updateOperator($ident,$correct_ident,$source) {
+       public function updateOperator($ident, $correct_ident, $source) {
                 $query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
-                $query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
+                $query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
         
-        public function checkTranslation($ident,$web = false) {
+        public function checkTranslation($ident, $web = false) {
     	    global $globalTranslationSources, $globalTranslationFetch;
     	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
     	    $globalTranslationSources = array();

require/libs/geoPHP/geoPHP.inc

Doc Comments +7 added lines

@@ -118,6 +118,9 @@ 
     );

   }

 

+  /**
+   * @param boolean $force
+   */
   static function geosInstalled($force = NULL) {

     static $geos_installed = NULL;

     if ($force !== NULL) $geos_installed = $force;

@@ -222,6 +225,10 @@ 
 

   // Detect a format given a value. This function is meant to be SPEEDY.

   // It could make a mistake in XML detection if you are mixing or using namespaces in weird ways (ie, KML inside an RSS feed)

+
+  /**
+   * @return string
+   */
   static function detectFormat(&$input) {

     $mem = fopen('php://memory', 'r+');

     fwrite($mem, $input, 11); // Write 11 bytes - we can detect the vast majority of formats in the first 11 bytes

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
   }

 

   static function getAdapterMap() {

-    return array (

+    return array(

       'wkt' =>  'WKT',

       'ewkt' => 'EWKT',

       'wkb' =>  'WKB',

@@ -154,8 +154,8 @@ 
 

     // If the geometry cannot even theoretically be reduced more, then pass it back

     if (gettype($geometry) == 'object') {

-      $passbacks = array('Point','LineString','Polygon');

-      if (in_array($geometry->geometryType(),$passbacks)) {

+      $passbacks = array('Point', 'LineString', 'Polygon');

+      if (in_array($geometry->geometryType(), $passbacks)) {

         return $geometry;

       }

     }

@@ -163,8 +163,8 @@ 
     // If it is a mutlti-geometry, check to see if it just has one member

     // If it does, then pass the member, if not, then just pass back the geometry

     if (gettype($geometry) == 'object') {

-      $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

-      if (in_array(get_class($geometry),$passbacks)) {

+      $simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon');

+      if (in_array(get_class($geometry), $passbacks)) {

         $components = $geometry->getComponents();

         if (count($components) == 1) {

           return $components[0];

@@ -183,7 +183,7 @@ 
     $geometries = array();

     $geom_types = array();

 

-    $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

+    $collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection');

 

     foreach ($geometry as $item) {

       if ($item) {

require/libs/geoPHP/lib/adapters/GeoJSON.class.php

Doc Comments +3 added lines, -1 removed lines

@@ -113,7 +113,6 @@ 
    * Serializes an object into a geojson string
    *
    *
-   * @param Geometry $obj The object to serialize
    *
    * @return string The GeoJSON string
    */
@@ -126,6 +125,9 @@ 
     }
   }
 
+  /**
+   * @param Geometry $geometry
+   */
   public function getArray($geometry) {
     if ($geometry->getGeomType() == 'GeometryCollection') {
       $component_array = array();

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     if ($type == 'GeometryCollection') {
       return $this->objToGeometryCollection($obj);
     }
-    $method = 'arrayTo' . $type;
+    $method = 'arrayTo'.$type;
     return $this->$method($obj->coordinates);
   }