Ysurac / FlightAirMap

require/libs/geoPHP/lib/geometry/Collection.class.php

Indentation +188 added lines, -188 removed lines

@@ -18,17 +18,17 @@ 
    * @param array $components array of geometries
    */
   public function __construct($components = array()) {
-    if (!is_array($components)) {
-      throw new Exception("Component geometries must be passed as an array");
-    }
-    foreach ($components as $component) {
-      if ($component instanceof Geometry) {
-        $this->components[] = $component;
-      }
-      else {
-        throw new Exception("Cannot create a collection with non-geometries");
-      }
-    }
+	if (!is_array($components)) {
+	  throw new Exception("Component geometries must be passed as an array");
+	}
+	foreach ($components as $component) {
+	  if ($component instanceof Geometry) {
+		$this->components[] = $component;
+	  }
+	  else {
+		throw new Exception("Cannot create a collection with non-geometries");
+	  }
+	}
   }
 
   /**
@@ -37,244 +37,244 @@ 
    * @return array
    */
   public function getComponents() {
-    return $this->components;
+	return $this->components;
   }
 
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+	if ($this->isEmpty()) return NULL;
 
-    if ($this->geos()) {
-      $geos_centroid = $this->geos()->centroid();
-      if ($geos_centroid->typeName() == 'Point') {
-        return geoPHP::geosToGeometry($this->geos()->centroid());
-      }
-    }
+	if ($this->geos()) {
+	  $geos_centroid = $this->geos()->centroid();
+	  if ($geos_centroid->typeName() == 'Point') {
+		return geoPHP::geosToGeometry($this->geos()->centroid());
+	  }
+	}
 
-    // As a rough estimate, we say that the centroid of a colletion is the centroid of it's envelope
-    // @@TODO: Make this the centroid of the convexHull
-    // Note: Outside of polygons, geometryCollections and the trivial case of points, there is no standard on what a "centroid" is
-    $centroid = $this->envelope()->centroid();
+	// As a rough estimate, we say that the centroid of a colletion is the centroid of it's envelope
+	// @@TODO: Make this the centroid of the convexHull
+	// Note: Outside of polygons, geometryCollections and the trivial case of points, there is no standard on what a "centroid" is
+	$centroid = $this->envelope()->centroid();
 
