Ysurac / FlightAirMap

require/class.Satellite.php

Indentation +34 added lines, -34 removed lines

@@ -14,7 +14,7 @@ 
 require_once(dirname(__FILE__).'/libs/Predict/Predict/TLE.php');
 
 class Satellite {
-    /** @var $db PDOStatement  */
+	/** @var $db PDOStatement  */
 	public $db;
 
 	public function __construct($dbc = null) {
@@ -133,13 +133,13 @@ 
 		else return array();
 	}
 
-    /**
-     * Gets all launch site
-     *
-     * @param bool $limit
-     * @param array $filters
-     * @return array the launch site list
-     */
+	/**
+	 * Gets all launch site
+	 *
+	 * @param bool $limit
+	 * @param array $filters
+	 * @return array the launch site list
+	 */
 	public function countAllLaunchSite($limit = true, $filters = array())
 	{
 		//$filter_query = $this->getFilter($filters,true,true);
@@ -163,11 +163,11 @@ 
 	}
 
 	/**
-	* Gets all owners
-	*
-	* @return array the owners list
-	*
-	*/
+	 * Gets all owners
+	 *
+	 * @return array the owners list
+	 *
+	 */
 	public function countAllOwners($limit = true, $filters = array())
 	{
 		//$filter_query = $this->getFilter($filters,true,true);
@@ -190,13 +190,13 @@ 
 		return $owner_array;
 	}
 
-    /**
-     * Gets all countries owners
-     *
-     * @param bool $limit
-     * @param array $filters
-     * @return array the countries list
-     */
+	/**
+	 * Gets all countries owners
+	 *
+	 * @param bool $limit
+	 * @param array $filters
+	 * @return array the countries list
+	 */
 	public function countAllCountriesOwners($limit = true, $filters = array())
 	{
 		global $globalDBdriver;
@@ -220,13 +220,13 @@ 
 		return $owner_array;
 	}
 
-    /**
-     * Counts all launch dates during the last year
-     *
-     * @param array $filters
-     * @param string $sincedate
-     * @return array the launch date list
-     */
+	/**
+	 * Counts all launch dates during the last year
+	 *
+	 * @param array $filters
+	 * @param string $sincedate
+	 * @return array the launch date list
+	 */
 	public function countAllMonthsLastYear($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -266,13 +266,13 @@ 
 		return $date_array;
 	}
 
-    /**
-     * Counts all dates during the last 10 years
-     *
-     * @param array $filters
-     * @param string $sincedate
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last 10 years
+	 *
+	 * @param array $filters
+	 * @param string $sincedate
+	 * @return array the date list
+	 */
 	public function countAllYears($filters = array(), $sincedate = '')
 	{
 		global $globalTimezone, $globalDBdriver;

require/class.MarineArchive.php

Indentation +931 added lines, -931 removed lines

@@ -16,13 +16,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (MarineArchive)');
 	}
 
-    /**
-     * Get SQL query part for filter used
-     * @param array $filter the filter
-     * @param bool $where
-     * @param bool $and
-     * @return string the SQL part
-     */
+	/**
+	 * Get SQL query part for filter used
+	 * @param array $filter the filter
+	 * @param bool $where
+	 * @param bool $and
+	 * @return string the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -91,40 +91,40 @@ 
 		return $filter_query;
 	}
 
-    /**
-     * Add to Mariche archive
-     *
-     * @param string $fammarine_id
-     * @param string $ident
-     * @param string $latitude
-     * @param string $longitude
-     * @param string $heading
-     * @param string $groundspeed
-     * @param string $date
-     * @param bool $putinarchive
-     * @param string $mmsi
-     * @param string $type
-     * @param string $typeid
-     * @param string $imo
-     * @param string $callsign
-     * @param string $arrival_code
-     * @param string $arrival_date
-     * @param string $status
-     * @param string $statusid
-     * @param bool $noarchive
-     * @param string $format_source
-     * @param string $source_name
-     * @param string $over_country
-     * @param string $captain_id
-     * @param string $captain_name
-     * @param string $race_id
-     * @param string $race_name
-     * @param string $distance
-     * @param string $race_rank
-     * @param string $race_time
-     * @return string
-     */
-    public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '') {
+	/**
+	 * Add to Mariche archive
+	 *
+	 * @param string $fammarine_id
+	 * @param string $ident
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @param string $heading
+	 * @param string $groundspeed
+	 * @param string $date
+	 * @param bool $putinarchive
+	 * @param string $mmsi
+	 * @param string $type
+	 * @param string $typeid
+	 * @param string $imo
+	 * @param string $callsign
+	 * @param string $arrival_code
+	 * @param string $arrival_date
+	 * @param string $status
+	 * @param string $statusid
+	 * @param bool $noarchive
+	 * @param string $format_source
+	 * @param string $source_name
+	 * @param string $over_country
+	 * @param string $captain_id
+	 * @param string $captain_name
+	 * @param string $race_id
+	 * @param string $race_name
+	 * @param string $distance
+	 * @param string $race_rank
+	 * @param string $race_time
+	 * @return string
+	 */
+	public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '', $captain_id = '', $captain_name = '', $race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '') {
 		require_once(dirname(__FILE__).'/class.Marine.php');
 		if ($over_country == '') {
 			$Marine = new Marine($this->db);
@@ -149,42 +149,42 @@ 
 	}
 
 
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getLastArchiveMarineDataByIdent($ident)
-    {
-	    $Marine = new Marine($this->db);
-        date_default_timezone_set('UTC');
-
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-        $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
-        $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets last the spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getLastArchiveMarineDataById($id)
-    {
-        $Marine = new Marine($this->db);
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
-        //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-        $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getLastArchiveMarineDataByIdent($ident)
+	{
+		$Marine = new Marine($this->db);
+		date_default_timezone_set('UTC');
+
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+		$query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
+		return $spotter_array;
+	}
+
+
+	/**
+	 * Gets last the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getLastArchiveMarineDataById($id)
+	{
+		$Marine = new Marine($this->db);
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		//$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
+		//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+		$query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
-                  /*
+				  /*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -194,196 +194,196 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-        $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getAllArchiveMarineDataById($id)
+		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getAllArchiveMarineDataById($id)
 	{
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
 //              $spotter_array = Marine->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;
+		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
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getCoordArchiveMarineDataById($id)
-    {
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
+	/**
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getCoordArchiveMarineDataById($id)
+	{
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
 
 //              $spotter_array = Marine->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 altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getAltitudeArchiveMarineDataByIdent($ident)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_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);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets altitude information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getAltitudeArchiveMarineDataById($id)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_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);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets altitude & speed information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getAltitudeSpeedArchiveMarineDataById($id)
-    {
-        date_default_timezone_set('UTC');
-
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_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);
-
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getLastAltitudeArchiveMarineDataByIdent($ident)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+		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 altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getAltitudeArchiveMarineDataByIdent($ident)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_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);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets altitude information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getAltitudeArchiveMarineDataById($id)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_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);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets altitude & speed information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getAltitudeSpeedArchiveMarineDataById($id)
+	{
+		date_default_timezone_set('UTC');
+
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_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);
+
+		return $spotter_array;
+	}
+
+
+	/**
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getLastAltitudeArchiveMarineDataByIdent($ident)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_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);
-
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets all the archive spotter information
-     *
-     * @param $ident
-     * @param $fammarine_id
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getMarineArchiveData($ident,$fammarine_id,$date)
-    {
-        $Marine = new Marine($this->db);
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
-        $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
-        return $spotter_array;
-    }
-
-    /**
-     * Delete all tracking data
-     *
-     */
-    public function deleteMarineArchiveTrackData()
-    {
-        global $globalArchiveKeepTrackMonths, $globalDBdriver;
-        if ($globalDBdriver == 'mysql') {
-            $query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
-        } else {
-            $query = "DELETE FROM marine_archive WHERE marine_archive_id IN (SELECT marine_archive_id FROM marine_archive WHERE marine_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)";
+		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;
+	}
+
+
+	/**
+	 * Gets all the archive spotter information
+	 *
+	 * @param $ident
+	 * @param $fammarine_id
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getMarineArchiveData($ident,$fammarine_id,$date)
+	{
+		$Marine = new Marine($this->db);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate";
+		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%'));
+		return $spotter_array;
+	}
+
+	/**
+	 * Delete all tracking data
+	 *
+	 */
+	public function deleteMarineArchiveTrackData()
+	{
+		global $globalArchiveKeepTrackMonths, $globalDBdriver;
+		if ($globalDBdriver == 'mysql') {
+			$query = 'DELETE FROM marine_archive WHERE marine_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
+		} else {
+			$query = "DELETE FROM marine_archive WHERE marine_archive_id IN (SELECT marine_archive_id FROM marine_archive WHERE marine_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)";
 		}
 		try {
 			$sth = $this->db->prepare($query);
@@ -394,42 +394,42 @@ 
 		}
 	}
 
-    /**
-     * Gets Minimal Live Marine data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMinLiveMarineData($begindate,$enddate,$filter = array())
-    {
-        global $globalDBdriver;
-        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 fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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 Marine data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMinLiveMarineData($begindate,$enddate,$filter = array())
+	{
+		global $globalDBdriver;
+		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 fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 			*/
-            /*
+			/*
 			$query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
 				    FROM marine_archive 
 				    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate 
@@ -438,541 +438,541 @@ 
 						GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id 
 				    AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 */
-            $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM marine_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY fammarine_id';
-        } else {
-            //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
-            $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+		} else {
+			//$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
+			$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM marine_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY fammarine_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;
-    }
-
-    /**
-     * Gets Minimal Live Marine data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
-    {
-        global $globalDBdriver;
-        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 fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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') {
-            /*
+		}
+		//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 Marine data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
+	{
+		global $globalDBdriver;
+		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 fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
 			*/
-            $query  = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
+			$query  = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk 
 				    FROM marine_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
 
-        } else {
-            //$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
-            /*
+		} else {
+			//$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
+			/*
                         $query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
                         */
-            $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
+			$query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.fammarine_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;
-    }
-
-    /**
-     * Gets count Live Marine data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getLiveMarineCount($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 fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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 fammarine_id) as nb 
+		}
+		//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 Marine data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getLiveMarineCount($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 fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_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 fammarine_id) as nb 
 			FROM marine_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-        } else {
-            $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_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;
-        }
-        $result = $sth->fetch(PDO::FETCH_ASSOC);
-        $sth->closeCursor();
-        return $result['nb'];
-    }
+		} else {
+			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_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;
+		}
+		$result = $sth->fetch(PDO::FETCH_ASSOC);
+		$sth->closeCursor();
+		return $result['nb'];
+	}
 
 
 
 	// marine_archive_output
 
-    /**
-     * Gets all the spotter information
-     *
-     * @param string $q
-     * @param string $registration
-     * @param string $aircraft_icao
-     * @param string $aircraft_manufacturer
-     * @param string $highlights
-     * @param string $airline_icao
-     * @param string $airline_country
-     * @param string $airline_type
-     * @param string $airport
-     * @param string $airport_country
-     * @param string $callsign
-     * @param string $departure_airport_route
-     * @param string $arrival_airport_route
-     * @param string $owner
-     * @param string $pilot_id
-     * @param string $pilot_name
-     * @param string $altitude
-     * @param string $date_posted
-     * @param string $limit
-     * @param string $sort
-     * @param string $includegeodata
-     * @param string $origLat
-     * @param string $origLon
-     * @param string $dist
-     * @param array $filters
-     * @return array the spotter information
-     */
-    public function searchMarineData($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($this->db);
-        $Marine = new Marine($this->db);
-
-        date_default_timezone_set('UTC');
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @param string $q
+	 * @param string $registration
+	 * @param string $aircraft_icao
+	 * @param string $aircraft_manufacturer
+	 * @param string $highlights
+	 * @param string $airline_icao
+	 * @param string $airline_country
+	 * @param string $airline_type
+	 * @param string $airport
+	 * @param string $airport_country
+	 * @param string $callsign
+	 * @param string $departure_airport_route
+	 * @param string $arrival_airport_route
+	 * @param string $owner
+	 * @param string $pilot_id
+	 * @param string $pilot_name
+	 * @param string $altitude
+	 * @param string $date_posted
+	 * @param string $limit
+	 * @param string $sort
+	 * @param string $includegeodata
+	 * @param string $origLat
+	 * @param string $origLon
+	 * @param string $dist
+	 * @param array $filters
+	 * @return array the spotter information
+	 */
+	public function searchMarineData($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($this->db);
+		$Marine = new Marine($this->db);
+
+		date_default_timezone_set('UTC');
 	
-        $query_values = array();
-        $additional_query = '';
-        $limit_query = '';
-        $filter_query = $this->getFilter($filters);
-        if ($q != "")
-        {
-            if (!is_string($q))
-            {
-                return array();
-            } else {
-                $q_array = explode(" ", $q);
+		$query_values = array();
+		$additional_query = '';
+		$limit_query = '';
+		$filter_query = $this->getFilter($filters);
+		if ($q != "")
+		{
+			if (!is_string($q))
+			{
+				return array();
+			} else {
+				$q_array = explode(" ", $q);
 		
-                foreach ($q_array as $q_item){
-                    $additional_query .= " AND (";
-                    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
-                    $translate = $Translation->ident2icao($q_item);
-                    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
-                    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
-                    $additional_query .= ")";
-                }
-            }
-        }
+				foreach ($q_array as $q_item){
+					$additional_query .= " AND (";
+					$additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
+					$additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
+					$translate = $Translation->ident2icao($q_item);
+					if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+					$additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
+					$additional_query .= ")";
+				}
+			}
+		}
 	
-        if ($registration != "")
-        {
-            $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-            if (!is_string($registration))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.registration = '".$registration."')";
-            }
-        }
+		if ($registration != "")
+		{
+			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			if (!is_string($registration))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.registration = '".$registration."')";
+			}
+		}
 	
