Ysurac / FlightAirMap

require/class.SpotterArchive.php

Doc Comments +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     /**
     * Get SQL query part for filter used
     * @param Array $filter the filter
-    * @return Array the SQL part
+    * @return string the SQL part
     */
     public function getFilter($filter = array(),$where = false,$and = false) {
 	global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;

Indentation +645 added lines, -645 removed lines

@@ -8,12 +8,12 @@ 
 		$this->db = $Connection->db;
 	}
 
-    /**
-    * Get SQL query part for filter used
-    * @param Array $filter the filter
-    * @return Array the SQL part
-    */
-    public function getFilter($filter = array(),$where = false,$and = false) {
+	/**
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
+	public function getFilter($filter = array(),$where = false,$and = false) {
 	global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 	$filters = array();
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
@@ -27,74 +27,74 @@ 
 	$filter_query_join = '';
 	$filter_query_where = '';
 	foreach($filters as $flt) {
-	    if (isset($flt['airlines']) && !empty($flt['airlines'])) {
+		if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 		if ($flt['airlines'][0] != '') {
-		    if (isset($flt['source'])) {
+			if (isset($flt['source'])) {
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
-		    } else {
+			} else {
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
-		    }
+			}
+		}
 		}
-	    }
-	    if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
+		if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
 		if (isset($flt['source'])) {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 		} else {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 		}
-	    }
-	    if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
+		}
+		if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
 		if (isset($flt['source'])) {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
+		}
 		}
-	    }
 	}
 	if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-	    if ($filter['airlines'][0] != '') {
+		if ($filter['airlines'][0] != '') {
 		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
-	    }
+		}
 	}
 	
 	if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
 	}
 	if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 	}
 	if (isset($filter['source']) && !empty($filter['source'])) {
-	    $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+		$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
 	}
 	if (isset($filter['ident']) && !empty($filter['ident'])) {
-	    $filter_query_where .= " AND ident = '".$filter['ident']."'";
+		$filter_query_where .= " AND ident = '".$filter['ident']."'";
 	}
 	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 		$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 	}
 	if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
-	    $filter_query_date = '';
+		$filter_query_date = '';
 	    
-	    if (isset($filter['year']) && $filter['year'] != '') {
+		if (isset($filter['year']) && $filter['year'] != '') {
 		if ($globalDBdriver == 'mysql') {
-		    $filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'";
+			$filter_query_date .= " AND YEAR(spotter_archive_output.date) = '".$filter['year']."'";
 		} else {
-		    $filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'";
+			$filter_query_date .= " AND EXTRACT(YEAR FROM spotter_archive_output.date) = '".$filter['year']."'";
 		}
-	    }
-	    if (isset($filter['month']) && $filter['month'] != '') {
+		}
+		if (isset($filter['month']) && $filter['month'] != '') {
 		if ($globalDBdriver == 'mysql') {
-		    $filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'";
+			$filter_query_date .= " AND MONTH(spotter_archive_output.date) = '".$filter['month']."'";
 		} else {
-		    $filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'";
+			$filter_query_date .= " AND EXTRACT(MONTH FROM spotter_archive_output.date) = '".$filter['month']."'";
+		}
 		}
-	    }
-	    if (isset($filter['day']) && $filter['day'] != '') {
+		if (isset($filter['day']) && $filter['day'] != '') {
 		if ($globalDBdriver == 'mysql') {
-		    $filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'";
+			$filter_query_date .= " AND DAY(spotter_archive_output.date) = '".$filter['day']."'";
 		} else {
-		    $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
+			$filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
+		}
 		}
-	    }
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 	}
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -103,7 +103,7 @@ 
 	}
 	$filter_query = $filter_query_join.$filter_query_where;
 	return $filter_query;
-    }
+	}
 
 	// Spotter_archive
 	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
@@ -134,44 +134,44 @@ 
 	}
 
 
-        /**
-        * Gets all the spotter information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveSpotterDataByIdent($ident)
-        {
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveSpotterDataByIdent($ident)
+		{
 		$Spotter = new Spotter($this->db);
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets last the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveSpotterDataById($id)
-        {
-    		$Spotter = new Spotter($this->db);
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                //$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
-                //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
+		/**
+		 * Gets last the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveSpotterDataById($id)
+		{
+			$Spotter = new Spotter($this->db);
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				//$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
+				//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
-                  /*
+				  /*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -181,232 +181,232 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets all the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAllArchiveSpotterDataById($id)
-        {
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
+				$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAllArchiveSpotterDataById($id)
+		{
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets coordinate & time spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getCoordArchiveSpotterDataById($id)
-        {
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets coordinate & time spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getCoordArchiveSpotterDataById($id)
+		{
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveSpotterDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveSpotterDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveSpotterDataById($id)
-        {
+		/**
+		 * Gets altitude information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveSpotterDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude & speed information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeSpeedArchiveSpotterDataById($id)
-        {
+		/**
+		 * Gets altitude & speed information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeSpeedArchiveSpotterDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastAltitudeArchiveSpotterDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastAltitudeArchiveSpotterDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
 
-       /**
-        * Gets all the archive spotter information
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getSpotterArchiveData($ident,$flightaware_id,$date)
-        {
-    		$Spotter = new Spotter($this->db);
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+	   /**
+	    * Gets all the archive spotter information
+	    *
+	    * @return Array the spotter information
+	    *
+	    */
+		public function getSpotterArchiveData($ident,$flightaware_id,$date)
+		{
+			$Spotter = new Spotter($this->db);
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
+				$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
         
-        public function deleteSpotterArchiveTrackData()
-        {
+		public function deleteSpotterArchiveTrackData()
+		{
 		global $globalArchiveKeepTrackMonths;
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 		$query = 'DELETE FROM spotter_archive WHERE spotter_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 	}
 
 	/**
-        * Gets Minimal Live Spotter data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
-
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk 
                     		    FROM spotter_archive 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
@@ -425,56 +425,56 @@ 
 				    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 				    WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY flightaware_id';
-                } else {
-                        //$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+				} else {
+						//$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
+						$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM spotter_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
                         	    WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY flightaware_id';
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
 
 	/**
-        * Gets Minimal Live Spotter data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Should use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
-
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Should use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk 
                     		    FROM spotter_archive 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
@@ -485,95 +485,95 @@ 
 				    WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
 
-                } else {
-                        //$query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao';
-                       /*
+				} else {
+						//$query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao';
+					   /*
                         $query  = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
                         	    FROM spotter_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
+						$query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
                         	    FROM spotter_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.flightaware_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
                         	    
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
 
 	 /**
-        * Gets count Live Spotter data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLiveSpotterCount($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
-
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
+	  * Gets count Live Spotter data
+	  *
+	  * @return Array the spotter information
+	  *
+	  */
+		public function getLiveSpotterCount($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb 
 			FROM spotter_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-                } else {
+				} else {
 			$query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-                return $result['nb'];
+				return $result['nb'];
 
-        }
+		}
 
 
 
 	// Spotter_Archive_output
 	
-    /**
-    * Gets all the spotter information
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
-    {
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+	{
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
 	$Translation = new Translation();
@@ -587,159 +587,159 @@ 
 	$filter_query = $this->getFilter($filters);
 	if ($q != "")
 	{
-	    if (!is_string($q))
-	    {
+		if (!is_string($q))
+		{
 		return false;
-	    } else {
+		} else {
 	        
 		$q_array = explode(" ", $q);
 		
 		foreach ($q_array as $q_item){
-		    $additional_query .= " AND (";
-		    $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
-		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
-		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
-		    $additional_query .= ")";
-		}
-	    }
+			$additional_query .= " AND (";
+			$additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
+			$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
+			$translate = $Translation->ident2icao($q_item);
+			if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+			$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
+			$additional_query .= ")";
+		}
+		}
 	}
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-	    if (!is_string($registration))
-	    {
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		if (!is_string($registration))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.registration = '".$registration."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_icao))
-	    {
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_manufacturer))
-	    {
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_manufacturer))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-	    }
+		}
 	}
 	
 	if ($highlights == "true")
 	{
-	    if (!is_string($highlights))
-	    {
+		if (!is_string($highlights))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.highlight <> '')";
-	    }
+		}
 	}
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_icao))
-	    {
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')";
-	    }
+		}
 	}
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_country))
-	    {
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')";
-	    }
+		}
 	}
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_type))
-	    {
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_type))
+		{
 		return false;
-	    } else {
+		} else {
 		if ($airline_type == "passenger")
 		{
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')";
 		}
 		if ($airline_type == "cargo")
 		{
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')";
 		}
 		if ($airline_type == "military")
 		{
-		    $additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
+			$additional_query .= " AND (spotter_archive_output.airline_type = 'military')";
+		}
 		}
-	    }
 	}
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport))
-	    {
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))";
-	    }
+		}
 	}
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport_country))
-	    {
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airport_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))";
-	    }
+		}
 	}
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-	    if (!is_string($callsign))
-	    {
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+		if (!is_string($callsign))
+		{
 		return false;
-	    } else {
+		} else {
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
@@ -747,99 +747,99 @@ 
 		} else {
 			$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
 		}
-	    }
+		}
 	}
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-	    if (!is_string($owner))
-	    {
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')";
-	    }
+		}
 	}
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-	    if (!is_string($pilot_name))
-	    {
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+		if (!is_string($pilot_name))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')";
-	    }
+		}
 	}
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-	    if (!is_string($pilot_id))
-	    {
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+		if (!is_string($pilot_id))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')";
-	    }
+		}
 	}
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($departure_airport_route))
-	    {
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($departure_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($arrival_airport_route))
-	    {
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($arrival_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($altitude != "")
 	{
-	    $altitude_array = explode(",", $altitude);
+		$altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	    
 
-	    if ($altitude_array[1] != "")
-	    {                
+		if ($altitude_array[1] != "")
+		{                
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
-	    } else {
+		} else {
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-	    }
+		}
 	}
 	
 	if ($date_posted != "")
 	{
-	    $date_array = explode(",", $date_posted);
+		$date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
 	    
-	    if ($globalTimezone != '') {
+		if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+		} else $offset = '+00:00';
 
 
-	    if ($date_array[1] != "")
-	    {                
+		if ($date_array[1] != "")
+		{                
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
 		if ($globalDBdriver == 'mysql') {
@@ -847,28 +847,28 @@ 
 		} else {
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
 		}
-	    } else {
+		} else {
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
+				if ($globalDBdriver == 'mysql') {
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(spotter_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
 		} else {
 			$additional_query .= " AND spotter_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
 		}
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $limit);
+		$limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
 	    
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 
@@ -899,33 +899,33 @@ 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
 
 	return $spotter_array;
-    }
+	}
 
-    public function deleteSpotterArchiveData()
-    {
+	public function deleteSpotterArchiveData()
+	{
 		global $globalArchiveKeepMonths, $globalDBdriver;
-                date_default_timezone_set('UTC');
-                if ($globalDBdriver == 'mysql') {
+				date_default_timezone_set('UTC');
+				if ($globalDBdriver == 'mysql') {
 			$query = 'DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
 		} else {
 			$query = "DELETE FROM spotter_archive_output WHERE spotter_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
 		}
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
 	}
 
-    /**
-    * Gets all the spotter information based on the callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
-    {
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '')
+	{
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -937,35 +937,35 @@ 
 	
 	if ($ident != "")
 	{
-	    if (!is_string($ident))
-	    {
+		if (!is_string($ident))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (spotter_archive_output.ident = :ident)";
 		$query_values = array(':ident' => $ident);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $limit);
+		$limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
 	    
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Spotter->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Spotter->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
 	}
 
 	$query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -973,17 +973,17 @@ 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 
 
-    /**
-    * Gets all the spotter information based on the owner
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -996,35 +996,35 @@ 
 	
 	if ($owner != "")
 	{
-	    if (!is_string($owner))
-	    {
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (spotter_archive_output.owner_name = :owner)";
 		$query_values = array(':owner' => $owner);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $limit);
+		$limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
 	    
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Spotter->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Spotter->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
@@ -1032,16 +1032,16 @@ 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the pilot
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1060,24 +1060,24 @@ 
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $limit);
+		$limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
 	    
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Spotter->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Spotter->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
@@ -1085,16 +1085,16 @@ 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1104,14 +1104,14 @@ 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, spotter_archive s
 		    WHERE c.iso2 = s.over_country ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1124,23 +1124,23 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1150,14 +1150,14 @@ 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, spotter_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1170,24 +1170,24 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['airline_icao'] = $row['airline_icao'];
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['airline_icao'] = $row['airline_icao'];
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets last spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveSpotterDataById($id,$date)
-    {
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveSpotterDataById($id,$date)
+	{
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -1195,16 +1195,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveSpotterDataByIdent($ident,$date)
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveSpotterDataByIdent($ident,$date)
+	{
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -1212,16 +1212,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the airport
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
 	global $global_query;
 	$Spotter = new Spotter();
 	date_default_timezone_set('UTC');
@@ -1232,35 +1232,35 @@ 
 	
 	if ($airport != "")
 	{
-	    if (!is_string($airport))
-	    {
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))";
 		$query_values = array(':airport' => $airport);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $limit);
+		$limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
+		$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
 	    
-	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Spotter->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Spotter->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY spotter_archive_output.date DESC";
+		$orderby_query = " ORDER BY spotter_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
@@ -1268,6 +1268,6 @@ 
 	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 }
 ?>
\ No newline at end of file

Spacing +112 added lines, -112 removed lines

@@ -13,45 +13,45 @@ 
     * @param Array $filter the filter
     * @return Array the SQL part
     */
-    public function getFilter($filter = array(),$where = false,$and = false) {
+    public function getFilter($filter = array(), $where = false, $and = false) {
 	global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 	$filters = array();
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 		if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 			$filters = $globalStatsFilters[$globalFilterName];
 		} else {
-			$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+			$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 		}
 	}
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+	if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 	$filter_query_join = '';
 	$filter_query_where = '';
-	foreach($filters as $flt) {
+	foreach ($filters as $flt) {
 	    if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 		if ($flt['airlines'][0] != '') {
 		    if (isset($flt['source'])) {
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 		    } else {
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 		    }
 		}
 	    }
 	    if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
 		if (isset($flt['source'])) {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 		} else {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 	    }
 	    if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
 		if (isset($flt['source'])) {
-		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
+		    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 	    }
 	}
 	if (isset($filter['airlines']) && !empty($filter['airlines'])) {
 	    if ($filter['airlines'][0] != '') {
-		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
+		$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
 	    }
 	}
 	
@@ -59,16 +59,16 @@ 
 	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
 	}
 	if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 	}
 	if (isset($filter['source']) && !empty($filter['source'])) {
-	    $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+	    $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 	}
 	if (isset($filter['ident']) && !empty($filter['ident'])) {
 	    $filter_query_where .= " AND ident = '".$filter['ident']."'";
 	}
 	if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-		$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+		$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 	}
 	if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
 	    $filter_query_date = '';