-    return $centroid;
+	return $centroid;
   }
 
   public function getBBox() {
-    if ($this->isEmpty()) return NULL;
-
-    if ($this->geos()) {
-      $envelope = $this->geos()->envelope();
-      if ($envelope->typeName() == 'Point') {
-        return geoPHP::geosToGeometry($envelope)->getBBOX();
-      }
-
-      $geos_ring = $envelope->exteriorRing();
-      return array(
-        'maxy' => $geos_ring->pointN(3)->getY(),
-        'miny' => $geos_ring->pointN(1)->getY(),
-        'maxx' => $geos_ring->pointN(1)->getX(),
-        'minx' => $geos_ring->pointN(3)->getX(),
-      );
-    }
-
-    // Go through each component and get the max and min x and y
-    $i = 0;
-    foreach ($this->components as $component) {
-      $component_bbox = $component->getBBox();
-
-      // On the first run through, set the bbox to the component bbox
-      if ($i == 0) {
-        $maxx = $component_bbox['maxx'];
-        $maxy = $component_bbox['maxy'];
-        $minx = $component_bbox['minx'];
-        $miny = $component_bbox['miny'];
-      }
-
-      // Do a check and replace on each boundary, slowly growing the bbox
-      $maxx = $component_bbox['maxx'] > $maxx ? $component_bbox['maxx'] : $maxx;
-      $maxy = $component_bbox['maxy'] > $maxy ? $component_bbox['maxy'] : $maxy;
-      $minx = $component_bbox['minx'] < $minx ? $component_bbox['minx'] : $minx;
-      $miny = $component_bbox['miny'] < $miny ? $component_bbox['miny'] : $miny;
-      $i++;
-    }
-
-    return array(
-      'maxy' => $maxy,
-      'miny' => $miny,
-      'maxx' => $maxx,
-      'minx' => $minx,
-    );
+	if ($this->isEmpty()) return NULL;
+
+	if ($this->geos()) {
+	  $envelope = $this->geos()->envelope();
+	  if ($envelope->typeName() == 'Point') {
+		return geoPHP::geosToGeometry($envelope)->getBBOX();
+	  }
+
+	  $geos_ring = $envelope->exteriorRing();
+	  return array(
+		'maxy' => $geos_ring->pointN(3)->getY(),
+		'miny' => $geos_ring->pointN(1)->getY(),
+		'maxx' => $geos_ring->pointN(1)->getX(),
+		'minx' => $geos_ring->pointN(3)->getX(),
+	  );
+	}
+
+	// Go through each component and get the max and min x and y
+	$i = 0;
+	foreach ($this->components as $component) {
+	  $component_bbox = $component->getBBox();
+
+	  // On the first run through, set the bbox to the component bbox
+	  if ($i == 0) {
+		$maxx = $component_bbox['maxx'];
+		$maxy = $component_bbox['maxy'];
+		$minx = $component_bbox['minx'];
+		$miny = $component_bbox['miny'];
+	  }
+
+	  // Do a check and replace on each boundary, slowly growing the bbox
+	  $maxx = $component_bbox['maxx'] > $maxx ? $component_bbox['maxx'] : $maxx;
+	  $maxy = $component_bbox['maxy'] > $maxy ? $component_bbox['maxy'] : $maxy;
+	  $minx = $component_bbox['minx'] < $minx ? $component_bbox['minx'] : $minx;
+	  $miny = $component_bbox['miny'] < $miny ? $component_bbox['miny'] : $miny;
+	  $i++;
+	}
+
+	return array(
+	  'maxy' => $maxy,
+	  'miny' => $miny,
+	  'maxx' => $maxx,
+	  'minx' => $minx,
+	);
   }
 
   public function asArray() {
-    $array = array();
-    foreach ($this->components as $component) {
-      $array[] = $component->asArray();
-    }
-    return $array;
+	$array = array();
+	foreach ($this->components as $component) {
+	  $array[] = $component->asArray();
+	}
+	return $array;
   }
 
   public function area() {
-    if ($this->geos()) {
-      return $this->geos()->area();
-    }
-
-    $area = 0;
-    foreach ($this->components as $component) {
-      $area += $component->area();
-    }
-    return $area;
+	if ($this->geos()) {
+	  return $this->geos()->area();
+	}
+
+	$area = 0;
+	foreach ($this->components as $component) {
+	  $area += $component->area();
+	}
+	return $area;
   }
 
   // By default, the boundary of a collection is the boundary of it's components
   public function boundary() {
-    if ($this->isEmpty()) return new LineString();
+	if ($this->isEmpty()) return new LineString();
 
-    if ($this->geos()) {
-      return $this->geos()->boundary();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->boundary();
+	}
 
-    $components_boundaries = array();
-    foreach ($this->components as $component) {
-      $components_boundaries[] = $component->boundary();
-    }
-    return geoPHP::geometryReduce($components_boundaries);
+	$components_boundaries = array();
+	foreach ($this->components as $component) {
+	  $components_boundaries[] = $component->boundary();
+	}
+	return geoPHP::geometryReduce($components_boundaries);
   }
 
   public function numGeometries() {
-    return count($this->components);
+	return count($this->components);
   }
 
   // Note that the standard is 1 based indexing
   public function geometryN($n) {
-    $n = intval($n);
-    if (array_key_exists($n-1, $this->components)) {
-      return $this->components[$n-1];
-    }
-    else {
-      return NULL;
-    }
+	$n = intval($n);
+	if (array_key_exists($n-1, $this->components)) {
+	  return $this->components[$n-1];
+	}
+	else {
+	  return NULL;
+	}
   }
 
   public function length() {
-    $length = 0;
-    foreach ($this->components as $delta => $component) {
-      $length += $component->length();
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $delta => $component) {
+	  $length += $component->length();
+	}
+	return $length;
   }
 
   public function greatCircleLength($radius = 6378137) {
-    $length = 0;
-    foreach ($this->components as $component) {
-      $length += $component->greatCircleLength($radius);
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $component) {
+	  $length += $component->greatCircleLength($radius);
+	}
+	return $length;
   }
 
   public function haversineLength() {
-    $length = 0;
-    foreach ($this->components as $component) {
-      $length += $component->haversineLength();
-    }
-    return $length;
+	$length = 0;
+	foreach ($this->components as $component) {
+	  $length += $component->haversineLength();
+	}
+	return $length;
   }
 
   public function dimension() {
-    $dimension = 0;
-    foreach ($this->components as $component) {
-      if ($component->dimension() > $dimension) {
-        $dimension = $component->dimension();
-      }
-    }
-    return $dimension;
+	$dimension = 0;
+	foreach ($this->components as $component) {
+	  if ($component->dimension() > $dimension) {
+		$dimension = $component->dimension();
+	  }
+	}
+	return $dimension;
   }
 
   // A collection is empty if it has no components OR all it's components are empty
   public function isEmpty() {
-    if (!count($this->components)) {
-      return TRUE;
-    }
-    else {
-      foreach ($this->components as $component) {
-        if (!$component->isEmpty()) return FALSE;
-      }
-      return TRUE;
-    }
+	if (!count($this->components)) {
+	  return TRUE;
+	}
+	else {
+	  foreach ($this->components as $component) {
+		if (!$component->isEmpty()) return FALSE;
+	  }
+	  return TRUE;
+	}
   }
 
   public function numPoints() {
-    $num = 0;
-    foreach ($this->components as $component) {
-      $num += $component->numPoints();
-    }
-    return $num;
+	$num = 0;
+	foreach ($this->components as $component) {
+	  $num += $component->numPoints();
+	}
+	return $num;
   }
 
   public function getPoints() {
-    $points = array();
-    foreach ($this->components as $component) {
-      $points = array_merge($points, $component->getPoints());
-    }
-    return $points;
+	$points = array();
+	foreach ($this->components as $component) {
+	  $points = array_merge($points, $component->getPoints());
+	}
+	return $points;
   }
 
   public function equals($geometry) {
-    if ($this->geos()) {
-      return $this->geos()->equals($geometry->geos());
-    }
-
-    // To test for equality we check to make sure that there is a matching point
-    // in the other geometry for every point in this geometry.
-    // This is slightly more strict than the standard, which
-    // uses Within(A,B) = true and Within(B,A) = true
-    // @@TODO: Eventually we could fix this by using some sort of simplification
-    // method that strips redundant vertices (that are all in a row)
-
-    $this_points = $this->getPoints();
-    $other_points = $geometry->getPoints();
-
-    // First do a check to make sure they have the same number of vertices
-    if (count($this_points) != count($other_points)) {
-      return FALSE;
-    }
-
-    foreach ($this_points as $point) {
-      $found_match = FALSE;
-      foreach ($other_points as $key => $test_point) {
-        if ($point->equals($test_point)) {
-          $found_match = TRUE;
-          unset($other_points[$key]);
-          break;
-        }
-      }
-      if (!$found_match) {
-        return FALSE;
-      }
-    }
-
-    // All points match, return TRUE
-    return TRUE;
+	if ($this->geos()) {
+	  return $this->geos()->equals($geometry->geos());
+	}
+
+	// To test for equality we check to make sure that there is a matching point
+	// in the other geometry for every point in this geometry.
+	// This is slightly more strict than the standard, which
+	// uses Within(A,B) = true and Within(B,A) = true
+	// @@TODO: Eventually we could fix this by using some sort of simplification
+	// method that strips redundant vertices (that are all in a row)
+
+	$this_points = $this->getPoints();
+	$other_points = $geometry->getPoints();
+
+	// First do a check to make sure they have the same number of vertices
+	if (count($this_points) != count($other_points)) {
+	  return FALSE;
+	}
+
+	foreach ($this_points as $point) {
+	  $found_match = FALSE;
+	  foreach ($other_points as $key => $test_point) {
+		if ($point->equals($test_point)) {
+		  $found_match = TRUE;
+		  unset($other_points[$key]);
+		  break;
+		}
+	  }
+	  if (!$found_match) {
+		return FALSE;
+	  }
+	}
+
+	// All points match, return TRUE
+	return TRUE;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
 
-    // A collection is simple if all it's components are simple
-    foreach ($this->components as $component) {
-      if (!$component->isSimple()) return FALSE;
-    }
+	// A collection is simple if all it's components are simple
+	foreach ($this->components as $component) {
+	  if (!$component->isSimple()) return FALSE;
+	}
 
-    return TRUE;
+	return TRUE;
   }
 
   public function explode() {
-    $parts = array();
-    foreach ($this->components as $component) {
-      $parts = array_merge($parts, $component->explode());
-    }
-    return $parts;
+	$parts = array();
+	foreach ($this->components as $component) {
+	  $parts = array_merge($parts, $component->explode());
+	}
+	return $parts;
   }
 
   // Not valid for this geometry type

Spacing +12 added lines, -12 removed lines