-        if ($aircraft_icao != "")
-        {
-            $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-            if (!is_string($aircraft_icao))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')";
-            }
-        }
+		if ($aircraft_icao != "")
+		{
+			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+			if (!is_string($aircraft_icao))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')";
+			}
+		}
 	
-        if ($aircraft_manufacturer != "")
-        {
-            $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-            if (!is_string($aircraft_manufacturer))
-            {
-                return array();
-	    } else {
-                $additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-            }
-        }
+		if ($aircraft_manufacturer != "")
+		{
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+			if (!is_string($aircraft_manufacturer))
+			{
+				return array();
+		} else {
+				$additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
+			}
+		}
 	
-        if ($highlights == "true")
-        {
-            if (!is_string($highlights))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.highlight <> '')";
-            }
-        }
+		if ($highlights == "true")
+		{
+			if (!is_string($highlights))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.highlight <> '')";
+			}
+		}
 	
-        if ($airline_icao != "")
-        {
-            $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_icao))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')";
-            }
-        }
+		if ($airline_icao != "")
+		{
+			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_icao))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')";
+			}
+		}
 	
-        if ($airline_country != "")
-        {
-            $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_country))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')";
-            }
-        }
+		if ($airline_country != "")
+		{
+			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_country))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')";
+			}
+		}
 	
-        if ($airline_type != "")
-        {
-            $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_type))
-            {
-                return array();
-            } else {
-                if ($airline_type == "passenger")
-                {
-                    $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
-                }
-                if ($airline_type == "cargo")
-                {
-                    $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
-                }
-                if ($airline_type == "military")
-                {
-                    $additional_query .= " AND (marine_archive_output.airline_type = 'military')";
-                }
-            }
-        }
+		if ($airline_type != "")
+		{
+			$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_type))
+			{
+				return array();
+			} else {
+				if ($airline_type == "passenger")
+				{
+					$additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
+				}
+				if ($airline_type == "cargo")
+				{
+					$additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
+				}
+				if ($airline_type == "military")
+				{
+					$additional_query .= " AND (marine_archive_output.airline_type = 'military')";
+				}
+			}
+		}
 	
-        if ($airport != "")
-        {
-            $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-            if (!is_string($airport))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))";
-            }
-        }
+		if ($airport != "")
+		{
+			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			if (!is_string($airport))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))";
+			}
+		}
 	
-        if ($airport_country != "")
-        {
-            $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-            if (!is_string($airport_country))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))";
-            }
-        }
+		if ($airport_country != "")
+		{
+			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+			if (!is_string($airport_country))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))";
+			}
+		}
     
-        if ($callsign != "")
-        {
-            $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-            if (!is_string($callsign))
-            {
-                return array();
-            } else {
-                $translate = $Translation->ident2icao($callsign);
-                if ($translate != $callsign) {
-                    $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
-                    $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
-                } else {
-                    $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
-                }
-            }
-        }
-
-        if ($owner != "")
-        {
-            $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-            if (!is_string($owner))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')";
-            }
-        }
-
-        if ($pilot_name != "")
-        {
-            $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-            if (!is_string($pilot_name))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')";
-            }
-        }
+		if ($callsign != "")
+		{
+			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			if (!is_string($callsign))
+			{
+				return array();
+			} else {
+				$translate = $Translation->ident2icao($callsign);
+				if ($translate != $callsign) {
+					$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
+					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+				} else {
+					$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
+				}
+			}
+		}
+
+		if ($owner != "")
+		{
+			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			if (!is_string($owner))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')";
+			}
+		}
+
+		if ($pilot_name != "")
+		{
+			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+			if (!is_string($pilot_name))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')";
+			}
+		}
 	
-        if ($pilot_id != "")
-        {
-            $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-            if (!is_string($pilot_id))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')";
-            }
-        }
+		if ($pilot_id != "")
+		{
+			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+			if (!is_string($pilot_id))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_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))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-            }
-        }
+		if ($departure_airport_route != "")
+		{
+			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+			if (!is_string($departure_airport_route))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_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))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-            }
-        }
+		if ($arrival_airport_route != "")
+		{
+			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+			if (!is_string($arrival_airport_route))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
+			}
+		}
 	
-        if ($altitude != "")
-        {
-            $altitude_array = explode(",", $altitude);
+		if ($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] != "")
-            {
-                $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 {
-                $altitude_array[0] = substr($altitude_array[0], 0, -2);
-                $additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-            }
-        }
+			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 {
+				$altitude_array[0] = substr($altitude_array[0], 0, -2);
+				$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
+			}
+		}
 	
-        if ($date_posted != "")
-        {
-            $date_array = explode(",", $date_posted);
+		if ($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 != '') {
-                date_default_timezone_set($globalTimezone);
-                $datetime = new DateTime();
-                $offset = $datetime->format('P');
-            } else $offset = '+00:00';
-
-
-            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') {
-                    $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' ";
-                } else {
-                    $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
-                }
-            } else {
-                $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
-                    $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
-                } else {
-                    $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
-                }
-            }
-        }
+			if ($globalTimezone != '') {
+				date_default_timezone_set($globalTimezone);
+				$datetime = new DateTime();
+				$offset = $datetime->format('P');
+			} else $offset = '+00:00';
+
+
+			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') {
+					$additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' ";
+				} else {
+					$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
+				}
+			} else {
+				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
+				if ($globalDBdriver == 'mysql') {
+					$additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
+				} else {
+					$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
+				}
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[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 ($origLat != "" && $origLon != "" && $dist != "") {
-            $dist = number_format($dist*0.621371,2,'.','');
-            $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		if ($origLat != "" && $origLon != "" && $dist != "") {
+			$dist = number_format($dist*0.621371,2,'.','');
+			$query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
-        } else {
-            if ($sort != "")
-            {
-                $search_orderby_array = $Marine->getOrderBy();
-                $orderby_query = $search_orderby_array[$sort]['sql'];
-            } else {
-                $orderby_query = " ORDER BY marine_archive_output.date DESC";
-            }
+		} else {
+			if ($sort != "")
+			{
+				$search_orderby_array = $Marine->getOrderBy();
+				$orderby_query = $search_orderby_array[$sort]['sql'];
+			} else {
+				$orderby_query = " ORDER BY marine_archive_output.date DESC";
+			}
 	
-            if ($includegeodata == "true")
-            {
-                $additional_query .= " AND (marine_archive_output.waypoints <> '')";
-            }
+			if ($includegeodata == "true")
+			{
+				$additional_query .= " AND (marine_archive_output.waypoints <> '')";
+			}
 
-            $query  = "SELECT marine_archive_output.* FROM marine_archive_output 
+			$query  = "SELECT marine_archive_output.* FROM marine_archive_output 
 		    WHERE marine_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
-        }
-        $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
-
-        return $spotter_array;
-    }
-
-    public function deleteMarineArchiveData()
-    {
-        global $globalArchiveKeepMonths, $globalDBdriver;
-        date_default_timezone_set('UTC');
-        if ($globalDBdriver == 'mysql') {
-            $query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
-        } else {
-            $query = "DELETE FROM marine_archive_output WHERE marine_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";
-        }
-        return '';
-    }
-
-    /**
-     * Gets all the spotter information based on the callsign
-     *
-     * @param string $ident
-     * @param string $limit
-     * @param string $sort
-     * @return array the spotter information
-     */
-    public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
-    {
+		}
+		$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
+
+		return $spotter_array;
+	}
+
+	public function deleteMarineArchiveData()
+	{
+		global $globalArchiveKeepMonths, $globalDBdriver;
+		date_default_timezone_set('UTC');
+		if ($globalDBdriver == 'mysql') {
+			$query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
+		} else {
+			$query = "DELETE FROM marine_archive_output WHERE marine_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";
+		}
+		return '';
+	}
+
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @param string $ident
+	 * @param string $limit
+	 * @param string $sort
+	 * @return array the spotter information
+	 */
+	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -984,35 +984,35 @@ 
 	
 	if ($ident != "")
 	{
-	    if (!is_string($ident))
-	    {
-            return array();
-        } else {
-            $additional_query = " AND (marine_archive_output.ident = :ident)";
-            $query_values = array(':ident' => $ident);
-	    }
+		if (!is_string($ident))
+		{
+			return array();
+		} else {
+			$additional_query = " AND (marine_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 = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -1020,20 +1020,20 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-
-    /**
-     * Gets all the spotter information based on the owner
-     *
-     * @param string $owner
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @param string $owner
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1046,35 +1046,35 @@ 
 	
 	if ($owner != "")
 	{
-	    if (!is_string($owner))
-	    {
+		if (!is_string($owner))
+		{
 		return array();
-	    } else {
+		} else {
 		$additional_query = " AND (marine_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 = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
@@ -1082,19 +1082,19 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on the pilot
-     *
-     * @param string $pilot
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @param string $pilot
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1113,24 +1113,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 = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
@@ -1138,18 +1138,18 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-     * Gets all number of flight over countries
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @return array the airline country list
-     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @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 
@@ -1159,14 +1159,14 @@ 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_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";
       
@@ -1179,25 +1179,25 @@ 
         
 	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
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @return array the airline country list
-     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @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 
@@ -1207,14 +1207,14 @@ 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_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";
       
@@ -1227,25 +1227,25 @@ 
         
 	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
-     *
-     * @param $id
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getDateArchiveMarineDataById($id,$date)
-    {
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @param $id
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getDateArchiveMarineDataById($id,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -1253,17 +1253,17 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getDateArchiveMarineDataByIdent($ident,$date)
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getDateArchiveMarineDataByIdent($ident,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -1271,65 +1271,65 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on the airport
-     *
-     * @param string $airport
-     * @param string $limit
-     * @param string $sort
-     * @param array $filters
-     * @return array the spotter information
-     */
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
-        global $global_query;
-        $Marine = new Marine($this->db);
-        date_default_timezone_set('UTC');
-        $query_values = array();
-        $limit_query = '';
-        $additional_query = '';
-        $filter_query = $this->getFilter($filters,true,true);
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @param string $airport
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filters
+	 * @return array the spotter information
+	 */
+	public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
+		global $global_query;
+		$Marine = new Marine($this->db);
+		date_default_timezone_set('UTC');
+		$query_values = array();
+		$limit_query = '';
+		$additional_query = '';
+		$filter_query = $this->getFilter($filters,true,true);
 	
-        if ($airport != "")
-        {
-            if (!is_string($airport))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))";
-                $query_values = array(':airport' => $airport);
-            }
-        }
+		if ($airport != "")
+		{
+			if (!is_string($airport))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))";
+				$query_values = array(':airport' => $airport);
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[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 = $Marine->getOrderBy();
-            $orderby_query = $search_orderby_array[$sort]['sql'];
-        } else {
-            $orderby_query = " ORDER BY marine_archive_output.date DESC";
-        }
+		if ($sort != "")
+		{
+			$search_orderby_array = $Marine->getOrderBy();
+			$orderby_query = $search_orderby_array[$sort]['sql'];
+		} else {
+			$orderby_query = " ORDER BY marine_archive_output.date DESC";
+		}
 
-        $query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
+		$query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
 
-        $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
+		$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
-        return $spotter_array;
-    }
+		return $spotter_array;
+	}
 }
 ?>
\ No newline at end of file

require/class.TrackerArchive.php

Indentation +1070 added lines, -1070 removed lines

@@ -16,13 +16,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (TrackerArchive)');
 	}
 
