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();

Braces +12 added lines, -4 removed lines

@@ -14,7 +14,9 @@ 
 			//foreach ($lines as $line)
 			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) == ';')
 				{
@@ -40,7 +42,9 @@ 
 		//foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename)
 		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;
 	}
@@ -56,13 +60,17 @@ 
 		// Dirty hack
 		if ($host != 'localhost' && $host != '127.0.0.1') {
 		    $grantright = $_SERVER['SERVER_ADDR'];
-		} else $grantright = 'localhost';
+		} else {
+			$grantright = 'localhost';
+		}
 		try {
 			$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;");
-				if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				if ($grantright == 'localhost') {
+					$dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;");
+				}
 			} else if ($db_type == 'pgsql') {
 				$dbh->exec("CREATE DATABASE ".$db.";");
 				$dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."';

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;

Braces +2 added lines, -10 removed lines

@@ -215,14 +215,7 @@ 
 		}
 		$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(); }
-		else { print "<p>Unknown capability code: '$code'</p>"; return false; }
+		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 ) )
 		{
@@ -231,8 +224,7 @@ 
 			if( $was_cached )
 			{
 				dba_replace( $db_key, $db_val, $this->caps_cache );
-			}
-			else
+			} else
 			{
 				dba_insert( $db_key, $db_val, $this->caps_cache );
 			}

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()
 	{

Braces +6 added lines, -2 removed lines

@@ -86,7 +86,9 @@ 
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {
@@ -112,7 +114,9 @@ 
 		$available = $this->listLocaleDir();
 		$allAvailableLanguages = array();
 		foreach ($available as $lang) {
-			if (isset($this->all_languages[$lang])) $allAvailableLanguages[$lang] = $this->all_languages[$lang];
+			if (isset($this->all_languages[$lang])) {
+				$allAvailableLanguages[$lang] = $this->all_languages[$lang];
+			}
 		}
 		return $allAvailableLanguages;
 	}

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

Braces +20 added lines, -7 removed lines

@@ -28,16 +28,25 @@ 
             } elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
         	//$airline_icao = substr($ident, 0, 3);
         	return $ident;
-            } else return $ident;
-        } else return $ident;
+            } 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');
-            } else $icao = $ident;
+            } else {
+            	$icao = $ident;
+            }
         }
         return $icao;
     }
@@ -56,7 +65,9 @@ 
                 $sth->closeCursor();
                 if (count($row) > 0) {
                         return $row['operator_correct'];
-                } else return $ident;
+                } else {
+                	return $ident;
+                }
         }
 
        public function addOperator($ident,$correct_ident,$source) {
@@ -85,7 +96,9 @@ 
     	    global $globalTranslationSources, $globalTranslationFetch;
     	    //if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
     	    $globalTranslationSources = array();
-    	    if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+    	    if (!isset($globalTranslationFetch)) {
+    	    	$globalTranslationFetch = TRUE;
+    	    }
     	    //echo "Check Translation for ".$ident."...";
     	    $correct = $this->getOperator($ident);
     	    if ($correct != '' && $correct != $ident) {

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

Braces +42 added lines, -21 removed lines

@@ -52,7 +52,9 @@ 
     if (!$type) {

       // If the user is trying to load a Geometry from a Geometry... Just pass it back

       if (is_object($data)) {

-        if ($data instanceOf Geometry) return $data;

+        if ($data instanceOf Geometry) {
+        	return $data;
+        }
       }

       

       $detected = geoPHP::detectFormat($data);

@@ -120,7 +122,9 @@ 
 

   static function geosInstalled($force = NULL) {

     static $geos_installed = NULL;

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

+    if ($force !== NULL) {
+    	$geos_installed = $force;
+    }
     if ($geos_installed !== NULL) {

       return $geos_installed;

     }

@@ -148,8 +152,12 @@ 
   static function geometryReduce($geometry) {

     // If it's an array of one, then just parse the one

     if (is_array($geometry)) {

-      if (empty($geometry)) return FALSE;

-      if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));

+      if (empty($geometry)) {
+      	return FALSE;
+      }
+      if (count($geometry) == 1) {
+      	return geoPHP::geometryReduce(array_shift($geometry));
+      }
     }

 

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

@@ -168,8 +176,7 @@ 
         $components = $geometry->getComponents();

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

           return $components[0];

-        }

-        else {

+        } else {

           return $geometry;

         }

       }

@@ -192,8 +199,7 @@ 
             $geometries[] = $component;

             $geom_types[] = $component->geometryType();

           }

-        }