@@ -147,8 +147,8 @@ 
   // Note that the standard is 1 based indexing
   public function geometryN($n) {
     $n = intval($n);
-    if (array_key_exists($n-1, $this->components)) {
-      return $this->components[$n-1];
+    if (array_key_exists($n - 1, $this->components)) {
+      return $this->components[$n - 1];
     }
     else {
       return NULL;
@@ -279,16 +279,16 @@ 
 
   // Not valid for this geometry type
   // --------------------------------
-  public function x()                { return NULL; }
-  public function y()                { return NULL; }
-  public function startPoint()       { return NULL; }
-  public function endPoint()         { return NULL; }
-  public function isRing()           { return NULL; }
-  public function isClosed()         { return NULL; }
-  public function pointN($n)         { return NULL; }
-  public function exteriorRing()     { return NULL; }
+  public function x() { return NULL; }
+  public function y() { return NULL; }
+  public function startPoint() { return NULL; }
+  public function endPoint() { return NULL; }
+  public function isRing() { return NULL; }
+  public function isClosed() { return NULL; }
+  public function pointN($n) { return NULL; }
+  public function exteriorRing() { return NULL; }
   public function numInteriorRings() { return NULL; }
-  public function interiorRingN($n)  { return NULL; }
-  public function pointOnSurface()   { return NULL; }
+  public function interiorRingN($n) { return NULL; }
+  public function pointOnSurface() { return NULL; }
 }
 

Braces +18 added lines, -11 removed lines

@@ -24,8 +24,7 @@ 
     foreach ($components as $component) {
       if ($component instanceof Geometry) {
         $this->components[] = $component;
-      }
-      else {
+      } else {
         throw new Exception("Cannot create a collection with non-geometries");
       }
     }
@@ -41,7 +40,9 @@ 
   }
 
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
 
     if ($this->geos()) {
       $geos_centroid = $this->geos()->centroid();
@@ -59,7 +60,9 @@ 
   }
 
   public function getBBox() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
 
     if ($this->geos()) {
       $envelope = $this->geos()->envelope();
@@ -127,7 +130,9 @@ 
 
   // By default, the boundary of a collection is the boundary of it's components
   public function boundary() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+    	return new LineString();
+    }
 
     if ($this->geos()) {
       return $this->geos()->boundary();
@@ -149,8 +154,7 @@ 
     $n = intval($n);
     if (array_key_exists($n-1, $this->components)) {
       return $this->components[$n-1];
-    }
-    else {
+    } else {
       return NULL;
     }
   }
@@ -193,10 +197,11 @@ 
   public function isEmpty() {
     if (!count($this->components)) {
       return TRUE;
-    }
-    else {
+    } else {
       foreach ($this->components as $component) {
-        if (!$component->isEmpty()) return FALSE;
+        if (!$component->isEmpty()) {
+        	return FALSE;
+        }
       }
       return TRUE;
     }
@@ -263,7 +268,9 @@ 
 
     // A collection is simple if all it's components are simple
     foreach ($this->components as $component) {
-      if (!$component->isSimple()) return FALSE;
+      if (!$component->isSimple()) {
+      	return FALSE;
+      }
     }
 
     return TRUE;

require/libs/geoPHP/lib/geometry/LineString.class.php

Indentation +116 added lines, -116 removed lines

@@ -19,173 +19,173 @@
       throw new Exception("Cannot construct a LineString with a single point");
     }
 */
-    // Call the Collection constructor to build the LineString
-    parent::__construct($points);
+	// Call the Collection constructor to build the LineString
+	parent::__construct($points);
   }
 
   // The boundary of a linestring is itself
   public function boundary() {
-    return $this;
+	return $this;
   }
 
   public function startPoint() {
-    return $this->pointN(1);
+	return $this->pointN(1);
   }
 
   public function endPoint() {
-    $last_n = $this->numPoints();
-    return $this->pointN($last_n);
+	$last_n = $this->numPoints();
+	return $this->pointN($last_n);
   }
 
   public function isClosed() {
-    return ($this->startPoint()->equals($this->endPoint()));
+	return ($this->startPoint()->equals($this->endPoint()));
   }
 
   public function isRing() {
-    return ($this->isClosed() && $this->isSimple());
+	return ($this->isClosed() && $this->isSimple());
   }
 
   public function numPoints() {
-    return $this->numGeometries();
+	return $this->numGeometries();
   }
 
   public function pointN($n) {
-    return $this->geometryN($n);
+	return $this->geometryN($n);
   }
 
   public function dimension() {
-    if ($this->isEmpty()) return 0;
-    return 1;
+	if ($this->isEmpty()) return 0;
+	return 1;
   }
 
   public function area() {
-    return 0;
+	return 0;
   }
 
   public function length() {
-    if ($this->geos()) {
-      return $this->geos()->length();
-    }
-    $length = 0;
-    foreach ($this->getPoints() as $delta => $point) {
-      $previous_point = $this->geometryN($delta);
-      if ($previous_point) {
-        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
-      }
-    }
-    return $length;
+	if ($this->geos()) {
+	  return $this->geos()->length();
+	}
+	$length = 0;
+	foreach ($this->getPoints() as $delta => $point) {
+	  $previous_point = $this->geometryN($delta);
+	  if ($previous_point) {
+		$length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
+	  }
+	}
+	return $length;
   }
 
   public function greatCircleLength($radius = 6378137) {
-    $length = 0;
-    $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
-      $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
-      // Great circle method
-      $lat1 = deg2rad($point->getY());
-      $lat2 = deg2rad($next_point->getY());
-      $lon1 = deg2rad($point->getX());
-      $lon2 = deg2rad($next_point->getX());
-      $dlon = $lon2 - $lon1;
-      $length +=
-        $radius *
-          atan2(
-            sqrt(
-              pow(cos($lat2) * sin($dlon), 2) +
-                pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
-            )
-            ,
-            sin($lat1) * sin($lat2) +
-              cos($lat1) * cos($lat2) * cos($dlon)
-          );
-    }
-    // Returns length in meters.
-    return $length;
+	$length = 0;
+	$points = $this->getPoints();
+	for($i=0; $i<$this->numPoints()-1; $i++) {
+	  $point = $points[$i];
+	  $next_point = $points[$i+1];
+	  if (!is_object($next_point)) {continue;}
+	  // Great circle method
+	  $lat1 = deg2rad($point->getY());
+	  $lat2 = deg2rad($next_point->getY());
+	  $lon1 = deg2rad($point->getX());
+	  $lon2 = deg2rad($next_point->getX());
+	  $dlon = $lon2 - $lon1;
+	  $length +=
+		$radius *
+		  atan2(
+			sqrt(
+			  pow(cos($lat2) * sin($dlon), 2) +
+				pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
+			)
+			,
+			sin($lat1) * sin($lat2) +
+			  cos($lat1) * cos($lat2) * cos($dlon)
+		  );
+	}
+	// Returns length in meters.
+	return $length;
   }
 
   public function haversineLength() {
-    $degrees = 0;
-    $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
-      $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
-      $degree = rad2deg(
-        acos(
-          sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
-            cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) *
-              cos(deg2rad(abs($point->getX() - $next_point->getX())))
-        )
-      );
-      $degrees += $degree;
-    }
-    // Returns degrees
-    return $degrees;
+	$degrees = 0;
+	$points = $this->getPoints();
+	for($i=0; $i<$this->numPoints()-1; $i++) {
+	  $point = $points[$i];
+	  $next_point = $points[$i+1];
+	  if (!is_object($next_point)) {continue;}
+	  $degree = rad2deg(
+		acos(
+		  sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
+			cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) *
+			  cos(deg2rad(abs($point->getX() - $next_point->getX())))
+		)
+	  );
+	  $degrees += $degree;
+	}
+	// Returns degrees
+	return $degrees;
   }
 
   public function explode() {
-    $parts = array();
-    $points = $this->getPoints();
+	$parts = array();
+	$points = $this->getPoints();
 
-    foreach ($points as $i => $point) {
-      if (isset($points[$i+1])) {
-        $parts[] = new LineString(array($point, $points[$i+1]));
-      }
-    }
-    return $parts;
+	foreach ($points as $i => $point) {
+	  if (isset($points[$i+1])) {
+		$parts[] = new LineString(array($point, $points[$i+1]));
+	  }
+	}
+	return $parts;
   }
 
   public function isSimple() {
-    if ($this->geos()) {
-      return $this->geos()->isSimple();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->isSimple();
+	}
 
-    $segments = $this->explode();
+	$segments = $this->explode();
 
-    foreach ($segments as $i => $segment) {
-      foreach ($segments as $j => $check_segment) {
-        if ($i != $j) {
-          if ($segment->lineSegmentIntersect($check_segment)) {
-            return FALSE;
-          }
-        }
-      }
-    }
-    return TRUE;
+	foreach ($segments as $i => $segment) {
+	  foreach ($segments as $j => $check_segment) {
+		if ($i != $j) {
+		  if ($segment->lineSegmentIntersect($check_segment)) {
+			return FALSE;
+		  }
+		}
+	  }
+	}
+	return TRUE;
   }
 
   // Utility function to check if any line sigments intersect
   // Derived from http://stackoverflow.com/questions/563198/how-do-you-detect-where-two-line-segments-intersect
   public function lineSegmentIntersect($segment) {
-    $p0_x = $this->startPoint()->x();
-    $p0_y = $this->startPoint()->y();
-    $p1_x = $this->endPoint()->x();
-    $p1_y = $this->endPoint()->y();
-    $p2_x = $segment->startPoint()->x();
-    $p2_y = $segment->startPoint()->y();
-    $p3_x = $segment->endPoint()->x();
-    $p3_y = $segment->endPoint()->y();
-
-    $s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
-    $s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
-
-    $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
-    $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
-
-    if ($fps == 0 || $fpt == 0) {
-      return FALSE;
-    }
-
-    $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
-    $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
-
-    if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
-      // Collision detected
-      return TRUE;
-    }
-    return FALSE;
+	$p0_x = $this->startPoint()->x();
+	$p0_y = $this->startPoint()->y();
+	$p1_x = $this->endPoint()->x();
+	$p1_y = $this->endPoint()->y();
+	$p2_x = $segment->startPoint()->x();
+	$p2_y = $segment->startPoint()->y();
+	$p3_x = $segment->endPoint()->x();
+	$p3_y = $segment->endPoint()->y();
+
+	$s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
+	$s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
+
+	$fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
+	$fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
+
+	if ($fps == 0 || $fpt == 0) {
+	  return FALSE;
+	}
+
+	$s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
+	$t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
+
+	if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
+	  // Collision detected
+	  return TRUE;
+	}
+	return FALSE;
   }
 }
 