-    /**
-     * Get SQL query part for filter used
-     * @param array $filter the filter
-     * @param bool $where
-     * @param bool $and
-     * @return string the SQL part
-     */
+	/**
+	 * Get SQL query part for filter used
+	 * @param array $filter the filter
+	 * @param bool $where
+	 * @param bool $and
+	 * @return string the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -91,27 +91,27 @@ 
 		return $filter_query;
 	}
 
-    /**
-     * Add to tracker_archive
-     *
-     * @param string $famtrackid
-     * @param string $ident
-     * @param string $latitude
-     * @param string $longitude
-     * @param string $altitude
-     * @param string $heading
-     * @param string $groundspeed
-     * @param string $date
-     * @param bool $putinarchive
-     * @param string $comment
-     * @param string $type
-     * @param bool $noarchive
-     * @param string $format_source
-     * @param string $source_name
-     * @param string $over_country
-     * @return string
-     */
-    public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
+	/**
+	 * Add to tracker_archive
+	 *
+	 * @param string $famtrackid
+	 * @param string $ident
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @param string $altitude
+	 * @param string $heading
+	 * @param string $groundspeed
+	 * @param string $date
+	 * @param bool $putinarchive
+	 * @param string $comment
+	 * @param string $type
+	 * @param bool $noarchive
+	 * @param string $format_source
+	 * @param string $source_name
+	 * @param string $over_country
+	 * @return string
+	 */
+	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Tracker.php');
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
@@ -134,40 +134,40 @@ 
 	}
 
 
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getLastArchiveTrackerDataByIdent($ident)
-    {
-        $Tracker = new Tracker($this->db);
-        date_default_timezone_set('UTC');
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
-        $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets last the spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getLastArchiveTrackerDataById($id)
-    {
-        $Tracker = new Tracker($this->db);
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
-        //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-        $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getLastArchiveTrackerDataByIdent($ident)
+	{
+		$Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
+		return $spotter_array;
+	}
+
+
+	/**
+	 * Gets last the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getLastArchiveTrackerDataById($id)
+	{
+		$Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		//$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
+		//$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+		$query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
-        /*
+		/*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -177,245 +177,245 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-        $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on a particular id
-     *
-     * @param $id
-     * @param string $date
-     * @return array the spotter information
-     */
-    public function getAllArchiveTrackerDataById($id,$date = '')
-    {
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        if ($date == '') $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
-        else $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date";
+		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @param string $date
+	 * @return array the spotter information
+	 */
+	public function getAllArchiveTrackerDataById($id,$date = '')
+	{
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		if ($date == '') $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
+		else $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id AND date < '".date('c',$date)."' ORDER BY date";
 
 //              $spotter_array = Tracker->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
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getCoordArchiveTrackerDataById($id)
-    {
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :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
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getCoordArchiveTrackerDataById($id)
+	{
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
 
 //              $spotter_array = Tracker->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 altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getAltitudeArchiveTrackerDataByIdent($ident)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_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);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets altitude information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getAltitudeArchiveTrackerDataById($id)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_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);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets altitude & speed information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
-    public function getAltitudeSpeedArchiveTrackerDataById($id)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :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);
-
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
-    public function getLastAltitudeArchiveTrackerDataByIdent($ident)
-    {
-
-        date_default_timezone_set('UTC');
-
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+		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 altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getAltitudeArchiveTrackerDataByIdent($ident)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_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);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets altitude information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getAltitudeArchiveTrackerDataById($id)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_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);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets altitude & speed information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
+	public function getAltitudeSpeedArchiveTrackerDataById($id)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :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);
+
+		return $spotter_array;
+	}
+
+
+	/**
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
+	public function getLastAltitudeArchiveTrackerDataByIdent($ident)
+	{
+
+		date_default_timezone_set('UTC');
+
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_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);
-
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets all the archive spotter information
-     *
-     * @param $ident
-     * @param $famtrackid
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getTrackerArchiveData($ident,$famtrackid,$date)
-    {
-        $Tracker = new Tracker($this->db);
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
-
-        $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
-
-        return $spotter_array;
-    }
-
-    public function deleteTrackerArchiveTrackData()
-    {
-        global $globalArchiveKeepTrackMonths, $globalDBdriver;
-        if ($globalDBdriver == 'mysql') {
-            $query = 'DELETE FROM tracker_archive WHERE tracker_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
-        } else {
-            $query = "DELETE FROM tracker_archive WHERE tracker_archive_id IN (SELECT tracker_archive_id FROM tracker_archive WHERE tracker_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)";
-        }
-        try {
-            $sth = $this->db->prepare($query);
-            $sth->execute();
-        } catch(PDOException $e) {
-            echo $e->getMessage();
-            die;
-        }
-    }
-
-    /**
-     * Gets Minimal Live Tracker data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
-    {
-        global $globalDBdriver;
-        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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-        }
-        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') {
-            /*
+		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;
+	}
+
+
+	/**
+	 * Gets all the archive spotter information
+	 *
+	 * @param $ident
+	 * @param $famtrackid
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getTrackerArchiveData($ident,$famtrackid,$date)
+	{
+		$Tracker = new Tracker($this->db);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
+
+		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
+
+		return $spotter_array;
+	}
+
+	public function deleteTrackerArchiveTrackData()
+	{
+		global $globalArchiveKeepTrackMonths, $globalDBdriver;
+		if ($globalDBdriver == 'mysql') {
+			$query = 'DELETE FROM tracker_archive WHERE tracker_archive.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepTrackMonths.' MONTH)';
+		} else {
+			$query = "DELETE FROM tracker_archive WHERE tracker_archive_id IN (SELECT tracker_archive_id FROM tracker_archive WHERE tracker_archive.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepTrackMonths." MONTH' LIMIT 10000)";
+		}
+		try {
+			$sth = $this->db->prepare($query);
+			$sth->execute();
+		} catch(PDOException $e) {
+			echo $e->getMessage();
+			die;
+		}
+	}
+
+	/**
+	 * Gets Minimal Live Tracker data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
+	{
+		global $globalDBdriver;
+		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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+		}
+		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, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk 
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 			*/
-            /*
+			/*
 			$query  = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk 
 				    FROM tracker_archive 
 				    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate 
@@ -424,900 +424,900 @@ 
 						GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid 
 				    AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 */
-            $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM tracker_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY famtrackid';
-        } else {
-            //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
-            $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+		} else {
+			//$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
+			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM tracker_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY famtrackid';
-        }
-        //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 Tracker data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
-    {
-        global $globalDBdriver;
-        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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-        }
-        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') {
-            /*
+		}
+		//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 Tracker data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
+	{
+		global $globalDBdriver;
+		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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+		}
+		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, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk 
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 			*/
-            $query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
+			$query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
 				    FROM tracker_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
 
-        } else {
-            //$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
-            /*
+		} else {
+			//$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
+			/*
                         $query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
                         */
-            $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
+			$query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.famtrackid, 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;
-    }
-
-    /**
-     * Gets count Live Tracker data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getLiveTrackerCount($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 famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-        }
-        if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-            $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-        }
-        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 famtrackid) as nb 
+		}
+		//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 Tracker data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getLiveTrackerCount($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 famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+		}
+		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+			$filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+		}
+		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 famtrackid) as nb 
 			FROM tracker_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-        } else {
-            $query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_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;
-        }
-        $result = $sth->fetch(PDO::FETCH_ASSOC);
-        $sth->closeCursor();
-        return $result['nb'];
-
-    }
-
-
-
-    // tracker_archive_output
-
-    /**
-     * Gets all the spotter information
-     *
-     * @param string $q
-     * @param string $registration
-     * @param string $aircraft_icao
-     * @param string $aircraft_manufacturer
-     * @param string $highlights
-     * @param string $airline_icao
-     * @param string $airline_country
-     * @param string $airline_type
-     * @param string $airport
-     * @param string $airport_country
-     * @param string $callsign
-     * @param string $departure_airport_route
-     * @param string $arrival_airport_route
-     * @param string $owner
-     * @param string $pilot_id
-     * @param string $pilot_name
-     * @param string $altitude
-     * @param string $date_posted
-     * @param string $limit
-     * @param string $sort
-     * @param string $includegeodata
-     * @param string $origLat
-     * @param string $origLon
-     * @param string $dist
-     * @param array $filters
-     * @return array the spotter information
-     */
-    public function searchTrackerData($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($this->db);
-        $Tracker = new Tracker($this->db);
-
-        date_default_timezone_set('UTC');
+		} else {
+			$query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_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;
+		}
+		$result = $sth->fetch(PDO::FETCH_ASSOC);
+		$sth->closeCursor();
+		return $result['nb'];
+
+	}
+
+
+
+	// tracker_archive_output
+
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @param string $q
+	 * @param string $registration
+	 * @param string $aircraft_icao
+	 * @param string $aircraft_manufacturer
+	 * @param string $highlights
+	 * @param string $airline_icao
+	 * @param string $airline_country
+	 * @param string $airline_type
+	 * @param string $airport
+	 * @param string $airport_country
+	 * @param string $callsign
+	 * @param string $departure_airport_route
+	 * @param string $arrival_airport_route
+	 * @param string $owner
+	 * @param string $pilot_id
+	 * @param string $pilot_name
+	 * @param string $altitude
+	 * @param string $date_posted
+	 * @param string $limit
+	 * @param string $sort
+	 * @param string $includegeodata
+	 * @param string $origLat
+	 * @param string $origLon
+	 * @param string $dist
+	 * @param array $filters
+	 * @return array the spotter information
+	 */
+	public function searchTrackerData($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($this->db);
+		$Tracker = new Tracker($this->db);
+
+		date_default_timezone_set('UTC');
 	
-        $query_values = array();
-        $additional_query = '';
-        $limit_query = '';
-        $filter_query = $this->getFilter($filters);
-        if ($q != "")
-        {
-            if (!is_string($q))
-            {
-                return array();
-            } else {
+		$query_values = array();
+		$additional_query = '';
+		$limit_query = '';
+		$filter_query = $this->getFilter($filters);
+		if ($q != "")
+		{
+			if (!is_string($q))
+			{
+				return array();
+			} else {
 	        
-                $q_array = explode(" ", $q);
+				$q_array = explode(" ", $q);
 		
-                foreach ($q_array as $q_item){
-                    $additional_query .= " AND (";
-                    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
-                    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
-                    $translate = $Translation->ident2icao($q_item);
-                    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
-                    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
-                    $additional_query .= ")";
-                }
-            }
-        }
+				foreach ($q_array as $q_item){
+					$additional_query .= " AND (";
+					$additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
+					$additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
+					$translate = $Translation->ident2icao($q_item);
+					if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+					$additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
+					$additional_query .= ")";
+				}
+			}
+		}
 	
-        if ($registration != "")
-        {
-            $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-            if (!is_string($registration))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.registration = '".$registration."')";
-            }
-        }
+		if ($registration != "")
+		{
+			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			if (!is_string($registration))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.registration = '".$registration."')";
+			}
+		}
 	
-        if ($aircraft_icao != "")
-        {
-            $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-            if (!is_string($aircraft_icao))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')";
-            }
-        }
+		if ($aircraft_icao != "")
+		{
+			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+			if (!is_string($aircraft_icao))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')";
+			}
+		}
 	
-        if ($aircraft_manufacturer != "")
-        {
-            $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-            if (!is_string($aircraft_manufacturer))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-            }
-        }
+		if ($aircraft_manufacturer != "")
+		{
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+			if (!is_string($aircraft_manufacturer))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
+			}
+		}
 	
-        if ($highlights == "true")
-        {
-            if (!is_string($highlights))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.highlight <> '')";
-            }
-        }
+		if ($highlights == "true")
+		{
+			if (!is_string($highlights))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.highlight <> '')";
+			}
+		}
 	
-        if ($airline_icao != "")
-        {
-            $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_icao))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')";
-            }
-        }
+		if ($airline_icao != "")
+		{
+			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_icao))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')";
+			}
+		}
 	
-        if ($airline_country != "")
-        {
-            $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_country))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')";
-            }
-        }
+		if ($airline_country != "")
+		{
+			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_country))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')";
+			}
+		}
 	
-        if ($airline_type != "")
-        {
-            $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-            if (!is_string($airline_type))
-            {
-                return array();
-            } else {
-                if ($airline_type == "passenger")
-                {
-                    $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
-                }
-                if ($airline_type == "cargo")
-                {
-                    $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
-                }
-                if ($airline_type == "military")
-                {
-                    $additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
-                }
-            }
-        }
+		if ($airline_type != "")
+		{
+			$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+			if (!is_string($airline_type))
+			{
+				return array();
+			} else {
+				if ($airline_type == "passenger")
+				{
+					$additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
+				}
+				if ($airline_type == "cargo")
+				{
+					$additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
+				}
+				if ($airline_type == "military")
+				{
+					$additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
+				}
+			}
+		}
 	
-        if ($airport != "")
-        {
-            $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-            if (!is_string($airport))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))";
-            }
-        }
+		if ($airport != "")
+		{
+			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			if (!is_string($airport))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))";
+			}
+		}
 	
-        if ($airport_country != "")
-        {
-            $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-            if (!is_string($airport_country))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))";
-            }
-        }
+		if ($airport_country != "")
+		{
+			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+			if (!is_string($airport_country))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))";
+			}
+		}
     
-        if ($callsign != "")
-        {
-            $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-            if (!is_string($callsign))
-            {
-                return array();
-            } else {
-                $translate = $Translation->ident2icao($callsign);
-                if ($translate != $callsign) {
-                    $additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
-                    $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
-                } else {
-                    $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
-                }
-            }
-        }
-
-        if ($owner != "")
-        {
-            $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-            if (!is_string($owner))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')";
-            }
-        }
-
-        if ($pilot_name != "")
-        {
-            $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-            if (!is_string($pilot_name))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')";
-            }
-        }
+		if ($callsign != "")
+		{
+			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			if (!is_string($callsign))
+			{
+				return array();
+			} else {
+				$translate = $Translation->ident2icao($callsign);
+				if ($translate != $callsign) {
+					$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
+					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+				} else {
+					$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
+				}
+			}
+		}
+
+		if ($owner != "")
+		{
+			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			if (!is_string($owner))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')";
+			}
+		}
+
+		if ($pilot_name != "")
+		{
+			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+			if (!is_string($pilot_name))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')";
+			}
+		}
 	
-        if ($pilot_id != "")
-        {
-            $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-            if (!is_string($pilot_id))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')";
-            }
-        }
+		if ($pilot_id != "")
+		{
+			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+			if (!is_string($pilot_id))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_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))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-            }
-        }
+		if ($departure_airport_route != "")
+		{
+			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+			if (!is_string($departure_airport_route))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_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))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-            }
-        }
+		if ($arrival_airport_route != "")
+		{
+			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+			if (!is_string($arrival_airport_route))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
+			}
+		}
 	
