Ysurac / FlightAirMap

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

search-json.php

Indentation +81 added lines, -81 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -89,52 +89,52 @@ 
        
 $output = '{';
   $output .= '"flightairmap": {';
-    $output .= '"title": "FlightAirMap JSON Feed",';
-    $output .= '"link": "http://www.flightairmap.fr",';
-    $output .= '"aircraft": [';
+	$output .= '"title": "FlightAirMap JSON Feed",';
+	$output .= '"link": "http://www.flightairmap.fr",';
+	$output .= '"aircraft": [';
     
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				$output .= '{';    	
-		            $output .= '"id": "'.$spotter_item['spotter_id'].'",';
-                    $output .= '"ident": "'.$spotter_item['ident'].'",';
-                    $output .= '"registration": "'.$spotter_item['registration'].'",';
-                    $output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
-                    $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
-                    $output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
-                    $output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
-                    $output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
-                    $output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
-                    $output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
-                    $output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
-                    $output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
-                    $output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
-                    $output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
-                    $output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
-                    $output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
-                    $output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
-                    $output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
-                    $output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
-                    $output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
-                    $output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
-                    $output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
-                    $output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
-                    $output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
-                    $output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
-                    $output .= '"latitude": "'.$spotter_item['latitude'].'",';
-                    $output .= '"longitude": "'.$spotter_item['longitude'].'",';
-                    $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-                    $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
-                    $output .= '"heading": "'.$spotter_item['heading'].'",';
-                    $output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
-                    $output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
-                    $output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
+					$output .= '"id": "'.$spotter_item['spotter_id'].'",';
+					$output .= '"ident": "'.$spotter_item['ident'].'",';
+					$output .= '"registration": "'.$spotter_item['registration'].'",';
+					$output .= '"aircraft_icao": "'.$spotter_item['aircraft_type'].'",';
+					$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].'",';
+					$output .= '"aircraft_manufacturer": "'.$spotter_item['aircraft_manufacturer'].'",';
+					$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
+					$output .= '"airline_icao": "'.$spotter_item['airline_icao'].'",';
+					$output .= '"airline_iata": "'.$spotter_item['airline_iata'].'",';
+					$output .= '"airline_country": "'.$spotter_item['airline_country'].'",';
+					$output .= '"airline_callsign": "'.$spotter_item['airline_callsign'].'",';
+					$output .= '"airline_type": "'.$spotter_item['airline_type'].'",';
+					$output .= '"departure_airport_city": "'.$spotter_item['departure_airport_city'].'",';
+					$output .= '"departure_airport_country": "'.$spotter_item['departure_airport_country'].'",';
+					$output .= '"departure_airport_iata": "'.$spotter_item['departure_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['departure_airport_icao'].'",';
+					$output .= '"departure_airport_latitude": "'.$spotter_item['departure_airport_latitude'].'",';
+					$output .= '"departure_airport_longitude": "'.$spotter_item['departure_airport_longitude'].'",';
+					$output .= '"departure_airport_altitude": "'.$spotter_item['departure_airport_altitude'].'",'; 
+					$output .= '"arrival_airport_city": "'.$spotter_item['arrival_airport_city'].'",';
+					$output .= '"arrival_airport_country": "'.$spotter_item['arrival_airport_country'].'",';
+					$output .= '"arrival_airport_iata": "'.$spotter_item['arrival_airport_iata'].'",';
+					$output .= '"departure_airport_icao": "'.$spotter_item['arrival_airport_icao'].'",';
+					$output .= '"arrival_airport_latitude": "'.$spotter_item['arrival_airport_latitude'].'",';
+					$output .= '"arrival_airport_longitude": "'.$spotter_item['arrival_airport_longitude'].'",';
+					$output .= '"arrival_airport_altitude": "'.$spotter_item['arrival_airport_altitude'].'",';
+					$output .= '"latitude": "'.$spotter_item['latitude'].'",';
+					$output .= '"longitude": "'.$spotter_item['longitude'].'",';
+					$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+					$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
+					$output .= '"heading": "'.$spotter_item['heading'].'",';
+					$output .= '"heading_name": "'.$spotter_item['heading_name'].'",';
+					$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
+					$output .= '"date": "'.date("c", strtotime($spotter_item['date_iso_8601'])).'"';
 				$output .= '},';
-	    }
+		}
 	   }
 	   $output  = substr($output, 0, -1);
 		 $output .= ']';

Spacing +27 added lines, -27 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
         //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+        if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
         } else $sql_date = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
         } else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
         if (!isset($_GET['number_results']))
         {
@@ -42,14 +42,14 @@ 
                 $limit_end = 25;
                 $absolute_difference = 25;
         } else {
-                if ($_GET['number_results'] > 1000){
+                if ($_GET['number_results'] > 1000) {
                         $_GET['number_results'] = 1000;
                 }
                 $limit_start = 0;
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,23 +69,23 @@ 
 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
-$aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);
-$manufacturer = filter_input(INPUT_GET,'manufacturer',FILTER_SANITIZE_STRING);
-$highlights = filter_input(INPUT_GET,'highlights',FILTER_SANITIZE_STRING);
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
-$airline_country = filter_input(INPUT_GET,'airline_country',FILTER_SANITIZE_STRING);
-$airline_type = filter_input(INPUT_GET,'airline_type',FILTER_SANITIZE_STRING);
-$airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
-$airport_country = filter_input(INPUT_GET,'airport_country',FILTER_SANITIZE_STRING);
-$callsign = filter_input(INPUT_GET,'callsign',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$departure_airport_route = filter_input(INPUT_GET,'departure_airport_route',FILTER_SANITIZE_STRING);
-$arrival_airport_route = filter_input(INPUT_GET,'arrival_airport_route',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', FILTER_SANITIZE_STRING);
+$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '');
        
 $output = '{';
   $output .= '"flightairmap": {';
@@ -95,7 +95,7 @@ 
     
     if (!empty($spotter_array))
 	  {
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				$output .= '{';    	

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
-        } else $sql_date = '';
-} else $sql_date = '';
+        } else {
+        	$sql_date = '';
+        }
+        } else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
@@ -30,8 +34,12 @@ 
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
-} else $sql_altitude = '';
+        } else {
+        	$sql_altitude = '';
+        }
+        } else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header('Content-Type: application/json');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