Spacing +22 added lines, -22 removed lines

@@ -70,7 +70,7 @@ 
     foreach ($this->getPoints() as $delta => $point) {
       $previous_point = $this->geometryN($delta);
       if ($previous_point) {
-        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
+        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY() - $point->getY()), 2));
       }
     }
     return $length;
@@ -79,10 +79,10 @@ 
   public function greatCircleLength($radius = 6378137) {
     $length = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints() - 1; $i++) {
       $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      $next_point = $points[$i + 1];
+      if (!is_object($next_point)) {continue; }
       // Great circle method
       $lat1 = deg2rad($point->getY());
       $lat2 = deg2rad($next_point->getY());
@@ -90,15 +90,15 @@ 
       $lon2 = deg2rad($next_point->getX());
       $dlon = $lon2 - $lon1;
       $length +=
-        $radius *
+        $radius*
           atan2(
             sqrt(
-              pow(cos($lat2) * sin($dlon), 2) +
-                pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
+              pow(cos($lat2)*sin($dlon), 2) +
+                pow(cos($lat1)*sin($lat2) - sin($lat1)*cos($lat2)*cos($dlon), 2)
             )
             ,
-            sin($lat1) * sin($lat2) +
-              cos($lat1) * cos($lat2) * cos($dlon)
+            sin($lat1)*sin($lat2) +
+              cos($lat1)*cos($lat2)*cos($dlon)
           );
     }
     // Returns length in meters.
@@ -108,14 +108,14 @@ 
   public function haversineLength() {
     $degrees = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints() - 1; $i++) {
       $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      $next_point = $points[$i + 1];
+      if (!is_object($next_point)) {continue; }
       $degree = rad2deg(
         acos(
-          sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
-            cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) *
+          sin(deg2rad($point->getY()))*sin(deg2rad($next_point->getY())) +
+            cos(deg2rad($point->getY()))*cos(deg2rad($next_point->getY()))*
               cos(deg2rad(abs($point->getX() - $next_point->getX())))
         )
       );
@@ -130,8 +130,8 @@ 
     $points = $this->getPoints();
 
     foreach ($points as $i => $point) {
-      if (isset($points[$i+1])) {
-        $parts[] = new LineString(array($point, $points[$i+1]));
+      if (isset($points[$i + 1])) {
+        $parts[] = new LineString(array($point, $points[$i + 1]));
       }
     }
     return $parts;
@@ -168,18 +168,18 @@ 
     $p3_x = $segment->endPoint()->x();
     $p3_y = $segment->endPoint()->y();
 
-    $s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
-    $s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
+    $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y;
+    $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y;
 
-    $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
-    $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
+    $fps = (-$s2_x*$s1_y) + ($s1_x*$s2_y);
+    $fpt = (-$s2_x*$s1_y) + ($s1_x*$s2_y);
 
     if ($fps == 0 || $fpt == 0) {
       return FALSE;
     }
 
-    $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
-    $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
+    $s = (-$s1_y*($p0_x - $p2_x) + $s1_x*($p0_y - $p2_y))/$fps;
+    $t = ($s2_x*($p0_y - $p2_y) - $s2_y*($p0_x - $p2_x))/$fpt;
 
     if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
       // Collision detected

Braces +3 added lines, -1 removed lines

@@ -54,7 +54,9 @@
   }
 
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return 1;
   }
 

require/libs/geoPHP/lib/geometry/Geometry.class.php

Indentation +146 added lines, -146 removed lines

@@ -46,38 +46,38 @@ 
   // Public: Standard -- Common to all geometries
   // --------------------------------------------
   public function SRID() {
-    return $this->srid;
+	return $this->srid;
   }
 
   public function setSRID($srid) {
-    if ($this->geos()) {
-      $this->geos()->setSRID($srid);
-    }
-    $this->srid = $srid;
+	if ($this->geos()) {
+	  $this->geos()->setSRID($srid);
+	}
+	$this->srid = $srid;
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+	if ($this->isEmpty()) return new Polygon();
 
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->envelope());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->envelope());
+	}
 
-    $bbox = $this->getBBox();
-    $points = array (
-      new Point($bbox['maxx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['miny']),
-    );
+	$bbox = $this->getBBox();
+	$points = array (
+	  new Point($bbox['maxx'],$bbox['miny']),
+	  new Point($bbox['maxx'],$bbox['maxy']),
+	  new Point($bbox['minx'],$bbox['maxy']),
+	  new Point($bbox['minx'],$bbox['miny']),
+	  new Point($bbox['maxx'],$bbox['miny']),
+	);
 
-    $outer_boundary = new LineString($points);
-    return new Polygon(array($outer_boundary));
+	$outer_boundary = new LineString($points);
+	return new Polygon(array($outer_boundary));
   }
 
   public function geometryType() {
-    return $this->geom_type;
+	return $this->geom_type;
   }
 
   // Public: Non-Standard -- Common to all geometries
@@ -85,263 +85,263 @@ 
 
   // $this->out($format, $other_args);
   public function out() {
-    $args = func_get_args();
+	$args = func_get_args();
 
-    $format = array_shift($args);
-    $type_map = geoPHP::getAdapterMap();
-    $processor_type = $type_map[$format];
-    $processor = new $processor_type();
+	$format = array_shift($args);
+	$type_map = geoPHP::getAdapterMap();
+	$processor_type = $type_map[$format];
+	$processor = new $processor_type();
 
-    array_unshift($args, $this);
-    $result = call_user_func_array(array($processor, 'write'), $args);
+	array_unshift($args, $this);
+	$result = call_user_func_array(array($processor, 'write'), $args);
 
-    return $result;
+	return $result;
   }
 
 
   // Public: Aliases
   // ---------------
   public function getCentroid() {
-    return $this->centroid();
+	return $this->centroid();
   }
 
   public function getArea() {
-    return $this->area();
+	return $this->area();
   }
 
   public function getX() {
-    return $this->x();
+	return $this->x();
   }
 
   public function getY() {
-    return $this->y();
+	return $this->y();
   }
 
   public function getGeos() {
-    return $this->geos();
+	return $this->geos();
   }
 
   public function getGeomType() {
-    return $this->geometryType();
+	return $this->geometryType();
   }
 
   public function getSRID() {
-    return $this->SRID();
+	return $this->SRID();
   }
 
   public function asText() {
-    return $this->out('wkt');
+	return $this->out('wkt');
   }
 
   public function asBinary() {
-    return $this->out('wkb');
+	return $this->out('wkb');
   }
 
   // Public: GEOS Only Functions
   // ---------------------------
   public function geos() {
-    // If it's already been set, just return it
-    if ($this->geos && geoPHP::geosInstalled()) {
-      return $this->geos;
-    }
-    // It hasn't been set yet, generate it
-    if (geoPHP::geosInstalled()) {
-      $reader = new GEOSWKBReader();
-      $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
-      $this->geos = FALSE;
-    }
-    return $this->geos;
+	// If it's already been set, just return it
+	if ($this->geos && geoPHP::geosInstalled()) {
+	  return $this->geos;
+	}
+	// It hasn't been set yet, generate it
+	if (geoPHP::geosInstalled()) {
+	  $reader = new GEOSWKBReader();
+	  $this->geos = $reader->readHEX($this->out('wkb',TRUE));
+	}
+	else {
+	  $this->geos = FALSE;
+	}
+	return $this->geos;
   }
 
   public function setGeos($geos) {
-    $this->geos = $geos;
+	$this->geos = $geos;
   }
 
   public function pointOnSurface() {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->pointOnSurface());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->pointOnSurface());
+	}
   }
 
   public function equalsExact(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->equalsExact($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->equalsExact($geometry->geos());
+	}
   }
 
   public function relate(Geometry $geometry, $pattern = NULL) {
-    if ($this->geos()) {
-      if ($pattern) {
-        return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
-        return $this->geos()->relate($geometry->geos());
-      }
-    }
+	if ($this->geos()) {
+	  if ($pattern) {
+		return $this->geos()->relate($geometry->geos(), $pattern);
+	  }
+	  else {
+		return $this->geos()->relate($geometry->geos());
+	  }
+	}
   }
 
   public function checkValidity() {
-    if ($this->geos()) {
-      return $this->geos()->checkValidity();
-    }
+	if ($this->geos()) {
+	  return $this->geos()->checkValidity();
+	}
   }
 
   public function buffer($distance) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->buffer($distance));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->buffer($distance));
+	}
   }
 
   public function intersection(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->intersection($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->intersection($geometry->geos()));
+	}
   }
 
   public function convexHull() {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->convexHull());
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->convexHull());
+	}
   }
 
   public function difference(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->difference($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->difference($geometry->geos()));
+	}
   }
 
   public function symDifference(Geometry $geometry) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->symDifference($geometry->geos()));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->symDifference($geometry->geos()));
+	}
   }
 
   // Can pass in a geometry or an array of geometries
   public function union(Geometry $geometry) {
-    if ($this->geos()) {
-      if (is_array($geometry)) {
-        $geom = $this->geos();
-        foreach ($geometry as $item) {
-          $geom = $geom->union($item->geos());
-        }
-        return geoPHP::geosToGeometry($geom);
-      }
-      else {
-        return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
-      }
-    }
+	if ($this->geos()) {
+	  if (is_array($geometry)) {
+		$geom = $this->geos();
+		foreach ($geometry as $item) {
+		  $geom = $geom->union($item->geos());
+		}
+		return geoPHP::geosToGeometry($geom);
+	  }
+	  else {
+		return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
+	  }
+	}
   }
 
   public function simplify($tolerance, $preserveTopology = FALSE) {
-    if ($this->geos()) {
-      return geoPHP::geosToGeometry($this->geos()->simplify($tolerance, $preserveTopology));
-    }
+	if ($this->geos()) {
+	  return geoPHP::geosToGeometry($this->geos()->simplify($tolerance, $preserveTopology));
+	}
   }
 
   public function disjoint(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->disjoint($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->disjoint($geometry->geos());
+	}
   }
 
   public function touches(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->touches($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->touches($geometry->geos());
+	}
   }
 
   public function intersects(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->intersects($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->intersects($geometry->geos());
+	}
   }
 
   public function crosses(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->crosses($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->crosses($geometry->geos());
+	}
   }
 
   public function within(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->within($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->within($geometry->geos());
+	}
   }
 
   public function contains(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->contains($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->contains($geometry->geos());
+	}
   }
 
   public function overlaps(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->overlaps($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->overlaps($geometry->geos());
+	}
   }
 
   public function covers(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->covers($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->covers($geometry->geos());
+	}
   }
 
   public function coveredBy(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->coveredBy($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->coveredBy($geometry->geos());
+	}
   }
 
   public function distance(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->distance($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->distance($geometry->geos());
+	}
   }
 
   public function hausdorffDistance(Geometry $geometry) {
-    if ($this->geos()) {
-      return $this->geos()->hausdorffDistance($geometry->geos());
-    }
+	if ($this->geos()) {
+	  return $this->geos()->hausdorffDistance($geometry->geos());
+	}
   }
 
   public function project(Geometry $point, $normalized = NULL) {
-    if ($this->geos()) {
-      return $this->geos()->project($point->geos(), $normalized);
-    }
+	if ($this->geos()) {
+	  return $this->geos()->project($point->geos(), $normalized);
+	}
   }
 
   // Public - Placeholders
   // ---------------------
   public function hasZ() {
-    // geoPHP does not support Z values at the moment
-    return FALSE;
+	// geoPHP does not support Z values at the moment
+	return FALSE;
   }
 
   public function is3D() {
-    // geoPHP does not support 3D geometries at the moment
-    return FALSE;
+	// geoPHP does not support 3D geometries at the moment
+	return FALSE;
   }
 
   public function isMeasured() {
-    // geoPHP does not yet support M values
-    return FALSE;
+	// geoPHP does not yet support M values
+	return FALSE;
   }
 
   public function coordinateDimension() {
-    // geoPHP only supports 2-dimentional space
-    return 2;
+	// geoPHP only supports 2-dimentional space
+	return 2;
   }
 
   public function z() {
-    // geoPHP only supports 2-dimentional space
-    return NULL;
+	// geoPHP only supports 2-dimentional space
+	return NULL;
   }
 
   public function m() {
-    // geoPHP only supports 2-dimentional space
-    return NULL;
+	// geoPHP only supports 2-dimentional space
+	return NULL;
   }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -21,8 +21,8 @@ 
   abstract public function geometryN($n);
   abstract public function startPoint();
   abstract public function endPoint();
-  abstract public function isRing();            // Mssing dependancy
-  abstract public function isClosed();          // Missing dependancy
+  abstract public function isRing(); // Mssing dependancy
+  abstract public function isClosed(); // Missing dependancy
   abstract public function numPoints();
   abstract public function pointN($n);
   abstract public function exteriorRing();
@@ -64,12 +64,12 @@ 
     }
 
     $bbox = $this->getBBox();
-    $points = array (
-      new Point($bbox['maxx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['miny']),
+    $points = array(
+      new Point($bbox['maxx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['miny']),
     );
 
     $outer_boundary = new LineString($points);
@@ -147,7 +147,7 @@ 
     // It hasn't been set yet, generate it
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
-      $this->geos = $reader->readHEX($this->out('wkb',TRUE));
+      $this->geos = $reader->readHEX($this->out('wkb', TRUE));
     }
     else {
       $this->geos = FALSE;

Braces +6 added lines, -7 removed lines

@@ -57,7 +57,9 @@ 
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+    if ($this->isEmpty()) {
+    	return new Polygon();
+    }
 
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->envelope());
@@ -148,8 +150,7 @@ 
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
       $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
+    } else {
       $this->geos = FALSE;
     }
     return $this->geos;
@@ -175,8 +176,7 @@ 
     if ($this->geos()) {
       if ($pattern) {
         return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
+      } else {
         return $this->geos()->relate($geometry->geos());
       }
     }
@@ -227,8 +227,7 @@ 
           $geom = $geom->union($item->geos());
         }
         return geoPHP::geosToGeometry($geom);
-      }
-      else {
+      } else {
         return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
       }
     }

require/class.ATC.php

Indentation +64 added lines, -64 removed lines

@@ -4,76 +4,76 @@
 
 class ATC {
 	public $db;
-        function __construct($dbc = null) {
-    		$Connection = new Connection($dbc);
-    		$this->db = $Connection->db;
+		function __construct($dbc = null) {
+			$Connection = new Connection($dbc);
+			$this->db = $Connection->db;
 	}
 
-       public function getAll() {
-                $query = "SELECT * FROM atc GROUP BY ident";
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
-                return $all;
-        }
+	   public function getAll() {
+				$query = "SELECT * FROM atc GROUP BY ident";
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
+				return $all;
+		}
 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '') {
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-    		$info = str_replace('^','<br />',$info);
-    		$info = str_replace('&amp;sect;','',$info);
-    		$info = str_replace('"','',$info);
-    		if ($type == '') $type = NULL;
-                $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)";
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '') {
+			$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
+			$info = str_replace('^','<br />',$info);
+			$info = str_replace('&amp;sect;','',$info);
+			$info = str_replace('"','',$info);
+			if ($type == '') $type = NULL;
+				$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)";
+				$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteById($id) {
-                $query = "DELETE FROM atc WHERE atc_id = :id";
-                $query_values = array(':id' => $id);
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteById($id) {
+				$query = "DELETE FROM atc WHERE atc_id = :id";
+				$query_values = array(':id' => $id);
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
-       public function deleteAll() {
-                $query = "DELETE FROM atc";
-                $query_values = array();
-                 try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute($query_values);
-                } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-                }
-        }
+	   public function deleteAll() {
+				$query = "DELETE FROM atc";
+				$query_values = array();
+				 try {
+						$sth = $this->db->prepare($query);
+						$sth->execute($query_values);
+				} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+				}
+		}
 
 	public function deleteOldATC() {
-                global $globalDBdriver;
-                if ($globalDBdriver == 'mysql') {
-                        $query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
-                } elseif ($globalDBdriver == 'pgsql') {
-                        $query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
-                }
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
-                return "success";
-        }
+				global $globalDBdriver;
+				if ($globalDBdriver == 'mysql') {
+						$query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
+				} elseif ($globalDBdriver == 'pgsql') {
+						$query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
+				}
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
+				return "success";
+		}
 }
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -15,25 +15,25 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '') {
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-    		$info = str_replace('^','<br />',$info);
-    		$info = str_replace('&amp;sect;','',$info);
-    		$info = str_replace('"','',$info);
+       public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '') {
+    		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+    		$info = str_replace('^', '<br />', $info);
+    		$info = str_replace('&amp;sect;', '', $info);
+    		$info = str_replace('"', '', $info);
     		if ($type == '') $type = NULL;
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)";
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type);
+                $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -44,7 +44,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -55,7 +55,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -70,7 +70,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
                 return "success";

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
     		$info = str_replace('^','<br />',$info);
     		$info = str_replace('&amp;sect;','',$info);
     		$info = str_replace('"','',$info);