-        if ($altitude != "")
-        {
-            $altitude_array = explode(",", $altitude);
+		if ($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] != "")
-            {
-                $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 {
-                $altitude_array[0] = substr($altitude_array[0], 0, -2);
-                $additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-            }
-        }
+			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 {
+				$altitude_array[0] = substr($altitude_array[0], 0, -2);
+				$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
+			}
+		}
 	
-        if ($date_posted != "")
-        {
-            $date_array = explode(",", $date_posted);
+		if ($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 != '') {
-                date_default_timezone_set($globalTimezone);
-                $datetime = new DateTime();
-                $offset = $datetime->format('P');
-            } else $offset = '+00:00';
-
-
-            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') {
-                    $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' ";
-                } else {
-                    $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
-                }
-            } else {
-                $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
-                    $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
-                } else {
-                    $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
-                }
-            }
-        }
+			if ($globalTimezone != '') {
+				date_default_timezone_set($globalTimezone);
+				$datetime = new DateTime();
+				$offset = $datetime->format('P');
+			} else $offset = '+00:00';
+
+
+			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') {
+					$additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) <= '".$date_array[1]."' ";
+				} else {
+					$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
+				}
+			} else {
+				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
+				if ($globalDBdriver == 'mysql') {
+					$additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
+				} else {
+					$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
+				}
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[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 ($origLat != "" && $origLon != "" && $dist != "") {
-            $dist = number_format($dist*0.621371,2,'.','');
-            $query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		if ($origLat != "" && $origLon != "" && $dist != "") {
+			$dist = number_format($dist*0.621371,2,'.','');
+			$query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
-        } else {
-            if ($sort != "")
-            {
-                $search_orderby_array = $Tracker->getOrderBy();
-                $orderby_query = $search_orderby_array[$sort]['sql'];
-            } else {
-                $orderby_query = " ORDER BY tracker_archive_output.date DESC";
-            }
+		} else {
+			if ($sort != "")
+			{
+				$search_orderby_array = $Tracker->getOrderBy();
+				$orderby_query = $search_orderby_array[$sort]['sql'];
+			} else {
+				$orderby_query = " ORDER BY tracker_archive_output.date DESC";
+			}
 	
-            if ($includegeodata == "true")
-            {
-                $additional_query .= " AND (tracker_archive_output.waypoints <> '')";
-            }
+			if ($includegeodata == "true")
+			{
+				$additional_query .= " AND (tracker_archive_output.waypoints <> '')";
+			}
 
-            $query  = "SELECT tracker_archive_output.* FROM tracker_archive_output 
+			$query  = "SELECT tracker_archive_output.* FROM tracker_archive_output 
 		    WHERE tracker_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
-        }
-        $spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
-
-        return $spotter_array;
-    }
-
-    public function deleteTrackerArchiveData()
-    {
-        global $globalArchiveKeepMonths, $globalDBdriver;
-        date_default_timezone_set('UTC');
-        if ($globalDBdriver == 'mysql') {
-            $query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
-        } else {
-            $query = "DELETE FROM tracker_archive_output WHERE tracker_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";
-        }
-        return '';
-    }
-
-    /**
-     * Gets all the spotter information based on the callsign
-     *
-     * @param string $ident
-     * @param string $limit
-     * @param string $sort
-     * @return array the spotter information
-     */
-    public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
-    {
-        $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
+		}
+		$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
+
+		return $spotter_array;
+	}
+
+	public function deleteTrackerArchiveData()
+	{
+		global $globalArchiveKeepMonths, $globalDBdriver;
+		date_default_timezone_set('UTC');
+		if ($globalDBdriver == 'mysql') {
+			$query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
+		} else {
+			$query = "DELETE FROM tracker_archive_output WHERE tracker_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";
+		}
+		return '';
+	}
+
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @param string $ident
+	 * @param string $limit
+	 * @param string $sort
+	 * @return array the spotter information
+	 */
+	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
+	{
+		$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
-        date_default_timezone_set('UTC');
-        $Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$Tracker = new Tracker($this->db);
 	
-        $query_values = array();
-        $limit_query = '';
-        $additional_query = '';
+		$query_values = array();
+		$limit_query = '';
+		$additional_query = '';
 	
-        if ($ident != "")
-        {
-            if (!is_string($ident))
-            {
-                return array();
-            } else {
-                $additional_query = " AND (tracker_archive_output.ident = :ident)";
-                $query_values = array(':ident' => $ident);
-            }
-        }
+		if ($ident != "")
+		{
+			if (!is_string($ident))
+			{
+				return array();
+			} else {
+				$additional_query = " AND (tracker_archive_output.ident = :ident)";
+				$query_values = array(':ident' => $ident);
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-            }
-        }
-
-        if ($sort != "")
-        {
-            $search_orderby_array = $Tracker->getOrderBy();
-            $orderby_query = $search_orderby_array[$sort]['sql'];
-        } else {
-            $orderby_query = " ORDER BY tracker_archive_output.date DESC";
-        }
-
-        $query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
-
-        $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
-
-        return $spotter_array;
-    }
-
-
-    /**
-     * Gets all the spotter information based on the owner
-     *
-     * @param string $owner
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
-        $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
+			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 = $Tracker->getOrderBy();
+			$orderby_query = $search_orderby_array[$sort]['sql'];
+		} else {
+			$orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		}
+
+		$query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
+
+		$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
+
+		return $spotter_array;
+	}
+
+
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @param string $owner
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
+		$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
-        date_default_timezone_set('UTC');
-        $Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$Tracker = new Tracker($this->db);
 	
-        $query_values = array();
-        $limit_query = '';
-        $additional_query = '';
-        $filter_query = $this->getFilter($filter,true,true);
+		$query_values = array();
+		$limit_query = '';
+		$additional_query = '';
+		$filter_query = $this->getFilter($filter,true,true);
 	
-        if ($owner != "")
-        {
-            if (!is_string($owner))
-            {
-                return array();
-            } else {
-                $additional_query = " AND (tracker_archive_output.owner_name = :owner)";
-                $query_values = array(':owner' => $owner);
-            }
-        }
+		if ($owner != "")
+		{
+			if (!is_string($owner))
+			{
+				return array();
+			} else {
+				$additional_query = " AND (tracker_archive_output.owner_name = :owner)";
+				$query_values = array(':owner' => $owner);
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-            }
-        }
-
-        if ($sort != "")
-        {
-            $search_orderby_array = $Tracker->getOrderBy();
-            $orderby_query = $search_orderby_array[$sort]['sql'];
-        } else {
-            $orderby_query = " ORDER BY tracker_archive_output.date DESC";
-        }
-
-        $query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
-
-        $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on the pilot
-     *
-     * @param string $pilot
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
-    public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
-        $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
+			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 = $Tracker->getOrderBy();
+			$orderby_query = $search_orderby_array[$sort]['sql'];
+		} else {
+			$orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		}
+
+		$query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
+
+		$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @param string $pilot
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
+	public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
+		$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
-        date_default_timezone_set('UTC');
-        $Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$Tracker = new Tracker($this->db);
 	
-        $query_values = array();
-        $limit_query = '';
-        $additional_query = '';
-        $filter_query = $this->getFilter($filter,true,true);
+		$query_values = array();
+		$limit_query = '';
+		$additional_query = '';
+		$filter_query = $this->getFilter($filter,true,true);
 	
-        if ($pilot != "")
-        {
-            $additional_query = " AND (tracker_archive_output.pilot_id = :pilot OR tracker_archive_output.pilot_name = :pilot)";
-            $query_values = array(':pilot' => $pilot);
-        }
+		if ($pilot != "")
+		{
+			$additional_query = " AND (tracker_archive_output.pilot_id = :pilot OR tracker_archive_output.pilot_name = :pilot)";
+			$query_values = array(':pilot' => $pilot);
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-            }
-        }
-
-        if ($sort != "")
-        {
-            $search_orderby_array = $Tracker->getOrderBy();
-            $orderby_query = $search_orderby_array[$sort]['sql'];
-        } else {
-            $orderby_query = " ORDER BY tracker_archive_output.date DESC";
-        }
-
-        $query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
-
-        $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
-
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all number of flight over countries
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @return array the airline country list
-     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
-        global $globalDBdriver;
-        /*
+			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 = $Tracker->getOrderBy();
+			$orderby_query = $search_orderby_array[$sort]['sql'];
+		} else {
+			$orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		}
+
+		$query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
+
+		$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
+
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @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 
 		    FROM countries c, tracker_archive s
 		    WHERE Within(GeomFromText(CONCAT('POINT(',s.longitude,' ',s.latitude,')')), ogc_geom) ";
 	*/
-        $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
+		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, tracker_archive s
 		    WHERE c.iso2 = s.over_country ";
-        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."' ";
-        $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-        if ($limit) $query .= " LIMIT 0,10";
+		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."' ";
+		$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
+		if ($limit) $query .= " LIMIT 0,10";
       
 	
-        $sth = $this->db->prepare($query);
-        $sth->execute();
+		$sth = $this->db->prepare($query);
+		$sth->execute();
  
-        $flight_array = array();
-        $temp_array = array();
+		$flight_array = array();
+		$temp_array = array();
         
-        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;
-        }
-        return $flight_array;
-    }
-
-    /**
-     * Gets all number of flight over countries
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @return array the airline country list
-     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
-        global $globalDBdriver;
-        /*
+		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;
+		}
+		return $flight_array;
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @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 
 		    FROM countries c, tracker_archive s
 		    WHERE Within(GeomFromText(CONCAT('POINT(',s.longitude,' ',s.latitude,')')), ogc_geom) ";
 	*/
-        $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
+		$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, tracker_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.famtrackid = s.famtrackid ";
-        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."' ";
-        $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-        if ($limit) $query .= " LIMIT 0,10";
+		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."' ";
+		$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
+		if ($limit) $query .= " LIMIT 0,10";
       
 	
-        $sth = $this->db->prepare($query);
-        $sth->execute();
+		$sth = $this->db->prepare($query);
+		$sth->execute();
  
-        $flight_array = array();
-        $temp_array = array();
+		$flight_array = array();
+		$temp_array = array();
         
-        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;
-        }
-        return $flight_array;
-    }
-
-    /**
-     * Gets last spotter information based on a particular callsign
-     *
-     * @param $id
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getDateArchiveTrackerDataById($id,$date)
-    {
-        $Tracker = new Tracker($this->db);
-        date_default_timezone_set('UTC');
-        $id = filter_var($id, FILTER_SANITIZE_STRING);
-        $query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-        $date = date('c',$date);
-        $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @param $date
-     * @return array the spotter information
-     */
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
-    {
-        $Tracker = new Tracker($this->db);
-        date_default_timezone_set('UTC');
-        $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-        $query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-        $date = date('c',$date);
-        $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
-        return $spotter_array;
-    }
-
-    /**
-     * Gets all the spotter information based on the airport
-     *
-     * @param string $airport
-     * @param string $limit
-     * @param string $sort
-     * @param array $filters
-     * @return array the spotter information
-     */
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
-        global $global_query;
-        $Tracker = new Tracker($this->db);
-        date_default_timezone_set('UTC');
-        $query_values = array();
-        $limit_query = '';
-        $additional_query = '';
-        $filter_query = $this->getFilter($filters,true,true);
+		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;
+		}
+		return $flight_array;
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @param $id
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getDateArchiveTrackerDataById($id,$date)
+	{
+		$Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$id = filter_var($id, FILTER_SANITIZE_STRING);
+		$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+		$date = date('c',$date);
+		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @param $date
+	 * @return array the spotter information
+	 */
+	public function getDateArchiveTrackerDataByIdent($ident,$date)
+	{
+		$Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+		$date = date('c',$date);
+		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+		return $spotter_array;
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @param string $airport
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filters
+	 * @return array the spotter information
+	 */
+	public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
+		global $global_query;
+		$Tracker = new Tracker($this->db);
+		date_default_timezone_set('UTC');
+		$query_values = array();
+		$limit_query = '';
+		$additional_query = '';
+		$filter_query = $this->getFilter($filters,true,true);
 	
-        if ($airport != "")
-        {
-            if (!is_string($airport))
-            {
-                return array();
-            } else {
-                $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))";
-                $query_values = array(':airport' => $airport);
-            }
-        }
+		if ($airport != "")
+		{
+			if (!is_string($airport))
+			{
+				return array();
+			} else {
+				$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))";
+				$query_values = array(':airport' => $airport);
+			}
+		}
 	
-        if ($limit != "")
-        {
-            $limit_array = explode(",", $limit);
+		if ($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)
-            {
-                //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
-                $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[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 = $Tracker->getOrderBy();
-            $orderby_query = $search_orderby_array[$sort]['sql'];
-        } else {
-            $orderby_query = " ORDER BY tracker_archive_output.date DESC";
-        }
+		if ($sort != "")
+		{
+			$search_orderby_array = $Tracker->getOrderBy();
+			$orderby_query = $search_orderby_array[$sort]['sql'];
+		} else {
+			$orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		}
 
-        $query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
+		$query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
 
-        $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
+		$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
-        return $spotter_array;
-    }
+		return $spotter_array;
+	}
 }
 ?>
\ No newline at end of file

require/class.Marine.php

Indentation +463 added lines, -463 removed lines

@@ -18,13 +18,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (Marine)');
 	}
 
-    /**
-     * Get SQL query part for filter used
-     * @param array $filter the filter
-     * @param bool $where
-     * @param bool $and
-     * @return string the SQL part
-     */
+	/**
+	 * Get SQL query part for filter used
+	 * @param array $filter the filter
+	 * @param bool $where
+	 * @param bool $and
+	 * @return string the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -95,15 +95,15 @@ 
 		return $filter_query;
 	}
 
-    /**
-     * Executes the SQL statements to get the spotter information
-     *
-     * @param String $query the SQL query
-     * @param array $params parameter of the query
-     * @param String $limitQuery the limit query
-     * @param bool $schedules
-     * @return array the spotter information
-     */
+	/**
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @param bool $schedules
+	 * @return array the spotter information
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		global $globalVM;
@@ -253,14 +253,14 @@ 
 	}
 
 
-    /**
-     * Gets all the spotter information based on the latest data entry
-     *
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getLatestMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -295,7 +295,7 @@ 
      * @param string $id
      * @return array the spotter information
      */
-    public function getMarineDataByID($id = '')
+	public function getMarineDataByID($id = '')
 	{
 		global $global_marine_query;
 		
@@ -308,15 +308,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on the callsign
-     *
-     * @param string $ident
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @param string $ident
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -367,15 +367,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the marine information based on the type
-     *
-     * @param string $type
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the marine information
-     */
+	/**
+	 * Gets all the marine information based on the type
+	 *
+	 * @param string $type
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the marine information
+	 */
 	public function getMarineDataByType($type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -421,14 +421,14 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * @param string $date
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array
-     */
-    public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
+	/**
+	 * @param string $date
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array
+	 */
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query, $globalTimezone, $globalDBdriver;
 		
@@ -485,15 +485,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the marine information based on the captain
-     *
-     * @param string $captain
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the marine information
-     */
+	/**
+	 * Gets all the marine information based on the captain
+	 *
+	 * @param string $captain
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the marine information
+	 */
 	public function getMarineDataByCaptain($captain = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query;
@@ -531,15 +531,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the marine information based on the race
-     *
-     * @param string $race
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the marine information
-     */
+	/**
+	 * Gets all the marine information based on the race
+	 *
+	 * @param string $race
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the marine information
+	 */
 	public function getMarineDataByRace($race = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_marine_query,$globalDBdriver;
@@ -581,13 +581,13 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Count races by captain
-     *
-     * @param $captain
-     * @param array $filters
-     * @return Integer number of race for a captain
-     */
+	/**
+	 * Count races by captain
+	 *
+	 * @param $captain
+	 * @param array $filters
+	 * @return Integer number of race for a captain
+	 */
 	public function countRacesByCaptain($captain,$filters = array())
 	{
 		$captain = filter_var($captain,FILTER_SANITIZE_STRING);
@@ -602,13 +602,13 @@ 
 		return $result[0]['nb'];
 	}
 
-    /**
-     * Count captains by race
-     *
-     * @param $race
-     * @param array $filters
-     * @return String Duration of all races
-     */
+	/**
+	 * Count captains by race
+	 *
+	 * @param $race
+	 * @param array $filters
+	 * @return String Duration of all races
+	 */
 	public function countCaptainsByRace($race,$filters = array())
 	{
 		$race = filter_var($race,FILTER_SANITIZE_STRING);
@@ -623,16 +623,16 @@ 
 		return $result[0]['nb'];
 	}
 
-    /**
-     * Gets all boat types that have been used by a captain
-     *
-     * @param $captain
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the boat list
-     */
+	/**
+	 * Gets all boat types that have been used by a captain
+	 *
+	 * @param $captain
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the boat list
+	 */
 	public function countAllBoatTypesByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -676,16 +676,16 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all boat types that have been used on a race
-     *
-     * @param $race
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the boat list
-     */
+	/**
+	 * Gets all boat types that have been used on a race
+	 *
+	 * @param $race
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the boat list
+	 */
 	public function countAllBoatTypesByRace($race,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -729,16 +729,16 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets race duration by captain
-     *
-     * @param $captain
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return String Duration of all race
-     */
+	/**
+	 * Gets race duration by captain
+	 *
+	 * @param $captain
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return String Duration of all race
+	 */
 	public function getRaceDurationByCaptain($captain,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -783,16 +783,16 @@ 
 		else return $result[0]['duration'];
 	}
 
-    /**
-     * Gets race duration by captains
-     *
-     * @param bool $limit
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array Duration of all race
-     */
+	/**
+	 * Gets race duration by captains
+	 *
+	 * @param bool $limit
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array Duration of all race
+	 */
 	public function getRaceDurationByCaptains($limit = true,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -850,12 +850,12 @@ 
 
 	}
 
-    /**
-     * Gets a list of all captain names and captain ids
-     *
-     * @param array $filters
-     * @return array list of captain names and captain ids
-     */
+	/**
+	 * Gets a list of all captain names and captain ids
+	 *
+	 * @param array $filters
+	 * @return array list of captain names and captain ids
+	 */
 	public function getAllCaptainNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -868,12 +868,12 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets a list of all race names and race ids
-     *
-     * @param array $filters
-     * @return array list of race names and race ids
-     */
+	/**
+	 * Gets a list of all race names and race ids
+	 *
+	 * @param array $filters
+	 * @return array list of race names and race ids
+	 */
 	public function getAllRaceNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -887,13 +887,13 @@ 
 	}
 
 
-    /**
-     * Gets all source name
-     *
-     * @param String type format of source
-     * @param array $filters
-     * @return array list of source name
-     */
+	/**
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @param array $filters
+	 * @return array list of source name
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -922,12 +922,12 @@ 
 	}
 
 
-    /**
-     * Gets a list of all idents/callsigns
-     *
-     * @param array $filters
-     * @return array list of ident/callsign names
-     */
+	/**
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @param array $filters
+	 * @return array list of ident/callsign names
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -950,12 +950,12 @@ 
 		return $ident_array;
 	}
 
-    /**
-     * Gets all info from a mmsi
-     *
-     * @param $mmsi
-     * @return array ident
-     */
+	/**
+	 * Gets all info from a mmsi
+	 *
+	 * @param $mmsi
+	 * @return array ident
+	 */
 	public function getIdentity($mmsi)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -967,14 +967,14 @@ 
 		else return array();
 	}
 
-    /**
-     * Add identity
-     * @param $mmsi
-     * @param $imo
-     * @param $ident
-     * @param $callsign
-     * @param $type
-     */
+	/**
+	 * Add identity
+	 * @param $mmsi
+	 * @param $imo
+	 * @param $ident
+	 * @param $callsign
+	 * @param $type
+	 */
 	public function addIdentity($mmsi,$imo,$ident,$callsign,$type)
 	{
 		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
@@ -1040,13 +1040,13 @@ 
 	}
 
 	/**
-	* Update ident tracker data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $ident the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update ident tracker data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
@@ -1061,13 +1061,13 @@ 
 	}
 
 	/**
-	* Update arrival marine data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $arrival_code the marine ident
-	* @return String success or false
-	*
-	*/
+	 * Update arrival marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $arrival_code the marine ident
+	 * @return String success or false
+	 *
+	 */
 	public function updateArrivalPortNameMarineData($fammarine_id = '', $arrival_code = '',$fromsource = NULL)
 	{
 		$query = 'UPDATE marine_output SET arrival_port_name = :arrival_code WHERE fammarine_id = :fammarine_id';
@@ -1082,19 +1082,19 @@ 
 	}
 
 	/**
-	* Update Status data
-	*
-	* @param String $fammarine_id the ID
-	* @param String $status_id the marine status id
-	* @param String $status the marine status
-	* @return String success or false
-	*
-	*/
+	 * Update Status data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $status_id the marine status id
+	 * @param String $status the marine status
+	 * @return String success or false
+	 *
+	 */
 	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
 	{
 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
+				$query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -1107,22 +1107,22 @@ 
 
 	}
 
-    /**
-     * Update latest marine data
-     *
-     * @param String $fammarine_id the ID
-     * @param String $ident the marine ident
-     * @param string $latitude
-     * @param string $longitude
-     * @param float $groundspeed
-     * @param string $date
-     * @param float $distance
-     * @param integer $race_rank
-     * @param integer $race_time
-     * @param string $status
-     * @param string $race_begin
-     * @return String success or false
-     */
+	/**
+	 * Update latest marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @param float $groundspeed
+	 * @param string $date
+	 * @param float $distance
+	 * @param integer $race_rank
+	 * @param integer $race_time
+	 * @param string $status
+	 * @param string $race_begin
+	 * @return String success or false
+	 */
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '',$distance = NULL,$race_rank = NULL, $race_time = NULL, $status = '', $race_begin = '')
 	{
 		if ($latitude == '') $latitude = NULL;
@@ -1147,36 +1147,36 @@ 
 
 	}
 
-    /**
-     * Adds a new marine data
-     *
-     * @param String $fammarine_id the ID
-     * @param String $ident the marine ident
-     * @param String $latitude latitude of flight
-     * @param String $longitude latitude of flight
-     * @param String $heading heading of flight
-     * @param String $groundspeed speed of flight
-     * @param String $date date of flight
-     * @param string $mmsi
-     * @param string $type
-     * @param string $typeid
-     * @param string $imo
-     * @param string $callsign
-     * @param string $arrival_code
-     * @param string $arrival_date
-     * @param string $status
-     * @param string $statusid
-     * @param string $format_source
-     * @param string $source_name
-     * @param string $captain_id
-     * @param string $captain_name
-     * @param string $race_id
-     * @param string $race_name
-     * @param string $distance
-     * @param string $race_rank
-     * @param string $race_time
-     * @return String success or false
-     */
+	/**
+	 * Adds a new marine data
+	 *
+	 * @param String $fammarine_id the ID
+	 * @param String $ident the marine ident
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param string $mmsi
+	 * @param string $type
+	 * @param string $typeid
+	 * @param string $imo
+	 * @param string $callsign
+	 * @param string $arrival_code
+	 * @param string $arrival_date
+	 * @param string $status
+	 * @param string $statusid
+	 * @param string $format_source
+	 * @param string $source_name
+	 * @param string $captain_id
+	 * @param string $captain_name
+	 * @param string $race_id
+	 * @param string $race_name
+	 * @param string $distance
+	 * @param string $race_rank
+	 * @param string $race_time
+	 * @return String success or false
+	 */
 	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '', $captain_id = '',$captain_name = '',$race_id = '', $race_name = '', $distance = '',$race_rank = '', $race_time = '')
 	{
 		global $globalMarineImageFetch;
@@ -1309,12 +1309,12 @@ 
 	}
 
 
-    /**
-     * Gets the aircraft ident within the last hour
-     *
-     * @param $ident
-     * @return String the ident
-     */
+	/**
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @param $ident
+	 * @return String the ident
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -1330,11 +1330,11 @@ 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -1344,12 +1344,12 @@ 
 	}
 
 
-    /**
-     * Gets the aircraft data from the last 20 seconds
-     *
-     * @param string $q
-     * @return array the marine data
-     */
+	/**
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @param string $q
+	 * @return array the marine data
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -1384,15 +1384,15 @@ 
 	}
 
 
-    /**
-     * Gets all number of flight over countries
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @return array the airline country list
-     */
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @return array the airline country list
+	 */
 
 	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
@@ -1463,18 +1463,18 @@ 
 	}
 
 
-    /**
-     * Gets all callsigns that have flown over
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the callsign list
-     */
+	/**
+	 * Gets all callsigns that have flown over
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the callsign list
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -1540,12 +1540,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1590,12 +1590,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates during the last 7 days
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last 7 days
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1617,7 +1617,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1636,12 +1636,12 @@ 
 		return $date_array;
 	}
 
-    /**
-     * Counts all dates during the last month
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last month
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1663,7 +1663,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1683,12 +1683,12 @@ 
 	}
 
 
-    /**
-     * Counts all month
-     *
-     * @param array $filters
-     * @return array the month list
-     */
+	/**
+	 * Counts all month
+	 *
+	 * @param array $filters
+	 * @return array the month list
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1730,12 +1730,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates during the last year
-     *
-     * @param $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last year
+	 *
+	 * @param $filters
+	 * @return array the date list
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1757,7 +1757,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1778,13 +1778,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours
-     *
-     * @param $orderby
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours
+	 *
+	 * @param $orderby
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1845,13 +1845,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours by date
-     *
-     * @param $date
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours by date
+	 *
+	 * @param $date
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1893,13 +1893,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours by a ident/callsign
-     *
-     * @param $ident
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @param $ident
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1941,15 +1941,15 @@ 
 		return $hour_array;
 	}
 
-    /**
-     * Gets all aircraft registrations that have flown over
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @return array the aircraft list
-     */
+	/**
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @return array the aircraft list
+	 */
 	public function countAllCaptainsByRaces($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -1987,14 +1987,14 @@ 
 		return $marine_array;
 	}
 
-    /**
-     * Counts all vessels
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer the number of vessels
-     */
+	/**
+	 * Counts all vessels
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer the number of vessels
+	 */
 	public function countOverallMarine($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -2028,14 +2028,14 @@ 
 		return $sth->fetchColumn();
 	}
 
-    /**
-     * Counts all vessel type
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer the number of vessels
-     */
+	/**
+	 * Counts all vessel type
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer the number of vessels
+	 */
 	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -2068,14 +2068,14 @@ 
 		return $sth->fetchColumn();
 	}
 
-    /**
-     * Gets a number of all race
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer number of races
-     */
+	/**
+	 * Gets a number of all race
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer number of races
+	 */
 	public function countOverallMarineRaces($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -2108,14 +2108,14 @@ 
 		return $sth->fetchColumn();
 	}
 
-    /**
-     * Gets a number of all captain
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer number of captain
-     */
+	/**
+	 * Gets a number of all captain
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer number of captain
+	 */
 	public function countOverallMarineCaptains($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -2148,12 +2148,12 @@ 
 		return $sth->fetchColumn();
 	}
 
-    /**
-     * Counts all hours of today
-     *
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours of today
+	 *
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -2193,12 +2193,12 @@ 
 	}
 
 
-    /**
-     * Gets the Barrie Spotter ID based on the FlightAware ID
-     *
-     * @param $fammarine_id
-     * @return Integer the Barrie Spotter ID
-     */
+	/**
+	 * Gets the Barrie Spotter ID based on the FlightAware ID
+	 *
+	 * @param $fammarine_id
+	 * @return Integer the Barrie Spotter ID
+	 */
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
 	{
 		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
@@ -2219,13 +2219,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -2258,12 +2258,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -2342,12 +2342,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countries
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countries
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDebug;
@@ -2384,11 +2384,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countries
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countries
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDebug;
@@ -2417,12 +2417,12 @@ 
 
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -2448,18 +2448,18 @@ 
 	}
 
 
-    /**
-     * Gets all vessels types that have flown over
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the vessel type list
-     */
+	/**
+	 * Gets all vessels types that have flown over
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the vessel type list
+	 */
 	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -2524,27 +2524,27 @@ 
 		return $marine_array;
 	}
 
-    /**
-     * Gets all the tracker information
-     *
-     * @param string $q
-     * @param string $callsign
-     * @param string $mmsi
-     * @param string $imo
-     * @param string $date_posted
-     * @param string $limit
-     * @param string $sort
-     * @param string $includegeodata
-     * @param string $origLat
-     * @param string $origLon
-     * @param string $dist
-     * @param string $captain_id
-     * @param string $captain_name
-     * @param string $race_id
-     * @param string $race_name
-     * @param array $filters
-     * @return array the tracker information
-     */
+	/**
+	 * Gets all the tracker information
+	 *
+	 * @param string $q
+	 * @param string $callsign
+	 * @param string $mmsi
+	 * @param string $imo
+	 * @param string $date_posted
+	 * @param string $limit
+	 * @param string $sort
+	 * @param string $includegeodata
+	 * @param string $origLat
+	 * @param string $origLon
+	 * @param string $dist
+	 * @param string $captain_id
+	 * @param string $captain_name
+	 * @param string $race_id
+	 * @param string $race_name
+	 * @param array $filters
+	 * @return array the tracker information
+	 */
 	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$captain_id = '',$captain_name = '',$race_id = '',$race_name = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -2720,12 +2720,12 @@ 
 		return $marine_array;
 	}
 
-    /**
-     * Check marine by id
-     *
-     * @param $id
-     * @return String the ident
-     */
+	/**
+	 * Check marine by id
+	 *
+	 * @param $id
+	 * @return String the ident
+	 */
 	public function checkId($id)
 	{
 		$query  = 'SELECT marine_output.ident, marine_output.fammarine_id FROM marine_output WHERE marine_output.fammarine_id = :id';
@@ -2740,12 +2740,12 @@ 
 		return $ident_result;
 	}
 
-    /**
-     * Gets all info from a race
-     *
-     * @param $race_name
-     * @return array race
-     */
+	/**
+	 * Gets all info from a race
+	 *
+	 * @param $race_name
+	 * @return array race
+	 */
 	public function getRaceByName($race_name)
 	{
 		$race_name = filter_var($race_name,FILTER_SANITIZE_STRING);
@@ -2757,12 +2757,12 @@ 
 		else return array();
 	}
 
-    /**
-     * Gets all info from a race
-     *
-     * @param $race_id
-     * @return array race
-     */
+	/**
+	 * Gets all info from a race
+	 *
+	 * @param $race_id
+	 * @return array race
+	 */
 	public function getRace($race_id)
 	{
 		$race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT);
@@ -2774,15 +2774,15 @@ 
 		else return array();
 	}
 
-    /**
-     * Add race
-     * @param $race_id
-     * @param $race_name
-     * @param $race_creator
-     * @param $race_desc
-     * @param $race_startdate
-     * @param $race_markers
-     */
+	/**
+	 * Add race
+	 * @param $race_id
+	 * @param $race_name
+	 * @param $race_creator
+	 * @param $race_desc
+	 * @param $race_startdate
+	 * @param $race_markers
+	 */
 	public function addRace($race_id,$race_name,$race_creator,$race_desc,$race_startdate,$race_markers)
 	{
 		$race_id = filter_var($race_id,FILTER_SANITIZE_NUMBER_INT);

require/class.Scheduler.php

Indentation +156 added lines, -156 removed lines

@@ -27,16 +27,16 @@ 
 		if ($this->db === null) die('Error: No DB connection.');
 	}
 
-    /**
-     * Add schedule data to database
-     * @param String $ident aircraft ident
-     * @param String $departure_airport_icao departure airport icao
-     * @param String $departure_airport_time departure airport time
-     * @param String $arrival_airport_icao arrival airport icao
-     * @param String $arrival_airport_time arrival airport time
-     * @param String $source source of data
-     * @return string
-     */
+	/**
+	 * Add schedule data to database
+	 * @param String $ident aircraft ident
+	 * @param String $departure_airport_icao departure airport icao
+	 * @param String $departure_airport_time departure airport time
+	 * @param String $arrival_airport_icao arrival airport icao
+	 * @param String $arrival_airport_time arrival airport time
+	 * @param String $source source of data
+	 * @return string
+	 */
 	public function addSchedule($ident,$departure_airport_icao,$departure_airport_time,$arrival_airport_icao,$arrival_airport_time,$source = 'website') {
 		date_default_timezone_set('UTC');
 		$date = date("Y-m-d H:i:s",time());
@@ -52,18 +52,18 @@ 
 		}
 		if ($sth->fetchColumn() > 0) {
 			if ($departure_airport_time == '' && $arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($arrival_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao);
 			} elseif ($departure_airport_time == '') {
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			} else {
-			    //$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
-			    $query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
-			    $query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
+				//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident AND departure_airport_icao = :departure_airport_icao AND departure_airport_time = :departure_airport_time AND arrival_airport_icao = :arrival_airport_icao AND arrival_airport_time = :arrival_airport_time";
+				$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident AND FromAirport_ICAO = :departure_airport_icao AND FromAirport_Time = :departure_airport_time AND ToAirport_ICAO = :arrival_airport_icao AND ToAirport_Time = :arrival_airport_time";
+				$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time);
 			}
 			try {
 				$sth = $this->db->prepare($query);
@@ -151,15 +151,15 @@ 
 	*/
 	public function checkSchedule($ident) {
 		global $globalDBdriver;
-	        //$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
-	        if ($globalDBdriver == 'mysql') {
+			//$query = "SELECT COUNT(*) as nb FROM schedule WHERE ident = :ident AND date_added > DATE_SUB(CURDATE(), INTERVAL 8 DAY) - 8 LIMIT 1";
+			if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident AND ((date_added BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 1 MONTH)) AND DATE(NOW()) and date_modified IS NULL) OR (date_modified BETWEEN DATE(DATE_SUB(CURDATE(), INTERVAL 15 DAY)) AND DATE(NOW()))) LIMIT 1";
 		} else {
 			$query = "SELECT COUNT(*) as nb FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident 
 			AND ((date_added::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) and date_modified::timestamp IS NULL)
 			     OR (date_modified::timestamp BETWEEN CURRENT_TIMESTAMP - INTERVAL '1 MONTH' AND CURRENT_TIMESTAMP) LIMIT 1";
 		}
-	        $query_values = array(':ident' => $ident);
+			$query_values = array(':ident' => $ident);
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
@@ -171,13 +171,13 @@ 
 		return $row['nb'];
 	}
 
-    /**
-     * Get flight info from Air France
-     * @param String $callsign The callsign
-     * @param String $date date we want flight number info
-     * @param String $carrier IATA code
-     * @return array departure and arrival airports and time
-     */
+	/**
+	 * Get flight info from Air France
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier IATA code
+	 * @return array departure and arrival airports and time
+	 */
 	public function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -212,12 +212,12 @@ 
 		} else return array();
 	}
 
-    /**
-     * Get flight info from EasyJet
-     * @param String $callsign The callsign
-     * @param String $date date we want flight number info
-     * @return array departure and arrival airports and time
-     */
+	/**
+	 * Get flight info from EasyJet
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array departure and arrival airports and time
+	 */
 	private function getEasyJet($callsign, $date = 'NOW') {
 		global $globalTimezone;
 		$Common = new Common();
@@ -240,11 +240,11 @@ 
 		} else return array();
 	}
 
-    /**
-     * Get flight info from Ryanair
-     * @param String $callsign The callsign
-     * @return array Flight departure and arrival airports and time
-     */
+	/**
+	 * Get flight info from Ryanair
+	 * @param String $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -267,10 +267,10 @@ 
 	}
 
 	/**
-	* Get flight info from Swiss
-	* @param string $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Swiss
+	 * @param string $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -299,11 +299,11 @@ 
 	}
 	
 	/**
-	* Get flight info from British Airways API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from British Airways API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getBritishAirways($callsign, $date = 'NOW') {
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
@@ -327,11 +327,11 @@ 
 	}
 
 	/**
-	* Get flight info from Lutfhansa API
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lutfhansa API
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getLufthansa($callsign, $date = 'NOW') {
 		global $globalLufthansaKey;
 		$Common = new Common();
@@ -361,11 +361,11 @@ 
 	}
 
 	/**
-	* Get flight info from Transavia API
-	* @param string $callsign The callsign
-	* @param string $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Transavia API
+	 * @param string $callsign The callsign
+	 * @param string $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getTransavia($callsign, $date = 'NOW') {
 		global $globalTransaviaKey;
 		$Common = new Common();
@@ -391,10 +391,10 @@ 
 	}
 
 	/**
-	* Get flight info from Tunisair
-	* @param string $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Tunisair
+	 * @param string $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -410,12 +410,12 @@ 
 		return array();
 	}
 
-    /**
-     * Get flight info from Vueling
-     * @param String $callsign The callsign
-     * @param string $date
-     * @return array Flight departure and arrival airports and time
-     */
+	/**
+	 * Get flight info from Vueling
+	 * @param String $callsign The callsign
+	 * @param string $date
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getVueling($callsign,$date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
@@ -437,11 +437,11 @@ 
 	}
 
 	/**
-	* Get flight info from Iberia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Iberia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -470,13 +470,13 @@ 
 		return array();
 	}
 
-    /**
-     * Get flight info from Star Alliance
-     * @param String $callsign The callsign
-     * @param String $date date we want flight number info
-     * @param string $carrier
-     * @return array Flight departure and arrival airports and time
-     */
+	/**
+	 * Get flight info from Star Alliance
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param string $carrier
+	 * @return array Flight departure and arrival airports and time
+	 */
 
 	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
 		$Common = new Common();
@@ -508,11 +508,11 @@ 
 
 
 	/**
-	* Get flight info from Alitalia
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Alitalia
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -532,11 +532,11 @@ 
 	}
 
 	/**
-	* Get flight info from Brussels airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Brussels airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -546,25 +546,25 @@ 
 		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
-		    //echo $data;
-		    $parsed_json = json_decode($data,true);
-		    if (isset($parsed_json[0]['FromAirportCode'])) {
+			//echo $data;
+			$parsed_json = json_decode($data,true);
+			if (isset($parsed_json[0]['FromAirportCode'])) {
 			$DepartureAirportIata = $parsed_json[0]['FromAirportCode'];
 			$ArrivalAirportIata = $parsed_json[0]['ToAirportCode'];
 			$departureTime = date('H:i',strtotime($parsed_json[0]['ScheduledDepatureDate']));
 			$arrivalTime = date('H:i',strtotime($parsed_json[0]['ScheduledArrivalDate']));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_brussels');
-		    }
+			}
 		}
 		return array();
 	}
 
 	/**
-	* Get flight info from FlightRadar24
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from FlightRadar24
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 /*
 	public function getFlightRadar24($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -593,11 +593,11 @@ 
 	}
   */
 	/**
-	* Get flight info from Lufthansa
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Lufthansa
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 
 /*	private function getLufthansa($callsign, $date = 'NOW') {
 		$Common = new Common();
@@ -625,10 +625,10 @@ 
 	}
   */
 	/**
-	* Get flight info from flytap
-	* @param String $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flytap
+	 * @param String $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getFlyTap($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -651,10 +651,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightmapper
-	* @param String $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightmapper
+	 * @param String $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getFlightMapper($callsign) {
 		$Common = new Common();
 		$airline_icao = '';
@@ -682,11 +682,11 @@ 
 				$aarr = '';
 				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$aarr);
 				if ($n == 7) {
-				    $departureTime = $dhour;
-				    $arrivalTime = $ahour;
-				    $DepartureAirportIata = str_replace(array('(',')'),'',$darr);
-				    $ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
-				    return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
+					$departureTime = $dhour;
+					$arrivalTime = $ahour;
+					$DepartureAirportIata = str_replace(array('(',')'),'',$darr);
+					$ArrivalAirportIata = str_replace(array('(',')'),'',$aarr);
+					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -694,10 +694,10 @@ 
 	}
 
 	/**
-	* Get flight info from flightaware
-	* @param String $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from flightaware
+	 * @param String $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getFlightAware($callsign) {
 		global $globalFlightAwareUsername, $globalFlightAwarePassword;
 		date_default_timezone_set('UTC');
@@ -722,11 +722,11 @@ 
 				$flight = $result['FlightInfoStatusResult']['flights'][0];
 				if (isset($flight['origin'])) {
 					return array(
-					    'DepartureAirportIATA' => $flight['origin']['alternate_ident'],
-					    'DepartureTime' => $flight['filed_departure_time']['time'],
-					    'ArrivalAirportIATA' => $flight['destination']['alternate_ident'],
-					    'ArrivalTime' => $flight['filed_arrival_time']['time'],
-					    'Source' => 'website_flightaware');
+						'DepartureAirportIATA' => $flight['origin']['alternate_ident'],
+						'DepartureTime' => $flight['filed_departure_time']['time'],
+						'ArrivalAirportIATA' => $flight['destination']['alternate_ident'],
+						'ArrivalTime' => $flight['filed_arrival_time']['time'],
+						'Source' => 'website_flightaware');
 				}
 			}
 		}
@@ -739,21 +739,21 @@ 
 			$flight = reset($flights['flights']);
 			if (isset($flight['activityLog']['flights'][0]['origin'])) {
 				return array(
-				    'DepartureAirportIATA' => $flight['activityLog']['flights'][0]['origin']['iata'],
-				    'DepartureTime' => date('H:i',$flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
-				    'ArrivalAirportIATA' => $flight['activityLog']['flights'][0]['destination']['iata'],
-				    'ArrivalTime' => date('H:i',$flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
-				    'Source' => 'website_flightaware');
+					'DepartureAirportIATA' => $flight['activityLog']['flights'][0]['origin']['iata'],
+					'DepartureTime' => date('H:i',$flight['activityLog']['flights'][0]['takeoffTimes']['scheduled']),
+					'ArrivalAirportIATA' => $flight['activityLog']['flights'][0]['destination']['iata'],
+					'ArrivalTime' => date('H:i',$flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
+					'Source' => 'website_flightaware');
 			}
 		}
 		return array();
 	}
 
 	/**
-	* Get flight info from CostToTravel
-	* @param String $callsign The callsign
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from CostToTravel
+	 * @param String $callsign The callsign
+	 * @return array Flight departure and arrival airports and time
+	 */
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
 		$url= "http://www.costtotravel.com/flight-number/".$callsign;