@@ -94,40 +94,40 @@ 
 		    $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
 		}
 	    }
-	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
+	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 	}
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 	if ($filter_query_where != '') {
-		$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+		$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 	}
 	$filter_query = $filter_query_join.$filter_query_where;
 	return $filter_query;
     }
 
 	// Spotter_archive
-	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
+	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Spotter.php');
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
-			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+		if ($airline_type === NULL) $airline_type = '';
 	
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
 
 		// Route is not added in spotter_archive
-		$query  = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name)
+		$query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name)
 		        VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name)";
 
-		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name);
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -147,9 +147,9 @@ 
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
                 //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+                $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident));
 
                 return $spotter_array;
         }
@@ -168,7 +168,7 @@ 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
                 //$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
                 //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
+                $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -181,7 +181,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id));
 
                 return $spotter_array;
         }
@@ -196,14 +196,14 @@ 
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
+                $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -222,14 +222,14 @@ 
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
+                $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -251,12 +251,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -277,12 +277,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -303,12 +303,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -330,13 +330,13 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -353,13 +353,13 @@ 
         * @return Array the spotter information
         *
         */
-        public function getSpotterArchiveData($ident,$flightaware_id,$date)
+        public function getSpotterArchiveData($ident, $flightaware_id, $date)
         {
     		$Spotter = new Spotter($this->db);
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+                $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%'));
 
                 return $spotter_array;
         }