-    		if ($type == '') $type = NULL;
+    		if ($type == '') {
+    			$type = NULL;
+    		}
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)";
                 $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type);
                  try {

require/class.SpotterServer.php

Indentation +63 added lines, -63 removed lines

@@ -7,121 +7,121 @@
 require_once(dirname(__FILE__).'/class.Translation.php');
 
 class SpotterServer {
-    public $dbs = null;
+	public $dbs = null;
     
-    function __construct($dbs = null) {
+	function __construct($dbs = null) {
 	if ($dbs === null) {
-	    $Connection = new Connection(null,'server');
-	    $this->dbs = $Connection->dbs;
-	    $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
-	    try {
+		$Connection = new Connection(null,'server');
+		$this->dbs = $Connection->dbs;
+		$query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
+		try {
 		$sth = $this->dbs['server']->exec($query);
-	    } catch(PDOException $e) {
+		} catch(PDOException $e) {
 		return "error : ".$e->getMessage();
-	    }
+		}
+	}
 	}
-    }
     
-    function checkAll() {
-        return true;
-    }
+	function checkAll() {
+		return true;
+	}
     
-    function add($line) {
+	function add($line) {
 	global $globalDebug, $globalServerUserID;
 	date_default_timezone_set('UTC');
 	//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) {
 	if (isset($line['format_source'])) {
-	    if(is_array($line) && isset($line['hex'])) {
+		if(is_array($line) && isset($line['hex'])) {
 		if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
-		    $data['hex'] = trim($line['hex']);
-		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		        $data['datetime'] = $line['datetime'];
-		    } else $data['datetime'] = date('Y-m-d H:i:s');
-		    if (!isset($line['aircraft_icao'])) {
-		        $Spotter = new Spotter();
-		        $aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
-		        $Spotter->db = null;
+			$data['hex'] = trim($line['hex']);
+			if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+				$data['datetime'] = $line['datetime'];
+			} else $data['datetime'] = date('Y-m-d H:i:s');
+			if (!isset($line['aircraft_icao'])) {
+				$Spotter = new Spotter();
+				$aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
+				$Spotter->db = null;
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+				if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
+				elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
+				elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
+				elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
 			}
 			$data['aircraft_icao'] = $aircraft_icao;
-		    } else $data['aircraft_icao'] = $line['aircraft_icao'];
-		    //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
+			} else $data['aircraft_icao'] = $line['aircraft_icao'];
+			//if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 		}
 		if (isset($line['registration']) && $line['registration'] != '') {
-		    $data['registration'] = $line['registration'];
+			$data['registration'] = $line['registration'];
 		} else $data['registration'] = null;
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $data['waypoints'] = $line['waypoints'];
+			$data['waypoints'] = $line['waypoints'];
 		} else $data['waypoints'] = null;
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $data['ident'] = trim($line['ident']);
+			$data['ident'] = trim($line['ident']);
 		} else $data['ident'] = null;
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
-		    if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
+			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			$data['latitude'] = $line['latitude'];
-		    } else $data['latitude'] = null;
-		    if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-		        if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+			} else $data['latitude'] = null;
+			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 			$data['longitude'] = $line['longitude'];
-		    } else $data['longitude'] = null;
+			} else $data['longitude'] = null;
 		} else {
-		    $data['latitude'] = null;
-		    $data['longitude'] = null;
+			$data['latitude'] = null;
+			$data['longitude'] = null;
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $data['verticalrate'] = $line['verticalrate'];
+			$data['verticalrate'] = $line['verticalrate'];
 		} else $data['verticalrate'] = null;
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $data['emergency'] = $line['emergency'];
+			$data['emergency'] = $line['emergency'];
 		} else $data['emergency'] = null;
 		if (isset($line['ground']) && $line['ground'] != '') {
-		    $data['ground'] = $line['ground'];
+			$data['ground'] = $line['ground'];
 		} else $data['ground'] = null;
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $data['speed'] = round($line['speed']);
+			$data['speed'] = round($line['speed']);
 		} else $data['speed'] = null;
 		if (isset($line['squawk']) && $line['squawk'] != '') {
-		    $data['squawk'] = $line['squawk'];
+			$data['squawk'] = $line['squawk'];
 		} else $data['squawk'] = null;
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			$data['altitude'] = round($line['altitude']);
   		} else $data['altitude'] = null;
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    $data['heading'] = round($line['heading']);
+			$data['heading'] = round($line['heading']);
   		} else $data['heading'] = null;
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $data['source_name'] = $line['source_name'];
+			$data['source_name'] = $line['source_name'];
   		} else $data['source_name'] = null;
 		if (isset($line['over_country']) && $line['over_country'] != '') {
-		    $data['over_country'] = $line['over_country'];
+			$data['over_country'] = $line['over_country'];
   		} else $data['over_country'] = null;
   		if (isset($line['noarchive']) && $line['noarchive']) {
-  		    $data['noarchive'] = true;
+  			$data['noarchive'] = true;
   		} else $data['noarchive'] = false;
   		$data['format_source'] = $line['format_source'];
   		if (isset($line['id_source'])) $id_source = $line['id_source'];
   		if (isset($data['hex'])) {
-  		    echo '.';
-  		    $id_user = $globalServerUserID;
-  		    if ($id_user == NULL) $id_user = 1;
-  		    if (!isset($id_source)) $id_source = 1;
-  		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
-		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
-		    try {
-                        $sth = $this->dbs['server']->prepare($query);
-                        $sth->execute($query_values);
-                    } catch(PDOException $e) {
-                        return "error : ".$e->getMessage();
-            	    }
-        	}
-    	    }
+  			echo '.';
+  			$id_user = $globalServerUserID;
+  			if ($id_user == NULL) $id_user = 1;
+  			if (!isset($id_source)) $id_source = 1;
+  			$query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
+			$query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
+			try {
+						$sth = $this->dbs['server']->prepare($query);
+						$sth->execute($query_values);
+					} catch(PDOException $e) {
+						return "error : ".$e->getMessage();
+					}
+			}
+			}
+	}
 	}
-    }
 }
 ?>

Spacing +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@ 
     
     function __construct($dbs = null) {
 	if ($dbs === null) {
-	    $Connection = new Connection(null,'server');
+	    $Connection = new Connection(null, 'server');
 	    $this->dbs = $Connection->dbs;
 	    $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
 	    try {
 		$sth = $this->dbs['server']->exec($query);
-	    } catch(PDOException $e) {
+	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage();
 	    }
 	}
@@ -31,10 +31,10 @@ 
 	date_default_timezone_set('UTC');
 	//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) {
 	if (isset($line['format_source'])) {
-	    if(is_array($line) && isset($line['hex'])) {
+	    if (is_array($line) && isset($line['hex'])) {
 		if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
 		    $data['hex'] = trim($line['hex']);
-		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) {
 		        $data['datetime'] = $line['datetime'];
 		    } else $data['datetime'] = date('Y-m-d H:i:s');
 		    if (!isset($line['aircraft_icao'])) {
@@ -112,11 +112,11 @@ 
   		    if ($id_user == NULL) $id_user = 1;
   		    if (!isset($id_source)) $id_source = 1;
   		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
-		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
+		    $query_values = array(':id_user' => $id_user, ':datetime' => $data['datetime'], ':hex' => $data['hex'], ':ident' => $data['ident'], ':latitude' => $data['latitude'], ':longitude' => $data['longitude'], ':verticalrate' => $data['verticalrate'], ':speed' => $data['speed'], ':squawk' => $data['squawk'], ':altitude' => $data['altitude'], ':heading' => $data['heading'], ':registration' => $data['registration'], ':aircraft_icao' => $data['aircraft_icao'], ':waypoints' => $data['waypoints'], ':id_source' => $id_source, ':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'], ':over_country' => $data['over_country']);
 		    try {
                         $sth = $this->dbs['server']->prepare($query);
                         $sth->execute($query_values);
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
             	    }
         	}

Braces +72 added lines, -25 removed lines

@@ -36,81 +36,128 @@
 		    $data['hex'] = trim($line['hex']);
 		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 		        $data['datetime'] = $line['datetime'];
-		    } else $data['datetime'] = date('Y-m-d H:i:s');
+		    } else {
+		    	$data['datetime'] = date('Y-m-d H:i:s');
+		    }
 		    if (!isset($line['aircraft_icao'])) {
 		        $Spotter = new Spotter();
 		        $aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
 		        $Spotter->db = null;
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+			    if ($line['aircraft_type'] == 'PARA_GLIDER') {
+			    	$aircraft_icao = 'GLID';
+			    } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+			    	$aircraft_icao = 'UHEL';
+			    } elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+			    	$aircraft_icao = 'TOWPLANE';
+			    } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+			    	$aircraft_icao = 'POWAIRC';
+			    }
 			}
 			$data['aircraft_icao'] = $aircraft_icao;