@@ -776,11 +776,11 @@ 
 	}
 
 	/**
-	* Get flight info from Air Canada
-	* @param string $callsign The callsign
-	* @param string $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Canada
+	 * @param string $callsign The callsign
+	 * @param string $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
 		if (class_exists("DomDocument") === FALSE) return array();
@@ -805,11 +805,11 @@ 
 	}
 
 	/**
-	* Get flight info from Vietnam Airlines
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Vietnam Airlines
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
@@ -832,12 +832,12 @@ 
 	}
 
 	/**
-	* Get flight info from Air Berlin
-	* @param String $callsign The callsign
-	* @param String $date date we want flight number info
-	* @param String $carrier airline code
-	* @return array Flight departure and arrival airports and time
-	*/
+	 * Get flight info from Air Berlin
+	 * @param String $callsign The callsign
+	 * @param String $date date we want flight number info
+	 * @param String $carrier airline code
+	 * @return array Flight departure and arrival airports and time
+	 */
 	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
@@ -866,11 +866,11 @@ 
 			$table = $Common->table2array($data);
 			$flight = $table;
 			if (isset($flight[5][4])) {
-			    $arrivalTime = $flight[5][4];
-			    $arrivalAirport = $flight[5][3];
+				$arrivalTime = $flight[5][4];
+				$arrivalAirport = $flight[5][3];
 			} else {
-			    $arrivalTime = '';
-			    $arrivalAirport = '';
+				$arrivalTime = '';
+				$arrivalAirport = '';
 			}
 		} else return array();
 		$url = 'http://www.airberlin.com/en-US/site/json/suggestAirport.php?searchfor=departures&searchflightid=0&departures%5B%5D=&suggestsource%5B0%5D=activeairports&withcountries=0&withoutroutings=0&promotion%5Bid%5D=&promotion%5Btype%5D=&routesource%5B0%5D=airberlin&routesource%5B1%5D=partner';

require/class.Translation.php

Indentation +30 added lines, -30 removed lines

@@ -25,11 +25,11 @@ 
 	}
 
 	/**
-	* Change IATA to ICAO value for ident
-	* 
-	* @param string $ident ident
-	* @return string the icao
-	*/
+	 * Change IATA to ICAO value for ident
+	 * 
+	 * @param string $ident ident
+	 * @return string the icao
+	 */
 	public function ident2icao($ident) {
 		$Spotter = new Spotter();
 		if (!is_numeric(substr($ident, 0, 3))) {
@@ -52,11 +52,11 @@ 
 		return $icao;
 	}
 
-    /**
-     * @param $ident
-     * @return string
-     */
-    public function getOperator($ident) {
+	/**
+	 * @param $ident
+	 * @return string
+	 */
+	public function getOperator($ident) {
 		$query = "SELECT * FROM translation WHERE Operator = :ident LIMIT 1";
 		$query_values = array(':ident' => $ident);
 		try {
@@ -72,13 +72,13 @@ 
 		} else return $ident;
 	}
 
-    /**
-     * @param $ident
-     * @param $correct_ident
-     * @param $source
-     * @return string
-     */
-    public function addOperator($ident, $correct_ident, $source) {
+	/**
+	 * @param $ident
+	 * @param $correct_ident
+	 * @param $source
+	 * @return string
+	 */
+	public function addOperator($ident, $correct_ident, $source) {
 		$query = "INSERT INTO translation (Operator,Operator_correct,Source) VALUES (:ident,:correct_ident,:source)";
 		$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
 		try {
@@ -89,13 +89,13 @@ 
 		}
 	}
 
-    /**
-     * @param $ident
-     * @param $correct_ident
-     * @param $source
-     * @return string
-     */
-    public function updateOperator($ident, $correct_ident, $source) {
+	/**
+	 * @param $ident
+	 * @param $correct_ident
+	 * @param $source
+	 * @return string
+	 */
+	public function updateOperator($ident, $correct_ident, $source) {
 		$query = "UPDATE translation SET Operator_correct = :correct_ident,Source = :source WHERE Operator = :ident";
 		$query_values = array(':ident' => $ident,':correct_ident' => $correct_ident, ':source' => $source);
 		try {
@@ -106,12 +106,12 @@ 
 		}
 	}
 
-    /**
-     * @param $ident
-     * @param bool $web
-     * @return string
-     */
-    public function checkTranslation($ident, $web = false) {
+	/**
+	 * @param $ident
+	 * @param bool $web
+	 * @return string
+	 */
+	public function checkTranslation($ident, $web = false) {
 		global $globalTranslationSources, $globalTranslationFetch;
 		//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
 		$globalTranslationSources = array();

require/class.Tracker.php

Indentation +268 added lines, -268 removed lines

@@ -20,13 +20,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (Tracker)');
 	}
 
-    /**
-     * Get SQL query part for filter used
-     * @param array $filter the filter
-     * @param bool $where
-     * @param bool $and
-     * @return string the SQL part
-     */
+	/**
+	 * Get SQL query part for filter used
+	 * @param array $filter the filter
+	 * @param bool $where
+	 * @param bool $and
+	 * @return string the SQL part
+	 */
 	
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
@@ -92,15 +92,15 @@ 
 		return $filter_query;
 	}
 
-    /**
-     * Executes the SQL statements to get the tracker information
-     *
-     * @param String $query the SQL query
-     * @param array $params parameter of the query
-     * @param String $limitQuery the limit query
-     * @param bool $schedules
-     * @return array the tracker information
-     */
+	/**
+	 * Executes the SQL statements to get the tracker information
+	 *
+	 * @param String $query the SQL query
+	 * @param array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @param bool $schedules
+	 * @return array the tracker information
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		date_default_timezone_set('UTC');
@@ -212,14 +212,14 @@ 
 	}
 
 
-    /**
-     * Gets all the tracker information based on the latest data entry
-     *
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the tracker information
-     */
+	/**
+	 * Gets all the tracker information based on the latest data entry
+	 *
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the tracker information
+	 */
 	public function getLatestTrackerData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query;
@@ -276,15 +276,15 @@ 
 		return $tracker_array;
 	}
 
-    /**
-     * Gets all the tracker information based on the callsign
-     *
-     * @param string $ident
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the tracker information
-     */
+	/**
+	 * Gets all the tracker information based on the callsign
+	 *
+	 * @param string $ident
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the tracker information
+	 */
 	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query;
@@ -393,13 +393,13 @@ 
 	}
 
 
-    /**
-     * Gets all source name
-     *
-     * @param String type format of source
-     * @param array $filters
-     * @return array list of source name
-     */
+	/**
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @param array $filters
+	 * @return array list of source name
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -428,12 +428,12 @@ 
 	}
 
 
-    /**
-     * Gets a list of all idents/callsigns
-     *
-     * @param array $filters
-     * @return array list of ident/callsign names
-     */
+	/**
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @param array $filters
+	 * @return array list of ident/callsign names
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -500,19 +500,19 @@ 
 	}
 
 
-    /**
-     * Update ident tracker data
-     *
-     * @param string $famtrackid
-     * @param String $ident the flight ident
-     * @param null $fromsource
-     * @return String success or false
-     */
+	/**
+	 * Update ident tracker data
+	 *
+	 * @param string $famtrackid
+	 * @param String $ident the flight ident
+	 * @param null $fromsource
+	 * @return String success or false
+	 */
 	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
 	{
 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
+				$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -525,22 +525,22 @@ 
 
 	}
 
-    /**
-     * Update latest tracker data
-     *
-     * @param string $famtrackid
-     * @param String $ident the flight ident
-     * @param string $latitude
-     * @param string $longitude
-     * @param string $altitude
-     * @param null $groundspeed
-     * @param string $date
-     * @return String success or false
-     */
+	/**
+	 * Update latest tracker data
+	 *
+	 * @param string $famtrackid
+	 * @param String $ident the flight ident
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @param string $altitude
+	 * @param null $groundspeed
+	 * @param string $date
+	 * @return String success or false
+	 */
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
 	{
 		$query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid';
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
+				$query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -553,23 +553,23 @@ 
 
 	}
 
-    /**
-     * Adds a new tracker data
-     *
-     * @param string $famtrackid
-     * @param String $ident the flight ident
-     * @param String $latitude latitude of flight
-     * @param String $longitude latitude of flight
-     * @param String $altitude altitude of flight
-     * @param String $heading heading of flight
-     * @param String $groundspeed speed of flight
-     * @param String $date date of flight
-     * @param string $comment
-     * @param string $type
-     * @param string $format_source
-     * @param string $source_name
-     * @return String success or false
-     */
+	/**
+	 * Adds a new tracker data
+	 *
+	 * @param string $famtrackid
+	 * @param String $ident the flight ident
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param string $comment
+	 * @param string $type
+	 * @param string $format_source
+	 * @param string $source_name
+	 * @return String success or false
+	 */
 	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
 	{
 		//$Image = new Image($this->db);
@@ -652,16 +652,16 @@ 
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
 	
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+				$query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
+				$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
 
 		try {
 		        
@@ -669,7 +669,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -677,12 +677,12 @@ 
 	}
 
 
-    /**
-     * Gets the aircraft ident within the last hour
-     *
-     * @param $ident
-     * @return String the ident
-     */
+	/**
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @param $ident
+	 * @return String the ident
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver;
@@ -698,11 +698,11 @@ 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -712,12 +712,12 @@ 
 	}
 
 
-    /**
-     * Gets the aircraft data from the last 20 seconds
-     *
-     * @param string $q
-     * @return array the tracker data
-     */
+	/**
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @param string $q
+	 * @return array the tracker data
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -750,15 +750,15 @@ 
 		return $tracker_array;
 	}
 
-    /**
-     * Gets all number of flight over countries
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @return array the airline country list
-     */
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @return array the airline country list
+	 */
 	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
@@ -827,18 +827,18 @@ 
 		return $flight_array;
 	}
 
-    /**
-     * Gets all callsigns that have flown over
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the callsign list
-     */
+	/**
+	 * Gets all callsigns that have flown over
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the callsign list
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -904,12 +904,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -954,12 +954,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates during the last 7 days
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last 7 days
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -981,7 +981,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1000,12 +1000,12 @@ 
 		return $date_array;
 	}
 
-    /**
-     * Counts all dates during the last month
-     *
-     * @param array $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last month
+	 *
+	 * @param array $filters
+	 * @return array the date list
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1027,7 +1027,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1047,12 +1047,12 @@ 
 	}
 
 
-    /**
-     * Counts all month
-     *
-     * @param array $filters
-     * @return array the month list
-     */
+	/**
+	 * Counts all month
+	 *
+	 * @param array $filters
+	 * @return array the month list
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1094,12 +1094,12 @@ 
 	}
 
 
-    /**
-     * Counts all dates during the last year
-     *
-     * @param $filters
-     * @return array the date list
-     */
+	/**
+	 * Counts all dates during the last year
+	 *
+	 * @param $filters
+	 * @return array the date list
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1121,7 +1121,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -1142,13 +1142,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours
-     *
-     * @param $orderby
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours
+	 *
+	 * @param $orderby
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1209,13 +1209,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours by date
-     *
-     * @param $date
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours by date
+	 *
+	 * @param $date
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1257,13 +1257,13 @@ 
 	}
 
 
-    /**
-     * Counts all hours by a ident/callsign
-     *
-     * @param $ident
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @param $ident
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1306,14 +1306,14 @@ 
 	}
 
 
-    /**
-     * Counts all trackers that have flown over
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer the number of trackers
-     */
+	/**
+	 * Counts all trackers that have flown over
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer the number of trackers
+	 */
 	public function countOverallTracker($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1347,14 +1347,14 @@ 
 		return $sth->fetchColumn();
 	}
 
-    /**
-     * Counts all trackers type that have flown over
-     *
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @return Integer the number of flights
-     */
+	/**
+	 * Counts all trackers type that have flown over
+	 *
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @return Integer the number of flights
+	 */
 	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -1388,12 +1388,12 @@ 
 	}
 
 
-    /**
-     * Counts all hours of today
-     *
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours of today
+	 *
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1433,12 +1433,12 @@ 
 	}
 
 
-    /**
-     * Gets the Barrie Spotter ID based on the FlightAware ID
-     *
-     * @param $famtrackid
-     * @return Integer the Barrie Spotter ID
-     */
+	/**
+	 * Gets the Barrie Spotter ID based on the FlightAware ID
+	 *
+	 * @param $famtrackid
+	 * @return Integer the Barrie Spotter ID
+	 */
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
 	{
 		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
@@ -1459,13 +1459,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -1498,12 +1498,12 @@ 
 	}
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -1582,12 +1582,12 @@ 
 	
 	
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDebug;
@@ -1615,11 +1615,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDebug;
@@ -1646,18 +1646,18 @@ 
 	
 	}
 