registration-statistics-route.php

Spacing +5 added lines, -5 removed lines

@@ -3,15 +3,15 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes from aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Routes from aircraft with registration %s"), $registration);
 
 	require_once('header.php');
 	print '<div class="info column">';
@@ -24,7 +24,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."), $registration).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByRegistration($registration);
 	if (!empty($route_array))
@@ -40,7 +40,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>';

registration-statistics-departure-airport-country.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

Spacing +6 added lines, -6 removed lines

@@ -3,16 +3,16 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['registration'])) {
-	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 } else $spotter_array = array();
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Departure Airports by Country of aircraft with registration %s"), $registration);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$registration.' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -24,7 +24,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByRegistration($registration);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -32,7 +32,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -80,7 +80,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

country-statistics-airline.php

Spacing +8 added lines, -8 removed lines

@@ -7,8 +7,8 @@ 
         die();
 }
 $Spotter = new Spotter();
-$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$country = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING)));
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if (isset($_GET['sort'])) {
 	$spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 } else {
@@ -17,16 +17,16 @@ 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Airlines of %s"),$country);
+	$title = sprintf(_("Most Common Airlines of %s"), $country);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/country" method="post">';
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -41,7 +41,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -50,7 +50,7 @@ 
 	include('country-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 from airports &amp; airlines of <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines of flights from airports &amp; airlines of <strong>%s</strong>."), $country).'</p>';
 
 	$airline_array = $Spotter->countAllAirlinesByCountry($country);
 	if (!empty($airline_array))
@@ -66,7 +66,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['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING)));

country-detailed.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	  $limit_start = 0;
 	  $limit_end = 25;
 	  $absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];

Spacing +9 added lines, -9 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['country'])){
+if (!isset($_GET['country'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 	  $limit_start = 0;
 	  $limit_end = 25;
 	  $absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -30,7 +30,7 @@ 
 	$country = ucwords(str_replace("-", " ", $_GET['country']));
 	
 	$page_url = $globalURL.'/country/'.$_GET['country'];
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($sort != '') {
 		$spotter_array = $Spotter->getSpotterDataByCountry($country, $limit_start.",".$absolute_difference, $sort);
 	} else {
@@ -39,7 +39,7 @@ 
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for Airports & Airlines from %s"),$country);
+		$title = sprintf(_("Detailed View for Airports & Airlines from %s"), $country);
 
 		require_once('header.php');
 		print '<div class="select-item">';
@@ -47,9 +47,9 @@ 
 		print '<select name="country" class="selectpicker" data-live-search="true">';
 		print '<option></option>';
 		$all_countries = $Spotter->getAllCountries();
-		foreach($all_countries as $all_country)
+		foreach ($all_countries as $all_country)
 		{
-			if($country == $all_country['country'])
+			if ($country == $all_country['country'])
 			{
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 			} else {
@@ -64,7 +64,7 @@ 
 		if ($_GET['country'] != "NA")
 		{
 			print '<div class="info column">';
-			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+			print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 			print '</div>';
 		} else {
 			print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -72,7 +72,7 @@ 
 
 		include('country-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."),$country).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of airports (both departure &amp; arrival) OR airlines from <strong>%s</strong>."), $country).'</p>';
 
 		include('table-output.php');
 		print '<div class="pagination">';

registration-sub-menu.php

Spacing +4 added lines, -4 removed lines

@@ -15,9 +15,9 @@ 
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
@@ -27,7 +27,7 @@ 
 			  <li><a href="<?php print $globalURL; ?>/registration/statistics/arrival-airport-country/<?php print $_GET['registration']; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-route"){ print 'class="active"'; } ?>><?php _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-time"){ print 'class="active"'; } ?>><?php _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-route") { print 'class="active"'; } ?>><?php _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-time") { print 'class="active"'; } ?>><?php _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

scripts/cron.php

Indentation +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@
 //checks to see if FlightAware import is set
 if ($globalFlightAware == TRUE)
 {
-    $SpotterLive = new SpotterLive();
-    $Spotter = new Spotter();
-    //deletes the spotter LIVE data
-    $SpotterLive->deleteLiveSpotterData();
+	$SpotterLive = new SpotterLive();
+	$Spotter = new Spotter();
+	//deletes the spotter LIVE data
+	$SpotterLive->deleteLiveSpotterData();
     
-    //imports the new data from FlightAware
-    $Spotter->importFromFlightAware();
+	//imports the new data from FlightAware
+	$Spotter->importFromFlightAware();
 }
 ?>
\ No newline at end of file