-		    } else $data['aircraft_icao'] = $line['aircraft_icao'];
+		    } else {
+		    	$data['aircraft_icao'] = $line['aircraft_icao'];
+		    }
 		    //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 		}
 		if (isset($line['registration']) && $line['registration'] != '') {
 		    $data['registration'] = $line['registration'];
-		} else $data['registration'] = null;
+		} else {
+			$data['registration'] = null;
+		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
 		    $data['waypoints'] = $line['waypoints'];
-		} else $data['waypoints'] = null;
+		} else {
+			$data['waypoints'] = null;
+		}
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
 		    $data['ident'] = trim($line['ident']);
-		} else $data['ident'] = null;
+		} else {
+			$data['ident'] = null;
+		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
 		    if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			$data['latitude'] = $line['latitude'];
-		    } else $data['latitude'] = null;
+		    } else {
+		    	$data['latitude'] = null;
+		    }
 		    if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-		        if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+		        if ($line['longitude'] > 180) {
+		        	$line['longitude'] = $line['longitude'] - 360;
+		        }
 			$data['longitude'] = $line['longitude'];
-		    } else $data['longitude'] = null;
+		    } else {
+		    	$data['longitude'] = null;
+		    }
 		} else {
 		    $data['latitude'] = null;
 		    $data['longitude'] = null;
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
 		    $data['verticalrate'] = $line['verticalrate'];
-		} else $data['verticalrate'] = null;
+		} else {
+			$data['verticalrate'] = null;
+		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
 		    $data['emergency'] = $line['emergency'];
-		} else $data['emergency'] = null;
+		} else {
+			$data['emergency'] = null;
+		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    $data['ground'] = $line['ground'];
-		} else $data['ground'] = null;
+		} else {
+			$data['ground'] = null;
+		}
 		if (isset($line['speed']) && $line['speed'] != '') {
 		    $data['speed'] = round($line['speed']);
-		} else $data['speed'] = null;
+		} else {
+			$data['speed'] = null;
+		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    $data['squawk'] = $line['squawk'];
-		} else $data['squawk'] = null;
+		} else {
+			$data['squawk'] = null;
+		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			$data['altitude'] = round($line['altitude']);
-  		} else $data['altitude'] = null;
+  		} else {
+  			$data['altitude'] = null;
+  		}
 		if (isset($line['heading']) && $line['heading'] != '') {
 		    $data['heading'] = round($line['heading']);
-  		} else $data['heading'] = null;
+  		} else {
+  			$data['heading'] = null;
+  		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
 		    $data['source_name'] = $line['source_name'];
-  		} else $data['source_name'] = null;
+  		} else {
+  			$data['source_name'] = null;
+  		}
 		if (isset($line['over_country']) && $line['over_country'] != '') {
 		    $data['over_country'] = $line['over_country'];
-  		} else $data['over_country'] = null;
+  		} else {
+  			$data['over_country'] = null;
+  		}
   		if (isset($line['noarchive']) && $line['noarchive']) {
   		    $data['noarchive'] = true;
-  		} else $data['noarchive'] = false;
+  		} else {
+  			$data['noarchive'] = false;
+  		}
   		$data['format_source'] = $line['format_source'];
-  		if (isset($line['id_source'])) $id_source = $line['id_source'];
+  		if (isset($line['id_source'])) {
+  			$id_source = $line['id_source'];
+  		}
   		if (isset($data['hex'])) {
   		    echo '.';
   		    $id_user = $globalServerUserID;
-  		    if ($id_user == NULL) $id_user = 1;
-  		    if (!isset($id_source)) $id_source = 1;
+  		    if ($id_user == NULL) {
+  		    	$id_user = 1;
+  		    }
+  		    if (!isset($id_source)) {
+  		    	$id_source = 1;
+  		    }
   		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
 		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
 		    try {

date-statistics-route.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Routes on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -20,13 +20,13 @@ 
 	print '</div>';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByDate($_GET['date']);
 	if (!empty($route_array))
@@ -43,7 +43,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

manufacturer-statistics-time.php

Indentation +3 added lines, -3 removed lines

@@ -3,8 +3,8 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['aircraft_manufacturer'])) {
-        header('Location: '.$globalURL.'/manufacturer');
-        die();
+		header('Location: '.$globalURL.'/manufacturer');
+		die();
 }
 $Spotter = new Spotter();
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
@@ -53,7 +53,7 @@ 
           function drawChart() {
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
-            	$hour_data = '';
+				$hour_data = '';
 	foreach($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';

Spacing +8 added lines, -8 removed lines

@@ -7,23 +7,23 @@ 
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Time of Day from %s"), $manufacturer);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/manufacturer" method="post">';
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_manufacturers = $Spotter->getAllManufacturers();
-	foreach($all_manufacturers as $all_manufacturer)
+	foreach ($all_manufacturers as $all_manufacturer)
 	{
-		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+		if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 		} else {
@@ -42,7 +42,7 @@ 
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -54,7 +54,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}

ident-statistics-airline.php

Spacing +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$isent = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$isent = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines of %s"),$spotter_array[0]['ident']);
+	$title = sprintf(_("Most Common Airlines of %s"), $spotter_array[0]['ident']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
@@ -24,7 +24,7 @@ 
 	include('ident-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Airlines").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights using the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights using the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByIdent($_GET['ident']);
 	if (!empty($airline_array))
@@ -41,7 +41,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airline_array as $airline_item)
+		foreach ($airline_array as $airline_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['ident'])) {
-        header('Location: '.$globalURL.'/ident');
-        die();
+		header('Location: '.$globalURL.'/ident');
+		die();
 }
 $Spotter = new Spotter();
 $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);

statistics-year.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
             	["'._("Month").'", "'._("# of Flights").'"], ';
 
 $date_data = '';
-foreach($date_array as $date_item)
+foreach ($date_array as $date_item)
 {
 	$date_data .= '[ "'.date("F, Y", strtotime($date_item['year_name'].'-'.$date_item['month_name'].'-01')).'",'.$date_item['date_count'].'],';
 }
@@ -59,7 +59,7 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	foreach($date_array as $date_item)
+	foreach ($date_array as $date_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';