-    /**
-     * Gets all vessels types that have flown over
-     *
-     * @param bool $limit
-     * @param int $olderthanmonths
-     * @param string $sincedate
-     * @param array $filters
-     * @param string $year
-     * @param string $month
-     * @param string $day
-     * @return array the vessel type list
-     */
+	/**
+	 * Gets all vessels types that have flown over
+	 *
+	 * @param bool $limit
+	 * @param int $olderthanmonths
+	 * @param string $sincedate
+	 * @param array $filters
+	 * @param string $year
+	 * @param string $month
+	 * @param string $day
+	 * @return array the vessel type list
+	 */
 	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -1721,21 +1721,21 @@ 
 		return $tracker_array;
 	}
 
-    /**
-     * Gets all the tracker information
-     *
-     * @param string $q
-     * @param string $callsign
-     * @param string $date_posted
-     * @param string $limit
-     * @param string $sort
-     * @param string $includegeodata
-     * @param string $origLat
-     * @param string $origLon
-     * @param string $dist
-     * @param array $filters
-     * @return array the tracker information
-     */
+	/**
+	 * Gets all the tracker information
+	 *
+	 * @param string $q
+	 * @param string $callsign
+	 * @param string $date_posted
+	 * @param string $limit
+	 * @param string $sort
+	 * @param string $includegeodata
+	 * @param string $origLat
+	 * @param string $origLon
+	 * @param string $dist
+	 * @param array $filters
+	 * @return array the tracker information
+	 */
 	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1840,12 +1840,12 @@ 
 	}
 
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;

require/class.Accident.php

Indentation +16 added lines, -16 removed lines

@@ -36,12 +36,12 @@ 
 	}
 
 	/**
-	* Get Accidents data from DB
-	* @param String $limit Limit
-	* @param String $type Set type accident or incident
-	* @param String $date get data for a date
-	* @return array Return Accidents data in array
-	*/
+	 * Get Accidents data from DB
+	 * @param String $limit Limit
+	 * @param String $type Set type accident or incident
+	 * @param String $date get data for a date
+	 * @return array Return Accidents data in array
+	 */
 	public function getAccidentData($limit = '',$type = '',$date = '') {
 		global $globalDBdriver;
 		$Image = new Image($this->db);
@@ -384,11 +384,11 @@ 
 		return $row['nb'];
 	}
 
-    /**
-     * Check if lastest accident update date is older than 1 day
-     * @return bool|string
-     */
-    public static function check_last_accidents_update() {
+	/**
+	 * Check if lastest accident update date is older than 1 day
+	 * @return bool|string
+	 */
+	public static function check_last_accidents_update() {
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT COUNT(*) as nb FROM config WHERE name = 'last_update_accident_db' AND value > DATE_SUB(NOW(), INTERVAL 1 DAY)";
@@ -407,11 +407,11 @@ 
 		else return true;
 	}
 
-    /**
-     * Insert accident update date
-     * @return string
-     */
-    public static function insert_last_accidents_update() {
+	/**
+	 * Insert accident update date
+	 * @return string
+	 */
+	public static function insert_last_accidents_update() {
 		$query = "DELETE FROM config WHERE name = 'last_update_accident_db';
 		    INSERT INTO config (name,value) VALUES ('last_update_accident_db',NOW());";
 		try {

require/class.MarineLive.php

Indentation +229 added lines, -229 removed lines

@@ -20,13 +20,13 @@ 
 	}
 
 
-    /**
-     * Get SQL query part for filter used
-     * @param array $filter the filter
-     * @param bool $where
-     * @param bool $and
-     * @return string the SQL part
-     */
+	/**
+	 * Get SQL query part for filter used
+	 * @param array $filter the filter
+	 * @param bool $where
+	 * @param bool $and
+	 * @return string the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -105,14 +105,14 @@ 
 		return $filter_query;
 	}
 
-    /**
-     * Gets all the spotter information based on the latest data entry
-     *
-     * @param string $limit
-     * @param string $sort
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @param string $limit
+	 * @param string $sort
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getLiveMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -154,12 +154,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets Minimal Live Spotter data
-     *
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getMinLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -188,15 +188,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets Minimal Live Spotter data since xx seconds
-     *
-     * @param array $coord
-     * @param array $filter
-     * @param bool $limit
-     * @param string $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @param array $coord
+	 * @param array $filter
+	 * @param bool $limit
+	 * @param string $id
+	 * @return array the spotter information
+	 */
 	public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false, $id = '')
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -275,14 +275,14 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets Minimal Live Spotter data since xx seconds
-     *
-     * @param string $id
-     * @param array $filter
-     * @param bool $limit
-     * @return array the spotter information
-     */
+	/**
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @param string $id
+	 * @param array $filter
+	 * @param bool $limit
+	 * @return array the spotter information
+	 */
 	public function getMinLastLiveMarineDataByID($id = '',$filter = array(), $limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -341,12 +341,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets number of latest data entry
-     *
-     * @param array $filter
-     * @return String number of entry
-     */
+	/**
+	 * Gets number of latest data entry
+	 *
+	 * @param array $filter
+	 * @return String number of entry
+	 */
 	public function getLiveMarineCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -370,13 +370,13 @@ 
 		return $result['nb'];
 	}
 
-    /**
-     * Gets all the spotter information based on the latest data entry and coord
-     *
-     * @param $coord
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @param $coord
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -399,13 +399,13 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on the latest data entry and coord
-     *
-     * @param $coord
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @param $coord
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getMinLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -473,15 +473,15 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on a user's latitude and longitude
-     *
-     * @param $lat
-     * @param $lng
-     * @param $radius
-     * @param $interval
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @param $lat
+	 * @param $lng
+	 * @param $radius
+	 * @param $interval
+	 * @return array the spotter information
+	 */
 	public function getLatestMarineForLayar($lat, $lng, $radius, $interval)
 	{
 		$Marine = new Marine($this->db);
@@ -538,32 +538,32 @@ 
 	}
 
 
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
 	public function getLastLiveMarineDataByIdent($ident)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on a particular callsign
-     *
-     * @param $ident
-     * @param $date
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @param $date
+	 * @return array the spotter information
+	 */
 	public function getDateLiveMarineDataByIdent($ident,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -575,13 +575,13 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on a particular MMSI
-     *
-     * @param $mmsi
-     * @param $date
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular MMSI
+	 *
+	 * @param $mmsi
+	 * @param $date
+	 * @return array the spotter information
+	 */
 	public function getDateLiveMarineDataByMMSI($mmsi,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -593,53 +593,53 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets last spotter information based on a particular callsign
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getLastLiveMarineDataById($id)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets last spotter information based on a particular callsign
-     *
-     * @param $id
-     * @param $date
-     * @return array the spotter information
-     */
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @param $id
+	 * @param $date
+	 * @return array the spotter information
+	 */
 	public function getDateLiveMarineDataById($id,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
 
-    /**
-     * Gets all the spotter information based on a particular id
-     *
-     * @param $id
-     * @param bool $liveinterval
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @param bool $liveinterval
+	 * @return array the spotter information
+	 */
 	public function getAllLiveMarineDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -667,18 +667,18 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on a particular ident
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular ident
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
 	public function getAllLiveMarineDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -692,23 +692,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date";
 			$query  = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date';
-            		//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
+					//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
 		} else {
 			$query  = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -720,18 +720,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -739,8 +739,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -748,20 +748,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['fammarine_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -772,9 +772,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -818,18 +818,18 @@ 
 		return 'error';
 	}
 
-    /**
-     * Deletes all info in the table for an ident
-     *
-     * @param $ident
-     * @return String success or false
-     */
+	/**
+	 * Deletes all info in the table for an ident
+	 *
+	 * @param $ident
+	 * @return String success or false
+	 */
 	public function deleteLiveMarineDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -840,18 +840,18 @@ 
 		return "success";
 	}
 
-    /**
-     * Deletes all info in the table for an id
-     *
-     * @param $id
-     * @return String success or false
-     */
+	/**
+	 * Deletes all info in the table for an id
+	 *
+	 * @param $id
+	 * @return String success or false
+	 */
 	public function deleteLiveMarineDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -864,11 +864,11 @@ 
 
 
 	/**
-	* Gets the marine races
-	*
-	* @return array all races
-	*
-	*/
+	 * Gets the marine races
+	 *
+	 * @return array all races
+	 *
+	 */
 	public function getAllRaces()
 	{
 		$query  = 'SELECT DISTINCT marine_live.race_id, marine_live.race_name FROM marine_live ORDER BY marine_live.race_name';
@@ -877,12 +877,12 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets the aircraft ident within the last hour
-     *
-     * @param $ident
-     * @return String the ident
-     */
+	/**
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @param $ident
+	 * @return String the ident
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver;
@@ -908,14 +908,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
-
-    /**
-     * Check recent aircraft
-     *
-     * @param $ident
-     * @return String the ident
-     */
+		}
+
+	/**
+	 * Check recent aircraft
+	 *
+	 * @param $ident
+	 * @return String the ident
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver;
@@ -941,14 +941,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
-
-    /**
-     * Check recent aircraft by id
-     *
-     * @param $id
-     * @return String the ident
-     */
+		}
+
+	/**
+	 * Check recent aircraft by id
+	 *
+	 * @param $id
+	 * @return String the ident
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver;
@@ -974,14 +974,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
-
-    /**
-     * Check recent aircraft by mmsi
-     *
-     * @param $mmsi
-     * @return String the ident
-     */
+		}
+
+	/**
+	 * Check recent aircraft by mmsi
+	 *
+	 * @param $mmsi
+	 * @return String the ident
+	 */
 	public function checkMMSIRecent($mmsi)
 	{
 		global $globalDBdriver;
@@ -1007,41 +1007,41 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
-
-    /**
-     * Adds a new spotter data
-     *
-     * @param String $fammarine_id the ID from flightaware
-     * @param String $ident the flight ident
-     * @param string $latitude
-     * @param string $longitude
-     * @param string $heading
-     * @param string $groundspeed
-     * @param string $date
-     * @param bool $putinarchive
-     * @param string $mmsi
-     * @param string $type
-     * @param string $typeid
-     * @param string $imo
-     * @param string $callsign
-     * @param string $arrival_code
-     * @param string $arrival_date
-     * @param string $status
-     * @param string $statusid
-     * @param bool $noarchive
-     * @param string $format_source
-     * @param string $source_name
-     * @param string $over_country
-     * @param string $captain_id
-     * @param string $captain_name
-     * @param string $race_id
-     * @param string $race_name
-     * @param string $distance
-     * @param string $race_rank
-     * @param string $race_time
-     * @return String success or false
-     */
+		}
+
+	/**
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @param string $heading
+	 * @param string $groundspeed
+	 * @param string $date
+	 * @param bool $putinarchive
+	 * @param string $mmsi
+	 * @param string $type
+	 * @param string $typeid
+	 * @param string $imo
+	 * @param string $callsign
+	 * @param string $arrival_code
+	 * @param string $arrival_date
+	 * @param string $status
+	 * @param string $statusid
+	 * @param bool $noarchive
+	 * @param string $format_source
+	 * @param string $source_name
+	 * @param string $over_country
+	 * @param string $captain_id
+	 * @param string $captain_name
+	 * @param string $race_id
+	 * @param string $race_name
+	 * @param string $distance
+	 * @param string $race_rank
+	 * @param string $race_time
+	 * @return String success or false
+	 */
 	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '',$captain_id = '',$captain_name = '',$race_id = '', $race_name = '', $distance = '', $race_rank = '', $race_time = '')
 	{
 		global $globalArchive, $globalDebug;
@@ -1123,10 +1123,10 @@ 
 		if ($statusid == '') $statusid = NULL;
 		if ($distance == '') $distance = NULL;
 
-            	//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
-            	$query = '';
+				//if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
+				$query = '';
 		if ($globalArchive) {
 			if ($globalDebug) echo '-- Delete previous data -- ';
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';