-        else {

+        } else {

           $geometries[] = $item;

           $geom_types[] = $item->geometryType();

         }

@@ -209,13 +215,11 @@ 
     if (count($geom_types) == 1) {

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

         return $geometries[0];

-      }

-      else {

+      } else {

         $class = 'Multi'.$geom_types[0];

         return new $class($geometries);

       }

-    }

-    else {

+    } else {

       return new GeometryCollection($geometries);

     }

   }

@@ -230,7 +234,9 @@ 
     $bytes = unpack("c*", fread($mem, 11));

 

     // If bytes is empty, then we were passed empty input

-    if (empty($bytes)) return FALSE;

+    if (empty($bytes)) {
+    	return FALSE;
+    }
 

     // First char is a tab, space or carriage-return. trim it and try again

     if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {

@@ -240,8 +246,11 @@ 
     // Detect WKB or EWKB -- first byte is 1 (little endian indicator)

     if ($bytes[1] == 1) {

       // If SRID byte is TRUE (1), it's EWKB

-      if ($bytes[5]) return 'ewkb';

-      else return 'wkb';

+      if ($bytes[5]) {
+      	return 'ewkb';
+      } else {
+      	return 'wkb';
+      }
     }

 

     // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)

@@ -274,12 +283,24 @@ 
     if ($bytes[1] == 60) {

       // grab the first 256 characters

       $string = substr($input, 0, 256);

-      if (strpos($string, '<kml') !== FALSE)        return 'kml';

-      if (strpos($string, '<coordinate') !== FALSE) return 'kml';

-      if (strpos($string, '<gpx') !== FALSE)        return 'gpx';

-      if (strpos($string, '<georss') !== FALSE)     return 'georss';

-      if (strpos($string, '<rss') !== FALSE)        return 'georss';

-      if (strpos($string, '<feed') !== FALSE)       return 'georss';

+      if (strpos($string, '<kml') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<coordinate') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<gpx') !== FALSE) {
+      	return 'gpx';
+      }
+      if (strpos($string, '<georss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<rss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<feed') !== FALSE) {
+      	return 'georss';
+      }
     }

 

     // We need an 8 byte string for geohash and unpacked WKB / WKT

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();

Braces +4 added lines, -4 removed lines

@@ -120,8 +120,7 @@ 
   public function write(Geometry $geometry, $return_array = FALSE) {
     if ($return_array) {
       return $this->getArray($geometry);
-    }
-    else {
+    } else {
       return json_encode($this->getArray($geometry));
     }
   }
@@ -139,11 +138,12 @@ 
         'type'=> 'GeometryCollection',
         'geometries'=> $component_array,
       );
-    }
-    else return array(
+    } else {
+    	return array(
       'type'=> $geometry->getGeomType(),
       'coordinates'=> $geometry->asArray(),
     );
+    }
   }
 }
 

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

Braces +8 added lines, -6 removed lines

@@ -87,8 +87,7 @@ 
       if (!($key % 2)) {

         // It's a latitude

         $lat = $item;

-      }

-      else {

+      } else {

         // It's a longitude

         $lon = $item;

         $coords[] = new Point($lon, $lat);

@@ -125,8 +124,7 @@ 
         $points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));

         $exterior_ring = new LineString($points);

         $polygons[] = new Polygon(array($exterior_ring));

-      }

-      else {

+      } else {

         // It's an EMPTY polygon

         $polygons[] = new Polygon(); 

       }

@@ -196,7 +194,9 @@ 
     $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,9 @@ 
     $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);

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
    * @return string The GPX string representation of the input geometries

    */

   public function write(Geometry $geometry, $namespace = FALSE) {

-    if ($geometry->isEmpty()) return NULL;

+    if ($geometry->isEmpty()) {
+    	return NULL;
+    }
     if ($namespace) {

       $this->namespace = $namespace;

       $this->nss = $namespace.':';    

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) {

Braces +4 added lines, -3 removed lines

@@ -89,8 +89,7 @@ 
           }

         }

       }

-    }

-    else {

+    } else {

       // The document does not have a placemark, try to create a valid geometry from the root element

       $node_name = $this->xmlobj->documentElement->nodeName == 'multigeometry' ? 'geometrycollection' : $this->xmlobj->documentElement->nodeName;

       if (array_key_exists($node_name, $geom_types)) {

@@ -220,7 +219,9 @@ 
       $str .= '<'.$this->nss.'coordinates>';

       $i=0;

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

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

+        if ($i != 0) {
+        	$str .= ' ';
+        }
         $str .= $comp->getX() .','. $comp->getY();

         $i++;

       }