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.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.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);
   }
 

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

Doc Comments +3 added lines, -2 removed lines

@@ -18,8 +18,6 @@ 
   /**

    * Read GeoRSS string into geometry objects

    *

-   * @param string $georss - an XML feed containing geoRSS

-   *

    * @return Geometry|GeometryCollection

    */

   public function read($gpx) {

@@ -80,6 +78,9 @@ 
     return geoPHP::geometryReduce($geometries); 

   }

   

+  /**
+   * @param string $string
+   */
   protected function getPointsFromCoords($string) {

     $coords = array();

     $latlon = explode(' ',$string);

Spacing +11 added lines, -11 removed lines

@@ -44,21 +44,21 @@ 
   public function geomFromText($text) {

     // Change to lower-case, strip all CDATA, and de-namespace

     $text = strtolower($text);

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

         

     // Load into DOMDOcument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid GeoRSS: ". $text);

+      throw new Exception("Invalid GeoRSS: ".$text);

     }

     

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From GeoRSS: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -82,9 +82,9 @@ 
   

   protected function getPointsFromCoords($string) {

     $coords = array();

-    $latlon = explode(' ',$string);

+    $latlon = explode(' ', $string);

     foreach ($latlon as $key => $item) {

-      if (!($key % 2)) {

+      if (!($key%2)) {

         // It's a latitude

         $lat = $item;

       }

@@ -139,7 +139,7 @@ 
     $polygons = array();

     $box_elements = $this->xmlobj->getElementsByTagName('box');

     foreach ($box_elements as $box) {

-      $parts = explode(' ',trim($box->firstChild->nodeValue));

+      $parts = explode(' ', trim($box->firstChild->nodeValue));

       $components = array(

         new Point($parts[3], $parts[2]),

         new Point($parts[3], $parts[0]),

@@ -159,7 +159,7 @@ 
     $points = array();

     $circle_elements = $this->xmlobj->getElementsByTagName('circle');

     foreach ($circle_elements as $circle) {

-      $parts = explode(' ',trim($circle->firstChild->nodeValue));

+      $parts = explode(' ', trim($circle->firstChild->nodeValue));

       $points[] = new Point($parts[1], $parts[0]);

     }

     return $points;

@@ -196,7 +196,7 @@ 
     $output = '<'.$this->nss.'line>';

     foreach ($geom->getComponents() as $k => $point) {

       $output .= $point->getY().' '.$point->getX();

-      if ($k < ($geom->numGeometries() -1)) $output .= ' ';

+      if ($k < ($geom->numGeometries() - 1)) $output .= ' ';

     }

     $output .= '</'.$this->nss.'line>';

     return $output;

@@ -207,7 +207,7 @@ 
     $exterior_ring = $geom->exteriorRing();

     foreach ($exterior_ring->getComponents() as $k => $point) {

       $output .= $point->getY().' '.$point->getX();

-      if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';

+      if ($k < ($exterior_ring->numGeometries() - 1)) $output .= ' ';

     }

     $output .= '</'.$this->nss.'polygon>';

     return $output;

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

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
     return '<'.$this->nss.'gpx creator="geoPHP" version="1.0">'.$this->geometryToGPX($geometry).'</'.$this->nss.'gpx>';

   }

   

+  /**
+   * @param string $text
+   */
   public function geomFromText($text) {

     // Change to lower-case and strip all CDATA

     $text = strtolower($text);

Spacing +6 added lines, -6 removed lines

@@ -45,21 +45,21 @@ 
   public function geomFromText($text) {

     // Change to lower-case and strip all CDATA

     $text = strtolower($text);

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

     

     // Load into DOMDocument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid GPX: ". $text);

+      throw new Exception("Invalid GPX: ".$text);

     }

     

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From GPX: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From GPX: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -112,7 +112,7 @@ 
           $components[] = new Point($lon, $lat);

         }

       }

-      if ($components) {$lines[] = new LineString($components);}

+      if ($components) {$lines[] = new LineString($components); }

     }

     return $lines;

   }

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

Doc Comments +6 added lines

@@ -49,6 +49,9 @@ 
     return $this->geometryToKML($geometry);

   }

 

+  /**
+   * @param string $text
+   */
   public function geomFromText($text) {

 

     // Change to lower-case and strip all CDATA

@@ -184,6 +187,9 @@ 
     return $coordinates;

   }

 

+  /**
+   * @param Geometry $geom
+   */
   private function geometryToKML($geom) {

     $type = strtolower($geom->getGeomType());

     switch ($type) {

Spacing +16 added lines, -16 removed lines

@@ -53,21 +53,21 @@ 
 

     // Change to lower-case and strip all CDATA

     $text = mb_strtolower($text, mb_detect_encoding($text));

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

 

     // Load into DOMDOcument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid KML: ". $text);

+      throw new Exception("Invalid KML: ".$text);

     }

 

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From KML: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From KML: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -115,14 +115,14 @@ 
 

   protected function parsePoint($xml) {

     $coordinates = $this->_extractCoordinates($xml);

-    return new Point($coordinates[0][0],$coordinates[0][1]);

+    return new Point($coordinates[0][0], $coordinates[0][1]);

   }

 

   protected function parseLineString($xml) {

     $coordinates = $this->_extractCoordinates($xml);

     $point_array = array();

     foreach ($coordinates as $set) {

-      $point_array[] = new Point($set[0],$set[1]);

+      $point_array[] = new Point($set[0], $set[1]);

     }

     return new LineString($point_array);

   }

@@ -173,7 +173,7 @@ 
       foreach ($coord_sets as $set_string) {

         $set_string = trim($set_string);

         if ($set_string) {

-          $set_array = explode(',',$set_string);

+          $set_array = explode(',', $set_string);

           if (count($set_array) >= 2) {

             $coordinates[] = $set_array;

           }

@@ -214,21 +214,21 @@ 
       $type = $geom->getGeomType();

     }

 

-    $str = '<'.$this->nss . $type .'>';

+    $str = '<'.$this->nss.$type.'>';

 

     if (!$geom->isEmpty()) {

       $str .= '<'.$this->nss.'coordinates>';

-      $i=0;

+      $i = 0;

       foreach ($geom->getComponents() as $comp) {

         if ($i != 0) $str .= ' ';

-        $str .= $comp->getX() .','. $comp->getY();

+        $str .= $comp->getX().','.$comp->getY();

         $i++;

       }

 

       $str .= '</'.$this->nss.'coordinates>';

     }

 

-    $str .= '</'. $this->nss . $type .'>';

+    $str .= '</'.$this->nss.$type.'>';

 

     return $str;

   }

@@ -236,13 +236,13 @@ 
   public function polygonToKML($geom) {

     $components = $geom->getComponents();

     if (!empty($components)) {

-      $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';

+      $str = '<'.$this->nss.'outerBoundaryIs>'.$this->linestringToKML($components[0], 'LinearRing').'</'.$this->nss.'outerBoundaryIs>';

       foreach (array_slice($components, 1) as $comp) {

-        $str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';

+        $str .= '<'.$this->nss.'innerBoundaryIs>'.$this->linestringToKML($comp).'</'.$this->nss.'innerBoundaryIs>';

       }

     }

 

-    return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';

+    return '<'.$this->nss.'Polygon>'.$str.'</'.$this->nss.'Polygon>';

   }

 

   public function collectionToKML($geom) {

@@ -253,7 +253,7 @@ 
       $str .= $sub_adapter->write($comp);

     }

 

-    return $str .'</'.$this->nss.'MultiGeometry>';

+    return $str.'</'.$this->nss.'MultiGeometry>';

   }

 

 }