@@ -372,7 +372,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -384,24 +384,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
+        public function getMinLiveSpotterData($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -420,14 +420,14 @@ 
 						GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id 
 				    AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 */
-			$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM spotter_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 				    WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY flightaware_id';
                 } else {
                         //$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+                        $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM spotter_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
                         	    WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".'
@@ -437,7 +437,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -452,24 +452,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
+        public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Should use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -479,7 +479,7 @@ 
                     		    FROM spotter_archive 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk 
+			$query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk 
 				    FROM spotter_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao 
 				    WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -494,7 +494,7 @@ 
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
+                        $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
                         	    FROM spotter_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
@@ -506,7 +506,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -521,23 +521,23 @@ 
         * @return Array the spotter information
         *
         */
-        public function getLiveSpotterCount($begindate,$enddate,$filter = array())
+        public function getLiveSpotterCount($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -552,7 +552,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -572,7 +572,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
     {
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -594,7 +594,7 @@ 
 	        
 		$q_array = explode(" ", $q);
 		
-		foreach ($q_array as $q_item){
+		foreach ($q_array as $q_item) {
 		    $additional_query .= " AND (";
 		    $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
 		    $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -626,7 +626,7 @@ 
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
 	    if (!is_string($registration))
 	    {
 		return false;
@@ -637,7 +637,7 @@ 
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_icao))
 	    {
 		return false;
@@ -648,7 +648,7 @@ 
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_manufacturer))
 	    {
 		return false;
@@ -669,7 +669,7 @@ 
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_icao))
 	    {
 		return false;
@@ -680,7 +680,7 @@ 
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_country))
 	    {
 		return false;
@@ -691,7 +691,7 @@ 
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_type))
 	    {
 		return false;
@@ -713,7 +713,7 @@ 
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport))
 	    {
 		return false;
@@ -724,7 +724,7 @@ 
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport_country))
 	    {
 		return false;
@@ -735,7 +735,7 @@ 
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 	    if (!is_string($callsign))
 	    {
 		return false;
@@ -743,7 +743,7 @@ 
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 		} else {
 			$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
 		}
@@ -752,7 +752,7 @@ 
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
 	    if (!is_string($owner))
 	    {
 		return false;
@@ -763,7 +763,7 @@ 
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 	    if (!is_string($pilot_name))
 	    {
 		return false;
@@ -774,7 +774,7 @@ 
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 	    if (!is_string($pilot_id))
 	    {
 		return false;
@@ -785,7 +785,7 @@ 
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($departure_airport_route))
 	    {
 		return false;
@@ -796,7 +796,7 @@ 
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($arrival_airport_route))
 	    {
 		return false;
@@ -809,8 +809,8 @@ 
 	{
 	    $altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
 	    if ($altitude_array[1] != "")
@@ -828,8 +828,8 @@ 
 	{
 	    $date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
 	    if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
@@ -861,8 +861,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -873,8 +873,8 @@ 
 	
 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
-		$dist = number_format($dist*0.621371,2,'.','');
-		$query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		$dist = number_format($dist*0.621371, 2, '.', '');
+		$query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 	} else {
@@ -891,12 +891,12 @@ 
 			$additional_query .= " AND (spotter_archive_output.waypoints <> '')";
 		}
 
-		$query  = "SELECT spotter_archive_output.* FROM spotter_archive_output 
+		$query = "SELECT spotter_archive_output.* FROM spotter_archive_output 
 		    WHERE spotter_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
 	}
-	$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
+	$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
     }
@@ -913,7 +913,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
 	}
@@ -950,8 +950,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -992,7 +992,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -1009,8 +1009,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1050,7 +1050,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1062,8 +1062,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1093,7 +1093,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1122,7 +1122,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1139,7 +1139,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1168,7 +1168,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1186,14 +1186,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveSpotterDataById($id,$date)
+    public function getDateArchiveSpotterDataById($id, $date)
     {
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1203,14 +1203,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveSpotterDataByIdent($ident,$date)
+    public function getDateArchiveSpotterDataByIdent($ident, $date)
     {
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1220,7 +1220,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
 	global $global_query;
 	$Spotter = new Spotter();
@@ -1228,7 +1228,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filters,true,true);
+	$filter_query = $this->getFilter($filters, true, true);
 	
 	if ($airport != "")
 	{
@@ -1245,8 +1245,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {