Ysurac / FlightAirMap

require/class.SpotterArchive.php

Indentation +266 added lines, -266 removed lines

@@ -9,13 +9,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (SpotterArchive)');
 	}
 
-    /**
-     * 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();
@@ -160,12 +160,12 @@ 
 	}
 
 
-    /**
-     * 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 getLastArchiveSpotterDataByIdent($ident) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -180,12 +180,12 @@ 
 	}
 
 
-    /**
-     * Gets last the spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets last the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getLastArchiveSpotterDataById($id) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -210,12 +210,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets all the spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getAllArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -235,12 +235,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets coordinate & time spotter information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getCoordArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -256,14 +256,14 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets coordinate & time spotter information based on a particular id
-     *
-     * @param $id
-     * @param $begindate
-     * @param $enddate
-     * @return array the spotter information
-     */
+	/**
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @param $id
+	 * @param $begindate
+	 * @param $enddate
+	 * @return array the spotter information
+	 */
 	public function getCoordArchiveSpotterDataByIdDate($id,$begindate,$enddate) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -280,12 +280,12 @@ 
 	}
 
 
-    /**
-     * Gets altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
+	/**
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
 	public function getAltitudeArchiveSpotterDataByIdent($ident) {
 
 		date_default_timezone_set('UTC');
@@ -305,12 +305,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets altitude information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets altitude information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getAltitudeArchiveSpotterDataById($id) {
 
 		date_default_timezone_set('UTC');
@@ -330,12 +330,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets altitude & speed information based on a particular id
-     *
-     * @param $id
-     * @return array the spotter information
-     */
+	/**
+	 * Gets altitude & speed information based on a particular id
+	 *
+	 * @param $id
+	 * @return array the spotter information
+	 */
 	public function getAltitudeSpeedArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -351,12 +351,12 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets altitude information based on a particular callsign
-     *
-     * @param $ident
-     * @return array the spotter information
-     */
+	/**
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @param $ident
+	 * @return array the spotter information
+	 */
 	public function getLastAltitudeArchiveSpotterDataByIdent($ident) {
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -374,14 +374,14 @@ 
 	}
 
 
-    /**
-     * Gets all the archive spotter information
-     *
-     * @param $ident
-     * @param $flightaware_id
-     * @param $date
-     * @return array the spotter information
-     */
+	/**
+	 * Gets all the archive spotter information
+	 *
+	 * @param $ident
+	 * @param $flightaware_id
+	 * @param $date
+	 * @return array the spotter information
+	 */
 	public function getSpotterArchiveData($ident,$flightaware_id,$date) {
 		$Spotter = new Spotter($this->db);
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -406,11 +406,11 @@ 
 		}
 	}
 
-    /**
-     * Delete row in spotter_archive table based on flightaware_id
-     * @param $id flightaware_id
-     */
-    public function deleteSpotterArchiveTrackDataByID($id) {
+	/**
+	 * Delete row in spotter_archive table based on flightaware_id
+	 * @param $id flightaware_id
+	 */
+	public function deleteSpotterArchiveTrackDataByID($id) {
 		global $globalArchiveKeepTrackMonths, $globalDBdriver;
 		$query = 'DELETE FROM spotter_archive WHERE spotter_archive.flightaware_id = :id';
 		try {
@@ -422,15 +422,15 @@ 
 		}
 	}
 
-    /**
-     * Gets Minimal Live Spotter data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @param int $part
-     * @return array the spotter information
-     */
+	/**
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @param int $part
+	 * @return array the spotter information
+	 */
 	public function getMinLiveSpotterData($begindate,$enddate,$filter = array(),$part = 0) {
 		global $globalDBdriver;
 		date_default_timezone_set('UTC');
@@ -481,14 +481,14 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets Minimal Live Spotter data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver;
 		date_default_timezone_set('UTC');
@@ -554,14 +554,14 @@ 
 		return $spotter_array;
 	}
 
-    /**
-     * Gets count Live Spotter data
-     *
-     * @param $begindate
-     * @param $enddate
-     * @param array $filter
-     * @return array the spotter information
-     */
+	/**
+	 * Gets count Live Spotter data
+	 *
+	 * @param $begindate
+	 * @param $enddate
+	 * @param array $filter
+	 * @return array the spotter information
+	 */
 	public function getLiveSpotterCount($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -606,36 +606,36 @@ 
 
 	// Spotter_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
-     */
+	/**
+	 * 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 searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) {
 		global $globalTimezone, $globalDBdriver;
 		require_once(dirname(__FILE__).'/class.Translation.php');
@@ -927,14 +927,14 @@ 
 		}
 	}
 
-    /**
-     * Gets all the spotter information based on the callsign
-     *
-     * @param string $ident
-     * @param string $limit
-     * @param string $sort
-     * @return array the spotter information
-     */
+	/**
+	 * 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 getSpotterDataByIdent($ident = '', $limit = '', $sort = '') {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -981,15 +981,15 @@ 
 	}
 
 
-    /**
-     * 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
-     */
+	/**
+	 * 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 getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -1036,15 +1036,15 @@ 
 		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
-     */
+	/**
+	 * 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 getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -1087,14 +1087,14 @@ 
 		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
-     */
+	/**
+	 * 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;
 		/*
@@ -1133,14 +1133,14 @@ 
 		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
-     */
+	/**
+	 * 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;
 		/*
@@ -1180,13 +1180,13 @@ 
 		return $flight_array;
 	}
 
-    /**
-     * Gets all aircraft types that have flown over by owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the aircraft list
-     */
+	/**
+	 * Gets all aircraft types that have flown over by owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the aircraft list
+	 */
 	public function countAllAircraftTypesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1202,13 +1202,13 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all airlines by owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the airline list
-     */
+	/**
+	 * Gets all airlines by owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the airline list
+	 */
 	public function countAllAirlinesByOwner($owner,$filters = array())
 	{
 		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
@@ -1223,13 +1223,13 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all arrival airports by country of the airplanes that have flown over based on a owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the airport list
-     */
+	/**
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the airport list
+	 */
 	public function countAllArrivalAirportCountriesByOwner($owner, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1243,13 +1243,13 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all arrival airports of the airplanes that have flown over based on a owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the airport list
-     */
+	/**
+	 * Gets all arrival airports of the airplanes that have flown over based on a owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the airport list
+	 */
 	public function countAllArrivalAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1274,13 +1274,13 @@ 
 		return $airport_array;
 	}
 
-    /**
-     * Gets all departure airports by country of the airplanes that have flown over based on owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the airport list
-     */
+	/**
+	 * Gets all departure airports by country of the airplanes that have flown over based on owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the airport list
+	 */
 	public function countAllDepartureAirportCountriesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1294,13 +1294,13 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all departure airports of the airplanes that have flown over based on a owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the airport list
-     */
+	/**
+	 * Gets all departure airports of the airplanes that have flown over based on a owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the airport list
+	 */
 	public function countAllDepartureAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1327,13 +1327,13 @@ 
 		return $airport_array;
 	}
 
-    /**
-     * Gets all aircraft manufacturer that have flown over by owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the aircraft manufacturer list
-     */
+	/**
+	 * Gets all aircraft manufacturer that have flown over by owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the aircraft manufacturer list
+	 */
 	public function countAllAircraftManufacturerByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1349,13 +1349,13 @@ 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 	}
 
-    /**
-     * Gets all aircraft registration that have flown over by owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the aircraft list
-     */
+	/**
+	 * Gets all aircraft registration that have flown over by owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the aircraft list
+	 */
 	public function countAllAircraftRegistrationByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1391,13 +1391,13 @@ 
 		return $aircraft_array;
 	}
 
-    /**
-     * Gets all route combinations based on an owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the route list
-     */
+	/**
+	 * Gets all route combinations based on an owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the route list
+	 */
 	public function countAllRoutesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -1426,13 +1426,13 @@ 
 		return $routes_array;
 	}
 
-    /**
-     * Counts all hours by a owner
-     *
-     * @param $owner
-     * @param array $filters
-     * @return array the hour list
-     */
+	/**
+	 * Counts all hours by a owner
+	 *
+	 * @param $owner
+	 * @param array $filters
+	 * @return array the hour list
+	 */
 	public function countAllHoursByOwner($owner, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -1467,13 +1467,13 @@ 
 		return $hour_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 getDateArchiveSpotterDataById($id,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1484,13 +1484,13 @@ 
 		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 getDateArchiveSpotterDataByIdent($ident,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1501,15 +1501,15 @@ 
 		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
-     */
+	/**
+	 * 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 getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) {
 		global $global_query;
 		$Spotter = new Spotter($this->db);

Spacing +169 added lines, -169 removed lines

@@ -16,75 +16,75 @@ 
      * @param bool $and
      * @return string the SQL part
      */
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '' && $flt['airlines'][0] != 'all') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 					} else {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 					}
 				}
 			}
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if (isset($flt['registrations']) && !empty($flt['registrations'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
 			if ($filter['airlines'][0] != '' && $filter['airlines'][0] != 'all') {
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
 			}
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
 		}
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			if (count($filter['source']) == 1) {
 				$filter_query_where .= " AND format_source = '".$filter['source'][0]."'";
 			} else {
-				$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+				$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 			}
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
@@ -94,7 +94,7 @@ 
 			$filter_query_where .= " AND flightaware_id = '".$filter['id']."'";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
 			$filter_query_date = '';
@@ -119,41 +119,41 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
 
 	// Spotter_archive
-	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
+	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Spotter.php');
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
-			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+		if ($airline_type === NULL) $airline_type = '';
 
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
 
 		// Route is not added in spotter_archive
-		$query  = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude)
+		$query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude)
 		          VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)";
 
-		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude);
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -172,9 +172,9 @@ 
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-		$query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+		$query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident));
 
 		return $spotter_array;
 	}
@@ -192,7 +192,7 @@ 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		//$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
 		//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-		$query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
+		$query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 		/*
@@ -205,7 +205,7 @@ 
 		}
 		$spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
 		*/
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id));
 
 		return $spotter_array;
 	}
@@ -219,14 +219,14 @@ 
 	public function getAllArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+		$query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -244,11 +244,11 @@ 
 	public function getCoordArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC";
+		$query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -264,14 +264,14 @@ 
      * @param $enddate
      * @return array the spotter information
      */
-	public function getCoordArchiveSpotterDataByIdDate($id,$begindate,$enddate) {
+	public function getCoordArchiveSpotterDataByIdDate($id, $begindate, $enddate) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.date BETWEEN :begindate AND :enddate ORDER by spotter_archive.date ASC";
+		$query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.date BETWEEN :begindate AND :enddate ORDER by spotter_archive.date ASC";
 		try {
 			$sth = $this->db->prepare($query);
-			$sth->execute(array(':id' => $id,':begindate' => $begindate,':enddate' => $enddate));
-		} catch(PDOException $e) {
+			$sth->execute(array(':id' => $id, ':begindate' => $begindate, ':enddate' => $enddate));
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -291,12 +291,12 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -316,12 +316,12 @@ 
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -339,11 +339,11 @@ 
 	public function getAltitudeSpeedArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -360,12 +360,12 @@ 
 	public function getLastAltitudeArchiveSpotterDataByIdent($ident) {
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -382,11 +382,11 @@ 
      * @param $date
      * @return array the spotter information
      */
-	public function getSpotterArchiveData($ident,$flightaware_id,$date) {
+	public function getSpotterArchiveData($ident, $flightaware_id, $date) {
 		$Spotter = new Spotter($this->db);
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
+		$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%'));
 		return $spotter_array;
 	}
 
@@ -400,7 +400,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -416,7 +416,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -431,39 +431,39 @@ 
      * @param int $part
      * @return array the spotter information
      */
-	public function getMinLiveSpotterData($begindate,$enddate,$filter = array(),$part = 0) {
+	public function getMinLiveSpotterData($begindate, $enddate, $filter = array(), $part = 0) {
 		global $globalDBdriver;
 		date_default_timezone_set('UTC');
 		//$filter_query = $this->getFilter($filter,true,true);
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		// Use spotter_output also ?
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 		$limit = '';
 		if ($part != 0) {
-			$limit = ' LIMIT 100 OFFSET '.($part-1)*100;
+			$limit = ' LIMIT 100 OFFSET '.($part - 1)*100;
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
+			$query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
 			          FROM spotter_archive
 			          INNER JOIN aircraft a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".'
 			          '.$filter_query.' ORDER BY flightaware_id'.$limit;
 		} else {
 			
-			$query  = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
+			$query = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
 			          FROM spotter_archive
 			          INNER JOIN aircraft a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".'
@@ -473,7 +473,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -489,7 +489,7 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
+	public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver;
 		date_default_timezone_set('UTC');
 
@@ -497,17 +497,17 @@ 
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		// Use spotter_output also ?
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 
@@ -518,7 +518,7 @@ 
 				    FROM spotter_archive
 				    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk
+			$query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk
 			          FROM spotter_archive_output
 			          LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao
 			          WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".')
@@ -533,7 +533,7 @@ 
 			 	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
 			 	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
 			 */
-			$query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
+			$query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
 			          FROM spotter_archive_output
 			          INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
 			          WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
@@ -545,7 +545,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -562,22 +562,22 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-	public function getLiveSpotterCount($begindate,$enddate,$filter = array()) {
+	public function getLiveSpotterCount($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 		//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -592,7 +592,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -636,7 +636,7 @@ 
      * @param array $filters
      * @return array the spotter information
      */
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) {
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
 		require_once(dirname(__FILE__).'/class.Translation.php');
 		$Translation = new Translation($this->db);
@@ -686,7 +686,7 @@ 
 		}
 
 		if ($registration != "") {
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 			if (!is_string($registration)) {
 				return array();
 			} else {
@@ -695,7 +695,7 @@ 
 		}
 
 		if ($aircraft_icao != "") {
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_icao)) {
 				return array();
 			} else {
@@ -704,7 +704,7 @@ 
 		}
 
 		if ($aircraft_manufacturer != "") {
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_manufacturer)) {
 				return array();
 			} else {
@@ -721,7 +721,7 @@ 
 		}
 
 		if ($airline_icao != "") {
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_icao)) {
 				return array();
 			} else {
@@ -730,7 +730,7 @@ 
 		}
 
 		if ($airline_country != "") {
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_country)) {
 				return array();
 			} else {
@@ -739,7 +739,7 @@ 
 		}
 
 		if ($airline_type != "") {
-			$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+			$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_type)) {
 				return array();
 			} else {
@@ -756,7 +756,7 @@ 
 		}
 
 		if ($airport != "") {
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
 			if (!is_string($airport)) {
 				return array();
 			} else {
@@ -765,7 +765,7 @@ 
 		}
 
 		if ($airport_country != "") {
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airport_country)) {
 				return array();
 			} else {
@@ -774,14 +774,14 @@ 
 		}
 
 		if ($callsign != "") {
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign)) {
 				return array();
 			} else {
 				$translate = $Translation->ident2icao($callsign);
 				if ($translate != $callsign) {
 					$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 				} else {
 					$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
 				}
@@ -789,7 +789,7 @@ 
 		}
 
 		if ($owner != "") {
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 			if (!is_string($owner)) {
 				return array();
 			} else {
@@ -798,7 +798,7 @@ 
 		}
 
 		if ($pilot_name != "") {
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 			if (!is_string($pilot_name)) {
 				return array();
 			} else {
@@ -807,7 +807,7 @@ 
 		}
 
 		if ($pilot_id != "") {
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 			if (!is_string($pilot_id)) {
 				return array();
 			} else {
@@ -816,7 +816,7 @@ 
 		}
 
 		if ($departure_airport_route != "") {
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($departure_airport_route)) {
 				return array();
 			} else {
@@ -825,7 +825,7 @@ 
 		}
 
 		if ($arrival_airport_route != "") {
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($arrival_airport_route)) {
 				return array();
 			} else {
@@ -836,8 +836,8 @@ 
 		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] != "") {
@@ -852,8 +852,8 @@ 
 
 		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();
@@ -878,16 +878,16 @@ 
 		}
 		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 ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.','');
-			$query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
+			$dist = number_format($dist*0.621371, 2, '.', '');
+			$query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
 			       FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
 			       AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 		} else {
@@ -901,12 +901,12 @@ 
 				$additional_query .= " AND (spotter_archive_output.waypoints <> '')";
 			}
 
-			$query  = "SELECT spotter_archive_output.* FROM spotter_archive_output
+			$query = "SELECT spotter_archive_output.* FROM spotter_archive_output
 			          WHERE spotter_archive_output.ident <> ''
 			          ".$additional_query."
 			          ".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
+		$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 		return $spotter_array;
 	}
 
@@ -922,7 +922,7 @@ 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 			return '';
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 	}
@@ -957,8 +957,8 @@ 
 		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];
@@ -999,7 +999,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if ($owner != "") {
 			if (!is_string($owner)) {
@@ -1013,8 +1013,8 @@ 
 		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_array[0] != '' && $limit_array[1] != '') {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -1054,7 +1054,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if ($pilot != "") {
 			$additional_query = " AND (spotter_archive_output.pilot_id = :pilot OR spotter_archive_output.pilot_name = :pilot)";
@@ -1064,8 +1064,8 @@ 
 		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];
@@ -1095,7 +1095,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1123,7 +1123,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$temp_array['flight_count'] = $row['nb'];
 			$temp_array['flight_country'] = $row['name'];
 			$temp_array['flight_country_iso3'] = $row['iso3'];
@@ -1141,7 +1141,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1169,7 +1169,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$temp_array['airline_icao'] = $row['airline_icao'];
 			$temp_array['flight_count'] = $row['nb'];
 			$temp_array['flight_country'] = $row['name'];
@@ -1187,16 +1187,16 @@ 
      * @param array $filters
      * @return array the aircraft list
      */
-	public function countAllAircraftTypesByOwner($owner,$filters = array())
+	public function countAllAircraftTypesByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 		$query  = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.aircraft_icao) AS aircraft_icao_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer 
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner";
 		$query_values = array();
 		$query .= " GROUP BY spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.aircraft_icao
 		    ORDER BY aircraft_icao_count DESC";
-		$query_values = array_merge($query_values,array(':owner' => $owner));
+		$query_values = array_merge($query_values, array(':owner' => $owner));
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1209,11 +1209,11 @@ 
      * @param array $filters
      * @return array the airline list
      */
-	public function countAllAirlinesByOwner($owner,$filters = array())
+	public function countAllAirlinesByOwner($owner, $filters = array())
 	{
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_archive_output.airline_name, spotter_archive_output.airline_icao, spotter_archive_output.airline_country, COUNT(spotter_archive_output.airline_name) AS airline_count
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_archive_output.airline_name, spotter_archive_output.airline_icao, spotter_archive_output.airline_country, COUNT(spotter_archive_output.airline_name) AS airline_count
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner  
 		    GROUP BY spotter_archive_output.airline_icao, spotter_archive_output.airline_name, spotter_archive_output.airline_country
 		    ORDER BY airline_count DESC";
@@ -1232,9 +1232,9 @@ 
      */
 	public function countAllArrivalAirportCountriesByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.arrival_airport_country, COUNT(spotter_archive_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.arrival_airport_country, COUNT(spotter_archive_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
 		    FROM countries, spotter_archive_output".$filter_query." spotter_archive_output.arrival_airport_country <> '' AND spotter_archive_output.owner_name = :owner AND countries.name = spotter_archive_output.arrival_airport_country 
 		    GROUP BY spotter_archive_output.arrival_airport_country, countries.iso3
 		    ORDER BY airport_arrival_country_count DESC";
@@ -1250,11 +1250,11 @@ 
      * @param array $filters
      * @return array the airport list
      */
-	public function countAllArrivalAirportsByOwner($owner,$filters = array())
+	public function countAllArrivalAirportsByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.arrival_airport_icao, COUNT(spotter_archive_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.arrival_airport_icao, COUNT(spotter_archive_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country 
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.arrival_airport_name <> '' AND spotter_archive_output.arrival_airport_icao <> 'NA' AND spotter_archive_output.arrival_airport_icao <> '' AND spotter_archive_output.owner_name = :owner 
 		    GROUP BY spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -1262,7 +1262,7 @@ 
 		$sth->execute(array(':owner' => $owner));
 		$airport_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_arrival_icao'] = $row['arrival_airport_icao'];
 			$temp_array['airport_arrival_icao_count'] = $row['airport_arrival_icao_count'];
@@ -1281,11 +1281,11 @@ 
      * @param array $filters
      * @return array the airport list
      */
-	public function countAllDepartureAirportCountriesByOwner($owner,$filters = array())
+	public function countAllDepartureAirportCountriesByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.departure_airport_country, COUNT(spotter_archive_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.departure_airport_country, COUNT(spotter_archive_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3
 		    FROM spotter_archive_output,countries".$filter_query." spotter_archive_output.departure_airport_country <> '' AND spotter_archive_output.owner_name = :owner  AND countries.name = spotter_archive_output.departure_airport_country 
 		    GROUP BY spotter_archive_output.departure_airport_country, countries.iso3
 		    ORDER BY airport_departure_country_count DESC";
@@ -1301,11 +1301,11 @@ 
      * @param array $filters
      * @return array the airport list
      */
-	public function countAllDepartureAirportsByOwner($owner,$filters = array())
+	public function countAllDepartureAirportsByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.departure_airport_icao, COUNT(spotter_archive_output.departure_airport_icao) AS airport_departure_icao_count, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.departure_airport_icao, COUNT(spotter_archive_output.departure_airport_icao) AS airport_departure_icao_count, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude 
 		    FROM spotter_archive_output,airport".$filter_query." spotter_archive_output.departure_airport_name <> '' AND spotter_archive_output.departure_airport_icao <> 'NA' AND spotter_archive_output.departure_airport_icao <> '' AND spotter_archive_output.owner_name = :owner AND airport.icao = spotter_archive_output.departure_airport_icao 
 		    GROUP BY spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, airport.latitude, airport.longitude
 		    ORDER BY airport_departure_icao_count DESC";
@@ -1313,7 +1313,7 @@ 
 		$sth->execute(array(':owner' => $owner));
 		$airport_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
 			$temp_array['airport_departure_icao_count'] = $row['airport_departure_icao_count'];
@@ -1334,14 +1334,14 @@ 
      * @param array $filters
      * @return array the aircraft manufacturer list
      */
-	public function countAllAircraftManufacturerByOwner($owner,$filters = array())
+	public function countAllAircraftManufacturerByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.aircraft_manufacturer, COUNT(spotter_archive_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.aircraft_manufacturer, COUNT(spotter_archive_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.aircraft_manufacturer <> '' AND spotter_archive_output.owner_name = :owner";
 		$query_values = array();
-		$query_values = array_merge($query_values,array(':owner' => $owner));
+		$query_values = array_merge($query_values, array(':owner' => $owner));
 		$query .= " GROUP BY spotter_archive_output.aircraft_manufacturer 
 		    ORDER BY aircraft_manufacturer_count DESC";
 		$sth = $this->db->prepare($query);
@@ -1356,22 +1356,22 @@ 
      * @param array $filters
      * @return array the aircraft list
      */
-	public function countAllAircraftRegistrationByOwner($owner,$filters = array())
+	public function countAllAircraftRegistrationByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.registration) AS registration_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.registration, spotter_archive_output.airline_name  
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_archive_output.aircraft_icao, COUNT(spotter_archive_output.registration) AS registration_count, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.registration, spotter_archive_output.airline_name  
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.registration <> '' AND spotter_archive_output.owner_name = :owner";
 		$query_values = array();
-		$query_values = array_merge($query_values,array(':owner' => $owner));
+		$query_values = array_merge($query_values, array(':owner' => $owner));
 		$query .= " GROUP BY spotter_archive_output.registration,spotter_archive_output.aircraft_icao, spotter_archive_output.aircraft_name, spotter_archive_output.aircraft_manufacturer, spotter_archive_output.airline_name
 		    ORDER BY registration_count DESC";
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$aircraft_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_icao'] = $row['aircraft_icao'];
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
@@ -1379,7 +1379,7 @@ 
 			$temp_array['registration'] = $row['registration'];
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['image_thumbnail'] = "";
-			if($row['registration'] != "")
+			if ($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
 				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -1398,11 +1398,11 @@ 
      * @param array $filters
      * @return array the route list
      */
-	public function countAllRoutesByOwner($owner,$filters = array())
+	public function countAllRoutesByOwner($owner, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_archive_output.departure_airport_icao, ' - ',  spotter_archive_output.arrival_airport_icao) AS route, count(concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao)) AS route_count, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name AS airport_departure_name, spotter_archive_output.departure_airport_city AS airport_departure_city, spotter_archive_output.departure_airport_country AS airport_departure_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name AS airport_arrival_name, spotter_archive_output.arrival_airport_city AS airport_arrival_city, spotter_archive_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_archive_output.departure_airport_icao, ' - ',  spotter_archive_output.arrival_airport_icao) AS route, count(concat(spotter_archive_output.departure_airport_icao, ' - ', spotter_archive_output.arrival_airport_icao)) AS route_count, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name AS airport_departure_name, spotter_archive_output.departure_airport_city AS airport_departure_city, spotter_archive_output.departure_airport_country AS airport_departure_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name AS airport_arrival_name, spotter_archive_output.arrival_airport_city AS airport_arrival_city, spotter_archive_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_archive_output".$filter_query." spotter_archive_output.ident <> '' AND spotter_archive_output.owner_name = :owner 
 		    GROUP BY route, spotter_archive_output.departure_airport_icao, spotter_archive_output.departure_airport_name, spotter_archive_output.departure_airport_city, spotter_archive_output.departure_airport_country, spotter_archive_output.arrival_airport_icao, spotter_archive_output.arrival_airport_name, spotter_archive_output.arrival_airport_city, spotter_archive_output.arrival_airport_country
 		    ORDER BY route_count DESC";
@@ -1410,7 +1410,7 @@ 
 		$sth->execute(array(':owner' => $owner));
 		$routes_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['route_count'] = $row['route_count'];
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -1436,8 +1436,8 @@ 
 	public function countAllHoursByOwner($owner, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1449,16 +1449,16 @@ 
 			    GROUP BY hour_name 
 			    ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_archive_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_archive_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 			    FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner 
 			    GROUP BY hour_name 
 			    ORDER BY hour_name ASC";
 		}
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':owner' => $owner,':offset' => $offset));
+		$sth->execute(array(':owner' => $owner, ':offset' => $offset));
 		$hour_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1474,13 +1474,13 @@ 
      * @param $date
      * @return array the spotter information
      */
-	public function getDateArchiveSpotterDataById($id,$date) {
+	public function getDateArchiveSpotterDataById($id, $date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-		$date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
+		$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+		$date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 		return $spotter_array;
 	}
 
@@ -1491,13 +1491,13 @@ 
      * @param $date
      * @return array the spotter information
      */
-	public function getDateArchiveSpotterDataByIdent($ident,$date) {
+	public function getDateArchiveSpotterDataByIdent($ident, $date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-		$date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+		$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+		$date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 		return $spotter_array;
 	}
 
@@ -1510,14 +1510,14 @@ 
      * @param array $filters
      * @return array the spotter information
      */
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) {
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) {
 		global $global_query;
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 
 		if ($airport != "") {
 			if (!is_string($airport)) {
@@ -1531,8 +1531,8 @@ 
 		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];

Braces +48 added lines, -17 removed lines

@@ -6,7 +6,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (SpotterArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (SpotterArchive)');
+		}
 	}
 
     /**
@@ -29,7 +31,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -121,8 +125,11 @@ 
 			}
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -136,10 +143,17 @@ 
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
+		if ($airline_type === NULL) {
+			$airline_type ='';
+		}
 
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -678,7 +692,9 @@ 
 					$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
 					$translate = $Translation->ident2icao($q_item);
-					if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+					if ($translate != $q_item) {
+						$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+					}
 					$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
 					$additional_query .= ")";
 				}
@@ -858,7 +874,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} 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]));
@@ -1112,9 +1130,13 @@ 
 				$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";
+		if ($limit) {
+			$query .= " LIMIT 0,10";
+		}
 
 
 		$sth = $this->db->prepare($query);
@@ -1158,9 +1180,13 @@ 
 				$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";
+		if ($limit) {
+			$query .= " LIMIT 0,10";
+		}
 
 
 		$sth = $this->db->prepare($query);
@@ -1382,8 +1408,11 @@ 
 			if($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
-				else $temp_array['image_thumbnail'] = '';
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				} else {
+					$temp_array['image_thumbnail'] = '';
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -1442,7 +1471,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_archive_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 			    FROM spotter_archive_output".$filter_query." spotter_archive_output.owner_name = :owner 

require/class.ATC.php

Indentation +8 added lines, -8 removed lines

@@ -21,13 +21,13 @@ 
 		if ($this->db === null) die('Error: No DB connection. (ATC)');
 	}
 
-    /**
-     * 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;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
@@ -55,7 +55,7 @@ 
 	 * Get all ATC from atc table
 	 * @return array Return all ATC
      */
-    public function getAll() {
+	public function getAll() {
 		$filter_query = $this->getFilter(array());
 		$query = "SELECT * FROM atc".$filter_query;
 		$query_values = array();

Braces +20 added lines, -7 removed lines

@@ -18,7 +18,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (ATC)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ATC)');
+		}
 	}
 
     /**
@@ -33,20 +35,27 @@ 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
+					if (isset($source['source'])) {
+						$filter['source'][] = $source['source'];
+					}
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -133,7 +142,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -164,7 +175,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {

Spacing +31 added lines, -31 removed lines

@@ -28,22 +28,22 @@ 
      * @param bool $and
      * @return String the SQL part
      */
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -62,7 +62,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -75,13 +75,13 @@ 
 	 * @return Array Return ATC
 	*/
 	public function getById($id) {
-		$filter_query = $this->getFilter(array(),true,true);
+		$filter_query = $this->getFilter(array(), true, true);
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
 		$query_values = array(':id' => $id);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -94,19 +94,19 @@ 
 	 * @param String $format_source Format source
 	 * @return Array Return ATC
 	*/
-	public function getByIdent($ident,$format_source = '') {
-		$filter_query = $this->getFilter(array(),true,true);
+	public function getByIdent($ident, $format_source = '') {
+		$filter_query = $this->getFilter(array(), true, true);
 		if ($format_source == '') {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
 			$query_values = array(':ident' => $ident);
 		} else {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		}
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -128,18 +128,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -160,18 +160,18 @@ 
 	 * @param String $format_source Format source
 	 * @param String $source_name Source name
 	*/
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -187,7 +187,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -198,13 +198,13 @@ 
 	 * @param String $ident Flight ident
 	 * @param String $format_source Format source
 	*/
-	public function deleteByIdent($ident,$format_source) {
+	public function deleteByIdent($ident, $format_source) {
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -219,7 +219,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';
@@ -238,7 +238,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";

require/class.MarineArchive.php

Braces +37 added lines, -13 removed lines

@@ -13,7 +13,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (MarineArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (MarineArchive)');
+		}
 	}
 
     /**
@@ -36,7 +38,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -82,8 +86,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -129,9 +136,14 @@ 
 		if ($over_country == '') {
 			$Marine = new Marine($this->db);
 			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
 		
 		//$country = $over_country;
 		// Route is not added in marine_archive
@@ -661,7 +673,9 @@ 
                     $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 ";
+                    if ($translate != $q_item) {
+                    	$additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+                    }
                     $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
                     $additional_query .= ")";
                 }
@@ -879,7 +893,9 @@ 
                 date_default_timezone_set($globalTimezone);
                 $datetime = new DateTime();
                 $offset = $datetime->format('P');
-            } else $offset = '+00:00';
+            } else {
+            	$offset = '+00:00';
+            }
 
 
             if ($date_array[1] != "")
@@ -1165,9 +1181,13 @@ 
 				$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";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1213,9 +1233,13 @@ 
 				$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";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

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

Spacing +103 added lines, -103 removed lines

@@ -23,33 +23,33 @@ 
      * @param bool $and
      * @return string the SQL part
      */
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -77,15 +77,15 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
+			$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -128,21 +128,21 @@ 
 		require_once(dirname(__FILE__).'/class.Marine.php');
 		if ($over_country == '') {
 			$Marine = new Marine($this->db);
-			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
 		
 		//$country = $over_country;
 		// Route is not added in marine_archive
-		$query  = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name,distance,race_rank,race_time) 
+		$query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,type_id,status,status_id,imo,arrival_port_name,arrival_port_date,captain_id,captain_name,race_id,race_name,distance,race_rank,race_time) 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:type_id,:status,:status_id,:imo,:arrival_port_name,:arrival_port_date,:captain_id,:captain_name,:race_id,:race_name,:distance,:race_rank,:race_time)';
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':mmsi' => $mmsi,':type' => $type,':type_id' => $typeid,':status' => $status,':status_id' => $statusid,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date,':captain_id' => $captain_id,':captain_name' => $captain_name,':race_id' => $race_id,':race_name' => $race_name,':distance' => $distance,':race_rank' => $race_rank,':race_time' => $race_time);
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':mmsi' => $mmsi, ':type' => $type, ':type_id' => $typeid, ':status' => $status, ':status_id' => $statusid, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date, ':captain_id' => $captain_id, ':captain_name' => $captain_name, ':race_id' => $race_id, ':race_name' => $race_name, ':distance' => $distance, ':race_rank' => $race_rank, ':race_time' => $race_time);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -162,8 +162,8 @@ 
 
         $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));
+        $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;
     }
 
@@ -181,7 +181,7 @@ 
         $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";
+        $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -194,7 +194,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-        $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
+        $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id));
         return $spotter_array;
     }
 
@@ -208,14 +208,14 @@ 
 	{
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -233,14 +233,14 @@ 
     {
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -262,12 +262,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -288,12 +288,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -313,12 +313,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -340,13 +340,13 @@ 
         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 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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -364,12 +364,12 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getMarineArchiveData($ident,$fammarine_id,$date)
+    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.'%'));
+        $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%'));
         return $spotter_array;
     }
 
@@ -388,7 +388,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -402,24 +402,24 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getMinLiveMarineData($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -438,14 +438,14 @@ 
 						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 
+            $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."'".'
@@ -455,7 +455,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -472,24 +472,24 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -499,7 +499,7 @@ 
                     		    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."'".') 
@@ -514,7 +514,7 @@ 
                         	    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."'".'
@@ -526,7 +526,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -543,23 +543,23 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getLiveMarineCount($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -574,7 +574,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -617,7 +617,7 @@ 
      * @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())
+    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');
@@ -638,7 +638,7 @@ 
             } else {
                 $q_array = explode(" ", $q);
 		
-                foreach ($q_array as $q_item){
+                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 ";
@@ -670,7 +670,7 @@ 
 	
         if ($registration != "")
         {
-            $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+            $registration = filter_var($registration, FILTER_SANITIZE_STRING);
             if (!is_string($registration))
             {
                 return array();
@@ -681,7 +681,7 @@ 
 	
         if ($aircraft_icao != "")
         {
-            $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+            $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
             if (!is_string($aircraft_icao))
             {
                 return array();
@@ -692,7 +692,7 @@ 
 	
         if ($aircraft_manufacturer != "")
         {
-            $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+            $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
             if (!is_string($aircraft_manufacturer))
             {
                 return array();
@@ -713,7 +713,7 @@ 
 	
         if ($airline_icao != "")
         {
-            $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+            $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
             if (!is_string($airline_icao))
             {
                 return array();
@@ -724,7 +724,7 @@ 
 	
         if ($airline_country != "")
         {
-            $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+            $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
             if (!is_string($airline_country))
             {
                 return array();
@@ -735,7 +735,7 @@ 
 	
         if ($airline_type != "")
         {
-            $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+            $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
             if (!is_string($airline_type))
             {
                 return array();
@@ -757,7 +757,7 @@ 
 	
         if ($airport != "")
         {
-            $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+            $airport = filter_var($airport, FILTER_SANITIZE_STRING);
             if (!is_string($airport))
             {
                 return array();
@@ -768,7 +768,7 @@ 
 	
         if ($airport_country != "")
         {
-            $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+            $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
             if (!is_string($airport_country))
             {
                 return array();
@@ -779,7 +779,7 @@ 
     
         if ($callsign != "")
         {
-            $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+            $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
             if (!is_string($callsign))
             {
                 return array();
@@ -787,7 +787,7 @@ 
                 $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));
+                    $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
                 } else {
                     $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
                 }
@@ -796,7 +796,7 @@ 
 
         if ($owner != "")
         {
-            $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+            $owner = filter_var($owner, FILTER_SANITIZE_STRING);
             if (!is_string($owner))
             {
                 return array();
@@ -807,7 +807,7 @@ 
 
         if ($pilot_name != "")
         {
-            $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+            $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
             if (!is_string($pilot_name))
             {
                 return array();
@@ -818,7 +818,7 @@ 
 	
         if ($pilot_id != "")
         {
-            $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+            $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
             if (!is_string($pilot_id))
             {
                 return array();
@@ -829,7 +829,7 @@ 
 	
         if ($departure_airport_route != "")
         {
-            $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+            $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
             if (!is_string($departure_airport_route))
             {
                 return array();
@@ -840,7 +840,7 @@ 
 	
         if ($arrival_airport_route != "")
         {
-            $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+            $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
             if (!is_string($arrival_airport_route))
             {
                 return array();
@@ -853,8 +853,8 @@ 
         {
             $altitude_array = explode(",", $altitude);
 	    
-            $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-            $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+            $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+            $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
             if ($altitude_array[1] != "")
@@ -872,8 +872,8 @@ 
         {
             $date_array = explode(",", $date_posted);
 	    
-            $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-            $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+            $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+            $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
             if ($globalTimezone != '') {
                 date_default_timezone_set($globalTimezone);
@@ -905,8 +905,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {
@@ -917,8 +917,8 @@ 
 	
 
         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 
+            $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 {
@@ -935,12 +935,12 @@ 
                 $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);
+        $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
         return $spotter_array;
     }
@@ -957,7 +957,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             return "error";
         }
         return '';
@@ -997,8 +997,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1042,7 +1042,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -1059,8 +1059,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1103,7 +1103,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1115,8 +1115,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1148,7 +1148,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1177,7 +1177,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1196,7 +1196,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1225,7 +1225,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1244,14 +1244,14 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getDateArchiveMarineDataById($id,$date)
+    public function getDateArchiveMarineDataById($id, $date)
     {
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, 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.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$date = date('c', $date);
+	$spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1262,14 +1262,14 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getDateArchiveMarineDataByIdent($ident,$date)
+    public function getDateArchiveMarineDataByIdent($ident, $date)
     {
 	$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 AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$date = date('c', $date);
+	$spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1282,7 +1282,7 @@ 
      * @param array $filters
      * @return array the spotter information
      */
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
         global $global_query;
         $Marine = new Marine($this->db);
@@ -1290,7 +1290,7 @@ 
         $query_values = array();
         $limit_query = '';
         $additional_query = '';
-        $filter_query = $this->getFilter($filters,true,true);
+        $filter_query = $this->getFilter($filters, true, true);
 	
         if ($airport != "")
         {
@@ -1307,8 +1307,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {

require/class.Tracker.php

Doc Comments +2 added lines, -2 removed lines

@@ -1784,7 +1784,7 @@ 
     /**
      * Counts all hours
      *
-     * @param $orderby
+     * @param string $orderby
      * @param array $filters
      * @return array the hour list
      */
@@ -2263,7 +2263,7 @@ 
 	/**
 	* Parses the direction degrees to working
 	*
-	* @param Float $direction the direction in degrees
+	* @param integer $direction the direction in degrees
 	* @return array the direction information
 	*
 	*/

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;

Spacing +176 added lines, -176 removed lines

@@ -11,7 +11,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_tracker_query = "SELECT tracker_output.* FROM tracker_output";
 
-class Tracker{
+class Tracker {
 	public $db;
 	
 	public function __construct($dbc = null) {
@@ -28,33 +28,33 @@ 
      * @return string the SQL part
      */
 	
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -86,7 +86,7 @@ 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -101,7 +101,7 @@ 
      * @param bool $schedules
      * @return array the tracker information
      */
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		date_default_timezone_set('UTC');
 		if (!is_string($query))
@@ -121,13 +121,13 @@ 
 			$sth = $this->db->prepare($query.$limitQuery);
 			$sth->execute($params);
 		} catch (PDOException $e) {
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
 			exit();
 		}
 		
 		$num_rows = 0;
 		$tracker_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -183,17 +183,17 @@ 
 				{
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
 				} else {
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
 				}
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
 					}
 				}
@@ -232,8 +232,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -250,9 +250,9 @@ 
 			$orderby_query = " ORDER BY tracker_output.date DESC";
 		}
 
-		$query  = $global_tracker_query.$filter_query." ".$orderby_query;
+		$query = $global_tracker_query.$filter_query." ".$orderby_query;
 
-		$tracker_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$tracker_array = $this->getDataFromDB($query, array(), $limit_query, true);
 
 		return $tracker_array;
 	}
@@ -271,8 +271,8 @@ 
 		if ($id == '') return array();
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
-		$query  = $global_tracker_query." WHERE ".$additional_query." ";
-		$tracker_array = $this->getDataFromDB($query,$query_values);
+		$query = $global_tracker_query." WHERE ".$additional_query." ";
+		$tracker_array = $this->getDataFromDB($query, $query_values);
 		return $tracker_array;
 	}
 
@@ -294,7 +294,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		if ($ident != "")
 		{
 			if (!is_string($ident))
@@ -310,8 +310,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -335,7 +335,7 @@ 
 		return $tracker_array;
 	}
 	
-	public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_tracker_query, $globalTimezone, $globalDBdriver;
 		
@@ -343,7 +343,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -369,8 +369,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -400,11 +400,11 @@ 
      * @param array $filters
      * @return array list of source name
      */
-	public function getAllSourceName($type = '',$filters = array())
+	public function getAllSourceName($type = '', $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$query_values = array();
-		$query  = "SELECT DISTINCT tracker_output.source_name 
+		$query = "SELECT DISTINCT tracker_output.source_name 
 				FROM tracker_output".$filter_query." tracker_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -419,7 +419,7 @@ 
 		$source_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['source_name'] = $row['source_name'];
 			$source_array[] = $temp_array;
@@ -436,8 +436,8 @@ 
      */
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident
 								FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -447,7 +447,7 @@ 
 		$ident_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['ident'] = $row['ident'];
 			$ident_array[] = $temp_array;
@@ -472,12 +472,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
 		} else {
-			$query  = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM tracker_output
 								WHERE tracker_output.date <> '' 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
@@ -489,7 +489,7 @@ 
 		$date_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date'] = $row['date'];
 
@@ -508,11 +508,11 @@ 
      * @param null $fromsource
      * @return String success or false
      */
-	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
+	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);
@@ -540,7 +540,7 @@ 
 	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);
@@ -570,7 +570,7 @@ 
      * @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 = '')
+	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '')
 	{
 		//$Image = new Image($this->db);
 		$Common = new Common();
@@ -636,21 +636,21 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
 	
                 if ($latitude == '' && $longitude == '') {
             		$latitude = 0;
@@ -658,10 +658,10 @@ 
             	}
                 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) 
+                $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 {
 		        
@@ -687,13 +687,13 @@ 
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND tracker_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT tracker_output.ident FROM tracker_output 
+			$query = "SELECT tracker_output.ident FROM tracker_output 
 								WHERE tracker_output.ident = :ident 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
@@ -702,8 +702,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+    		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -729,8 +729,8 @@ 
 				return array();
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%')";
 					$additional_query .= ")";
@@ -738,11 +738,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND tracker_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output 
+			$query = "SELECT tracker_output.* FROM tracker_output 
 				WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -759,16 +759,16 @@ 
      * @param array $filters
      * @return array the airline country list
      */
-	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
-			$filter_query = $TrackerLive->getFilter($filters,true,true);
+			$filter_query = $TrackerLive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -788,7 +788,7 @@ 
 		} else {
 			require_once('class.TrackerArchive.php');
 			$TrackerArchive = new TrackerArchive($this->db);
-			$filter_query = $TrackerArchive->getFilter($filters,true,true);
+			$filter_query = $TrackerArchive->getFilter($filters, true, true);
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
 			if ($olderthanmonths > 0) {
 				if ($globalDBdriver == 'mysql') {
@@ -816,7 +816,7 @@ 
 		$flight_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_count'] = $row['nb'];
 			$temp_array['tracker_country'] = $row['name'];
@@ -839,11 +839,11 @@ 
      * @param string $day
      * @return array the callsign list
      */
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -857,28 +857,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
@@ -890,7 +890,7 @@ 
 		$callsign_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['callsign_icao'] = $row['ident'];
 			$temp_array['airline_name'] = $row['airline_name'];
@@ -942,7 +942,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -968,7 +968,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -989,7 +989,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1014,7 +1014,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -1035,7 +1035,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['date_name'] = $row['date_name'];
 			$temp_array['date_count'] = $row['date_count'];
@@ -1081,7 +1081,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['month_name'] = $row['month_name'];
 			$temp_array['year_name'] = $row['year_name'];
@@ -1108,7 +1108,7 @@ 
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -1129,7 +1129,7 @@ 
 		$date_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['year_name'] = $row['year_name'];
 			$temp_array['month_name'] = $row['month_name'];
@@ -1149,7 +1149,7 @@ 
      * @param array $filters
      * @return array the hour list
      */
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -1197,7 +1197,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1219,8 +1219,8 @@ 
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -1228,12 +1228,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1245,7 +1245,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1267,8 +1267,8 @@ 
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1276,12 +1276,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1289,12 +1289,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
       
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1314,33 +1314,33 @@ 
      * @param string $month
      * @return Integer the number of trackers
      */
-	public function countOverallTracker($filters = array(),$year = '',$month = '')
+	public function countOverallTracker($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
 		//$queryi  = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output";
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1355,32 +1355,32 @@ 
      * @param string $month
      * @return Integer the number of flights
      */
-	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
+	public function countOverallTrackerTypes($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1397,7 +1397,7 @@ 
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -1405,12 +1405,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -1422,7 +1422,7 @@ 
 		$hour_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['hour_name'] = $row['hour_name'];
 			$temp_array['hour_count'] = $row['hour_count'];
@@ -1441,9 +1441,9 @@ 
      */
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
 	{
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT tracker_output.tracker_id
+		$query = "SELECT tracker_output.tracker_id
 				FROM tracker_output 
 				WHERE tracker_output.famtrackid = '".$famtrackid."'";
         
@@ -1451,7 +1451,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['tracker_id'];
 		}
@@ -1476,23 +1476,23 @@ 
 		}
 		
 		$current_date = date("Y-m-d H:i:s");
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
 		
 		$diff = abs(strtotime($current_date) - strtotime($date));
 
-		$time_array['years'] = floor($diff / (365*60*60*24)); 
+		$time_array['years'] = floor($diff/(365*60*60*24)); 
 		$years = $time_array['years'];
 		
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
 		$months = $time_array['months'];
 		
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
 		$days = $time_array['days'];
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
 		$hours = $time_array['hours'];
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
 		$minutes = $time_array['minutes'];
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));  
 		
 		return $time_array;
 	}
@@ -1515,63 +1515,63 @@ 
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "N";
 			$temp_array['direction_fullname'] = "North";
-		} elseif ($direction >= 22.5 && $direction < 45){
+		} elseif ($direction >= 22.5 && $direction < 45) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNE";
 			$temp_array['direction_fullname'] = "North-Northeast";
-		} elseif ($direction >= 45 && $direction < 67.5){
+		} elseif ($direction >= 45 && $direction < 67.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NE";
 			$temp_array['direction_fullname'] = "Northeast";
-		} elseif ($direction >= 67.5 && $direction < 90){
+		} elseif ($direction >= 67.5 && $direction < 90) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ENE";
 			$temp_array['direction_fullname'] = "East-Northeast";
-		} elseif ($direction >= 90 && $direction < 112.5){
+		} elseif ($direction >= 90 && $direction < 112.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "E";
 			$temp_array['direction_fullname'] = "East";
-		} elseif ($direction >= 112.5 && $direction < 135){
+		} elseif ($direction >= 112.5 && $direction < 135) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "ESE";
 			$temp_array['direction_fullname'] = "East-Southeast";
-		} elseif ($direction >= 135 && $direction < 157.5){
+		} elseif ($direction >= 135 && $direction < 157.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SE";
 			$temp_array['direction_fullname'] = "Southeast";
-		} elseif ($direction >= 157.5 && $direction < 180){
+		} elseif ($direction >= 157.5 && $direction < 180) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSE";
 			$temp_array['direction_fullname'] = "South-Southeast";
-		} elseif ($direction >= 180 && $direction < 202.5){
+		} elseif ($direction >= 180 && $direction < 202.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "S";
 			$temp_array['direction_fullname'] = "South";
-		} elseif ($direction >= 202.5 && $direction < 225){
+		} elseif ($direction >= 202.5 && $direction < 225) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SSW";
 			$temp_array['direction_fullname'] = "South-Southwest";
-		} elseif ($direction >= 225 && $direction < 247.5){
+		} elseif ($direction >= 225 && $direction < 247.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "SW";
 			$temp_array['direction_fullname'] = "Southwest";
-		} elseif ($direction >= 247.5 && $direction < 270){
+		} elseif ($direction >= 247.5 && $direction < 270) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WSW";
 			$temp_array['direction_fullname'] = "West-Southwest";
-		} elseif ($direction >= 270 && $direction < 292.5){
+		} elseif ($direction >= 270 && $direction < 292.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "W";
 			$temp_array['direction_fullname'] = "West";
-		} elseif ($direction >= 292.5 && $direction < 315){
+		} elseif ($direction >= 292.5 && $direction < 315) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "WNW";
 			$temp_array['direction_fullname'] = "West-Northwest";
-		} elseif ($direction >= 315 && $direction < 337.5){
+		} elseif ($direction >= 315 && $direction < 337.5) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NW";
 			$temp_array['direction_fullname'] = "Northwest";
-		} elseif ($direction >= 337.5 && $direction < 360){
+		} elseif ($direction >= 337.5 && $direction < 360) {
 			$temp_array['direction_degree'] = $direction;
 			$temp_array['direction_shortname'] = "NNW";
 			$temp_array['direction_fullname'] = "North-Northwest";
@@ -1588,11 +1588,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDebug;
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1623,7 +1623,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDebug;
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return '';
@@ -1658,11 +1658,11 @@ 
      * @param string $day
      * @return array the vessel type list
      */
-	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count 
 		    FROM tracker_output ".$filter_query." tracker_output.type  <> ''";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -1682,28 +1682,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			} else {
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
-				$query_values = array_merge($query_values,array(':year' => $year));
+				$query_values = array_merge($query_values, array(':year' => $year));
 			}
 		}
 		if ($month != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND MONTH(tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			} else {
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		if ($day != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND DAY(tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			} else {
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
@@ -1712,7 +1712,7 @@ 
 		$sth->execute($query_values);
 		$tracker_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['tracker_type'] = $row['tracker_type'];
 			$temp_array['tracker_type_count'] = $row['tracker_type_count'];
@@ -1736,13 +1736,13 @@ 
      * @param array $filters
      * @return array the tracker information
      */
-	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
+	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($q != "")
 		{
 			if (!is_string($q))
@@ -1750,8 +1750,8 @@ 
 				return array();
 			} else {
 				$q_array = explode(" ", $q);
-				foreach ($q_array as $q_item){
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
+				foreach ($q_array as $q_item) {
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
 					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
@@ -1761,20 +1761,20 @@ 
 		}
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return array();
 			} else {
 				$additional_query .= " AND tracker_output.ident = :callsign";
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
 			}
 		}
 		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();
@@ -1801,8 +1801,8 @@ 
 		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[1]." OFFSET ".$limit_array[0];
@@ -1820,22 +1820,22 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 			if ($globalDBdriver == 'mysql') {
-				$query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance 
+				$query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
 			} else {
-				$query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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 
+				$query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/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 - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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.$orderby_query;
 			}
 		} else {
-			$query  = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
+			$query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> '' 
 			    ".$additional_query."
 			    ".$orderby_query;
 		}
-		$tracker_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$tracker_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $tracker_array;
 	}
 
@@ -1860,7 +1860,7 @@ 
 		curl_close($ch);
 		$bitly_data = json_decode($bitly_data);
 		$bitly_url = '';
-		if ($bitly_data->status_txt = "OK"){
+		if ($bitly_data->status_txt = "OK") {
 			$bitly_url = $bitly_data->data->url;
 		}
 		return $bitly_url;
@@ -1868,7 +1868,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
+		$orderby = array("type_asc" => array("key" => "type_asc", "value" => "Type - ASC", "sql" => "ORDER BY tracker_output.type ASC"), "type_desc" => array("key" => "type_desc", "value" => "Type - DESC", "sql" => "ORDER BY tracker_output.type DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
 		
 		return $orderby;
 		

Braces +172 added lines, -61 removed lines

@@ -17,7 +17,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Tracker)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Tracker)');
+		}
 	}
 
     /**
@@ -41,7 +43,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -83,8 +87,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -138,26 +145,43 @@ 
 				$temp_array['tracker_id'] = $row['tracker_archive_id'];
 			} elseif (isset($row['tracker_archive_output_id'])) {
 				$temp_array['tracker_id'] = $row['tracker_archive_output_id'];
-			*/} 
-			elseif (isset($row['trackerid'])) {
+			*/} elseif (isset($row['trackerid'])) {
 				$temp_array['trackerid'] = $row['trackerid'];
 			} else {
 				$temp_array['trackerid'] = '';
 			}
-			if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid'];
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
-			if (isset($row['comment'])) $temp_array['comment'] = $row['comment'];
+			if (isset($row['famtrackid'])) {
+				$temp_array['famtrackid'] = $row['famtrackid'];
+			}
+			if (isset($row['type'])) {
+				$temp_array['type'] = $row['type'];
+			}
+			if (isset($row['comment'])) {
+				$temp_array['comment'] = $row['comment'];
+			}
 			$temp_array['ident'] = $row['ident'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
+			if (isset($row['format_source'])) {
+				$temp_array['format_source'] = $row['format_source'];
+			}
+			if (isset($row['altitude'])) {
+				$temp_array['altitude'] = $row['altitude'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 			
 			if (isset($row['date'])) {
 				$dateArray = $this->parseDateString($row['date']);
@@ -200,13 +224,21 @@ 
 			}
 			
 			$fromsource = NULL;
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			$temp_array['query_number_rows'] = $num_rows;
 			$tracker_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$tracker_array[0]['query_number_rows'] = $num_rows;
 		return $tracker_array;
 	}
@@ -239,8 +271,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		
 		if ($sort != "")
 		{
@@ -268,7 +304,9 @@ 
 		global $global_tracker_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "tracker_output.famtrackid = :id";
 		$query_values = array(':id' => $id);
 		$query  = $global_tracker_query." WHERE ".$additional_query." ";
@@ -413,8 +451,11 @@ 
 		$query .= " ORDER BY tracker_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -469,7 +510,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
@@ -617,7 +660,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		
 		if ($heading != "")
 		{
@@ -656,8 +701,12 @@ 
             		$latitude = 0;
             		$longitude = 0;
             	}
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 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)";
 
@@ -764,7 +813,9 @@ 
 		global $globalDBdriver, $globalArchive;
 		//$filter_query = $this->getFilter($filters,true,true);
 		$Connection= new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return array();
+		if (!$Connection->tableExists('countries')) {
+			return array();
+		}
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
 			require_once('class.TrackerLive.php');
 			$TrackerLive = new TrackerLive($this->db);
@@ -807,7 +858,9 @@ 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country ";
 		}
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -846,12 +899,18 @@ 
 		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
-			else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'";
-			else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND tracker_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -882,7 +941,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -917,7 +978,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -967,7 +1030,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1013,7 +1078,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -1060,7 +1127,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
@@ -1107,7 +1176,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
@@ -1156,7 +1227,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -1225,7 +1298,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1273,7 +1348,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1339,8 +1416,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1379,8 +1459,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -1402,7 +1485,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -1506,7 +1591,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -1595,7 +1682,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE ST_Within(ST_GeomFromText('POINT(".$longitude." ".$latitude.")',4326), ogc_geom) LIMIT 1";
@@ -1606,9 +1695,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1626,7 +1719,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -1638,9 +1733,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -1707,7 +1806,9 @@ 
 			}
 		}
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$tracker_array = array();
@@ -1753,7 +1854,9 @@ 
 				foreach ($q_array as $q_item){
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
-					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
+					if (is_int($q_item)) {
+						$additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
+					}
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
 					$additional_query .= ")";
 				}
@@ -1779,7 +1882,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} else {
+				$offset = '+00:00';
+			}
 			if ($date_array[1] != "")
 			{
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -1806,8 +1911,12 @@ 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		if ($sort != "")
 		{
 			$search_orderby_array = $this->getOrderBy();
@@ -1850,7 +1959,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_HEADER, 0);

require/class.Translation.php

Doc Comments +4 added lines, -4 removed lines

@@ -74,8 +74,8 @@ 
 
     /**
      * @param $ident
-     * @param $correct_ident
-     * @param $source
+     * @param string $correct_ident
+     * @param string $source
      * @return string
      */
     public function addOperator($ident, $correct_ident, $source) {
@@ -91,8 +91,8 @@ 
 
     /**
      * @param $ident
-     * @param $correct_ident
-     * @param $source
+     * @param string $correct_ident
+     * @param string $source
      * @return string
      */
     public function updateOperator($ident, $correct_ident, $source) {

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

Spacing +8 added lines, -8 removed lines

@@ -41,12 +41,12 @@ 
 			} else return $ident;
 		} else return $ident;
 		if ($airline_icao == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
 		} else {
 			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
 			if (isset($identicao[0])) {
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
 			} else $icao = $ident;
 		}
 		return $icao;
@@ -62,7 +62,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -80,11 +80,11 @@ 
      */
     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);
+		$query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -97,11 +97,11 @@ 
      */
     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);
+		$query_values = array(':ident' => $ident, ':correct_ident' => $correct_ident, ':source' => $source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}

Braces +20 added lines, -7 removed lines

@@ -38,16 +38,25 @@ 
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
 				//$airline_icao = substr($ident, 0, 3);
 				return $ident;
-			} else return $ident;
-		} else return $ident;
+			} else {
+				return $ident;
+			}
+		} else {
+			return $ident;
+		}
 		if ($airline_icao == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$identicao = $Spotter->getAllAirlineInfo($airline_icao);
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -69,7 +78,9 @@ 
 		$sth->closeCursor();
 		if (isset($row['operator_correct'])) {
 			return $row['operator_correct'];
-		} else return $ident;
+		} else {
+			return $ident;
+		}
 	}
 
     /**
@@ -115,7 +126,9 @@ 
 		global $globalTranslationSources, $globalTranslationFetch;
 		//if (!isset($globalTranslationSources)) $globalTranslationSources = array('planefinder');
 		$globalTranslationSources = array();
-		if (!isset($globalTranslationFetch)) $globalTranslationFetch = TRUE;
+		if (!isset($globalTranslationFetch)) {
+			$globalTranslationFetch = TRUE;
+		}
 		//echo "Check Translation for ".$ident."...";
 		$correct = $this->getOperator($ident);
 		if ($correct != '' && $correct != $ident) {

require/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

Spacing +108 added lines, -108 removed lines

@@ -23,33 +23,33 @@ 
      * @param bool $and
      * @return string the SQL part
      */
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -77,15 +77,15 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -115,19 +115,19 @@ 
 		require_once(dirname(__FILE__).'/class.Tracker.php');
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
-			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
 		// Route is not added in tracker_archive
-		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
+		$query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':comment' => $comment,':type' => $type);
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':comment' => $comment, ':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -145,8 +145,8 @@ 
         $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));
+        $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;
     }
 
@@ -164,7 +164,7 @@ 
         $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";
+        $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
         /*
@@ -177,7 +177,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-        $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
+        $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id));
 
         return $spotter_array;
     }
@@ -189,19 +189,19 @@ 
      * @param string $date
      * @return array the spotter information
      */
-    public function getAllArchiveTrackerDataById($id,$date = '')
+    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";
+        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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -220,14 +220,14 @@ 
     {
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -249,12 +249,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -275,12 +275,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -301,12 +301,12 @@ 
         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";
+        $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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -328,13 +328,13 @@ 
         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 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) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -352,13 +352,13 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getTrackerArchiveData($ident,$famtrackid,$date)
+    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";
+        $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.'%'));
+        $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%'));
 
         return $spotter_array;
     }
@@ -374,7 +374,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -388,24 +388,24 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -424,14 +424,14 @@ 
 						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 
+            $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."'".'
@@ -441,7 +441,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -458,24 +458,24 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -485,7 +485,7 @@ 
                     		    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."'".') 
@@ -500,7 +500,7 @@ 
                         	    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."'".'
@@ -512,7 +512,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -529,23 +529,23 @@ 
      * @param array $filter
      * @return array the spotter information
      */
-    public function getLiveTrackerCount($begindate,$enddate,$filter = array())
+    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'])."') ";
+            $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 ";
+            $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'])."')";
+            $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
         }
 
         //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -560,7 +560,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             echo $e->getMessage();
             die;
         }
@@ -604,7 +604,7 @@ 
      * @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())
+    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');
@@ -626,7 +626,7 @@ 
 	        
                 $q_array = explode(" ", $q);
 		
-                foreach ($q_array as $q_item){
+                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 ";
@@ -658,7 +658,7 @@ 
 	
         if ($registration != "")
         {
-            $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+            $registration = filter_var($registration, FILTER_SANITIZE_STRING);
             if (!is_string($registration))
             {
                 return array();
@@ -669,7 +669,7 @@ 
 	
         if ($aircraft_icao != "")
         {
-            $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+            $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
             if (!is_string($aircraft_icao))
             {
                 return array();
@@ -680,7 +680,7 @@ 
 	
         if ($aircraft_manufacturer != "")
         {
-            $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+            $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
             if (!is_string($aircraft_manufacturer))
             {
                 return array();
@@ -701,7 +701,7 @@ 
 	
         if ($airline_icao != "")
         {
-            $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+            $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
             if (!is_string($airline_icao))
             {
                 return array();
@@ -712,7 +712,7 @@ 
 	
         if ($airline_country != "")
         {
-            $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+            $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
             if (!is_string($airline_country))
             {
                 return array();
@@ -723,7 +723,7 @@ 
 	
         if ($airline_type != "")
         {
-            $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+            $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
             if (!is_string($airline_type))
             {
                 return array();
@@ -745,7 +745,7 @@ 
 	
         if ($airport != "")
         {
-            $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+            $airport = filter_var($airport, FILTER_SANITIZE_STRING);
             if (!is_string($airport))
             {
                 return array();
@@ -756,7 +756,7 @@ 
 	
         if ($airport_country != "")
         {
-            $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+            $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
             if (!is_string($airport_country))
             {
                 return array();
@@ -767,7 +767,7 @@ 
     
         if ($callsign != "")
         {
-            $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+            $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
             if (!is_string($callsign))
             {
                 return array();
@@ -775,7 +775,7 @@ 
                 $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));
+                    $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
                 } else {
                     $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
                 }
@@ -784,7 +784,7 @@ 
 
         if ($owner != "")
         {
-            $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+            $owner = filter_var($owner, FILTER_SANITIZE_STRING);
             if (!is_string($owner))
             {
                 return array();
@@ -795,7 +795,7 @@ 
 
         if ($pilot_name != "")
         {
-            $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+            $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
             if (!is_string($pilot_name))
             {
                 return array();
@@ -806,7 +806,7 @@ 
 	
         if ($pilot_id != "")
         {
-            $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+            $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
             if (!is_string($pilot_id))
             {
                 return array();
@@ -817,7 +817,7 @@ 
 	
         if ($departure_airport_route != "")
         {
-            $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+            $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
             if (!is_string($departure_airport_route))
             {
                 return array();
@@ -828,7 +828,7 @@ 
 	
         if ($arrival_airport_route != "")
         {
-            $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+            $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
             if (!is_string($arrival_airport_route))
             {
                 return array();
@@ -841,8 +841,8 @@ 
         {
             $altitude_array = explode(",", $altitude);
 	    
-            $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-            $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+            $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+            $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
             if ($altitude_array[1] != "")
@@ -860,8 +860,8 @@ 
         {
             $date_array = explode(",", $date_posted);
 	    
-            $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-            $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+            $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+            $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
             if ($globalTimezone != '') {
                 date_default_timezone_set($globalTimezone);
@@ -893,8 +893,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {
@@ -905,8 +905,8 @@ 
 	
 
         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 
+            $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 {
@@ -923,12 +923,12 @@ 
                 $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);
+        $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
         return $spotter_array;
     }
@@ -945,7 +945,7 @@ 
         try {
             $sth = $this->db->prepare($query);
             $sth->execute();
-        } catch(PDOException $e) {
+        } catch (PDOException $e) {
             return "error";
         }
         return '';
@@ -985,8 +985,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {
@@ -1030,7 +1030,7 @@ 
         $query_values = array();
         $limit_query = '';
         $additional_query = '';
-        $filter_query = $this->getFilter($filter,true,true);
+        $filter_query = $this->getFilter($filter, true, true);
 	
         if ($owner != "")
         {
@@ -1047,8 +1047,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {
@@ -1091,7 +1091,7 @@ 
         $query_values = array();
         $limit_query = '';
         $additional_query = '';
-        $filter_query = $this->getFilter($filter,true,true);
+        $filter_query = $this->getFilter($filter, true, true);
 	
         if ($pilot != "")
         {
@@ -1103,8 +1103,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {
@@ -1136,7 +1136,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
         global $globalDBdriver;
         /*
@@ -1165,7 +1165,7 @@ 
         $flight_array = array();
         $temp_array = array();
         
-        while($row = $sth->fetch(PDO::FETCH_ASSOC))
+        while ($row = $sth->fetch(PDO::FETCH_ASSOC))
         {
             $temp_array['flight_count'] = $row['nb'];
             $temp_array['flight_country'] = $row['name'];
@@ -1184,7 +1184,7 @@ 
      * @param string $sincedate
      * @return array the airline country list
      */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
         global $globalDBdriver;
         /*
@@ -1213,7 +1213,7 @@ 
         $flight_array = array();
         $temp_array = array();
         
-        while($row = $sth->fetch(PDO::FETCH_ASSOC))
+        while ($row = $sth->fetch(PDO::FETCH_ASSOC))
         {
             $temp_array['airline_icao'] = $row['airline_icao'];
             $temp_array['flight_count'] = $row['nb'];
@@ -1232,14 +1232,14 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getDateArchiveTrackerDataById($id,$date)
+    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));
+        $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;
     }
 
@@ -1250,14 +1250,14 @@ 
      * @param $date
      * @return array the spotter information
      */
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
+    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));
+        $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;
     }
 
@@ -1270,7 +1270,7 @@ 
      * @param array $filters
      * @return array the spotter information
      */
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
         global $global_query;
         $Tracker = new Tracker($this->db);
@@ -1278,7 +1278,7 @@ 
         $query_values = array();
         $limit_query = '';
         $additional_query = '';
-        $filter_query = $this->getFilter($filters,true,true);
+        $filter_query = $this->getFilter($filters, true, true);
 	
         if ($airport != "")
         {
@@ -1295,8 +1295,8 @@ 
         {
             $limit_array = explode(",", $limit);
 	    
-            $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-            $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+            $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
             if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
             {

Braces +42 added lines, -15 removed lines

@@ -13,7 +13,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db;
-		if ($this->db === null) die('Error: No DB connection. (TrackerArchive)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (TrackerArchive)');
+		}
 	}
 
     /**
@@ -36,7 +38,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -82,8 +86,11 @@ 
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -116,9 +123,14 @@ 
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
 			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
 		// Route is not added in tracker_archive
 		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
@@ -193,8 +205,11 @@ 
     {
         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";
+        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));
 
@@ -649,7 +664,9 @@ 
                     $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 ";
+                    if ($translate != $q_item) {
+                    	$additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+                    }
                     $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
                     $additional_query .= ")";
                 }
@@ -867,7 +884,9 @@ 
                 date_default_timezone_set($globalTimezone);
                 $datetime = new DateTime();
                 $offset = $datetime->format('P');
-            } else $offset = '+00:00';
+            } else {
+            	$offset = '+00:00';
+            }
 
 
             if ($date_array[1] != "")
@@ -1154,9 +1173,13 @@ 
                 $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";
+        if ($limit) {
+        	$query .= " LIMIT 0,10";
+        }
       
 	
         $sth = $this->db->prepare($query);
@@ -1202,9 +1225,13 @@ 
                 $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";
+        if ($limit) {
+        	$query .= " LIMIT 0,10";
+        }
       
 	
         $sth = $this->db->prepare($query);

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

Spacing +166 added lines, -166 removed lines

@@ -37,9 +37,9 @@ 
      * @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') {
+	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());
+		$date = date("Y-m-d H:i:s", time());
 		//if ($departure_airport_time == '' && $arrival_airport_time == '') exit;
 		//$query = "SELECT COUNT(*) FROM schedule WHERE ident = :ident";
 		$query = "SELECT COUNT(*) FROM routes WHERE CallSign = :ident";
@@ -47,69 +47,69 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		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_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_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_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_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);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($sth->fetchColumn() == 0) {
 				//$query = 'UPDATE schedule SET departure_airport_icao = :departure_airport_icao, departure_airport_time = :departure_airport_time, arrival_airport_icao = :arrival_airport_icao, arrival_airport_time = :arrival_airport_time, date_modified = :date, source = :source WHERE ident = :ident';
 				if ($departure_airport_time == '' && $arrival_airport_time == '') {
 					$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+					$query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($arrival_airport_time == '') {
 					$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, date_modified = :date, Source = :source WHERE CallSign = :ident';
-					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
+					$query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':date' => $date, ':source' => $source);
 				} elseif ($departure_airport_time == '') {
 					$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-					$query_values = array(':ident' => $ident,':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
+					$query_values = array(':ident' => $ident, ':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_time' => $arrival_airport_time, ':date' => $date, ':source' => $source);
 				} else {
 					$query = 'UPDATE routes SET FromAirport_ICAO = :departure_airport_icao, FromAiport_Time = :departure_airport_time, ToAirport_ICAO = :arrival_airport_icao, ToAirport_Time = :arrival_airport_time, date_modified = :date, Source = :source WHERE CallSign = :ident';
-					$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, ':date' => $date, ':source' => $source);
+					$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, ':date' => $date, ':source' => $source);
 				}
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
 				//$query = 'UPDATE schedule SET date_lastseen = :date WHERE ident = :ident';
 				$query = 'UPDATE routes SET date_lastseen = :date WHERE CallSign = :ident';
-				$query_values = array(':ident' => $ident,':date' => $date);
+				$query_values = array(':ident' => $ident, ':date' => $date);
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
 			$query = 'INSERT INTO  routes (CallSign,FromAirport_ICAO, FromAirport_Time, ToAirport_ICAO, ToAirport_Time,date_added,source)  VALUES (:ident,:departure_airport_icao,:departure_airport_time,:arrival_airport_icao,:arrival_airport_time,:date,:source)';
-			$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, ':date' => $date, ':source' => $source);
+			$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, ':date' => $date, ':source' => $source);
 			 try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 		}
@@ -123,10 +123,10 @@ 
 	*/
 	public function getSchedule($ident) {
 		$Translation = new Translation($this->db);
-		$operator = $Translation->checkTranslation($ident,false);
+		$operator = $Translation->checkTranslation($ident, false);
 		if ($ident != $operator) {
 			$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :operator OR CallSign = :ident LIMIT 1";
-			$query_values = array(':ident' => $ident,'operator' => $operator);
+			$query_values = array(':ident' => $ident, 'operator' => $operator);
 		} else {
 			$query = "SELECT FromAirport_ICAO as departure_airport_icao, ToAirport_ICAO as arrival_airport_icao, FromAirport_Time as departure_airport_time, ToAirport_Time as arrival_airport_time FROM routes WHERE FromAirport_ICAO <> '' AND ToAirport_ICAO <> '' AND CallSign = :ident LIMIT 1";
 			$query_values = array(':ident' => $ident);
@@ -134,7 +134,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -163,7 +163,7 @@ 
 		 try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -178,16 +178,16 @@ 
      * @param String $carrier IATA code
      * @return array departure and arrival airports and time
      */
-	public function getAirFrance($callsign, $date = 'NOW',$carrier = 'AF') {
+	public function getAirFrance($callsign, $date = 'NOW', $carrier = 'AF') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym');
 		$json = $Common->getData($url);
 		var_dump($json);
 		$parsed_json = json_decode($json);
-		if (property_exists($parsed_json,'errors') === false) {
+		if (property_exists($parsed_json, 'errors') === false) {
 			//$originLong = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originLong'};
 			$originShort = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'originShort'};
 			//$departureDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'departureDateMedium'};
@@ -197,9 +197,9 @@ 
 			//$arrivalDateMedium = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalDateMedium'};
 			$arrivalTime = $parsed_json->{'flightsList'}[0]->{'segmentsList'}[0]->{'arrivalTime'};
 
-			preg_match('/\((.*?)\)/',$originShort,$originiata);
+			preg_match('/\((.*?)\)/', $originShort, $originiata);
 			$DepartureAirportIata = $originiata[1];
-			preg_match('/\((.*?)\)/',$destinationShort,$destinationiata);
+			preg_match('/\((.*?)\)/', $destinationShort, $destinationiata);
 			$ArrivalAirportIata = $destinationiata[1];
 
 			/*
@@ -208,7 +208,7 @@ 
 			$arrivalTime = gmdate('H:i',strtotime($arrivalTime));
 			*/
 		
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airfrance');
 		} else return array();
 	}
 
@@ -223,8 +223,8 @@ 
 		$Common = new Common();
 		date_default_timezone_set($globalTimezone);
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign;
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -236,7 +236,7 @@ 
 			$departureTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fstd'};
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_easyjet');
 		} else return array();
 	}
 
@@ -247,12 +247,12 @@ 
      */
 	private function getRyanair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/";
 		$post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}';
-		$headers = array('Content-Type: application/json','Content-Length: ' . strlen($post));
-		$json = $Common->getData($url,'post',$post,$headers);
+		$headers = array('Content-Type: application/json', 'Content-Length: '.strlen($post));
+		$json = $Common->getData($url, 'post', $post, $headers);
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'flightInfo'})) {
 			$flights = $parsed_json->{'flightInfo'};
@@ -261,7 +261,7 @@ 
 				$ArrivalAirportIata = $parsed_json->{'flightInfo'}[0]->{'arrivalAirport'}->{'iata'}; //name
 				$departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'};
 				$arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'};
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
 			} else return array();
 		} else return array();
 	}
@@ -273,8 +273,8 @@ 
 	*/
 	private function getSwiss($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.world-of-swiss.com/fr/routenetwork.json";
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -288,12 +288,12 @@ 
 				if ($flight->{'no'} == "Vol LX ".$numvol) {
 					$DepartureAirportIata = $flight->{'from'}->{'code'}; //city
 					$ArrivalAirportIata = $flight->{'to'}->{'code'}; //city
-					$departureTime = substr($flight->{'from'}->{'hour'},0,5);
-					$arrivalTime = substr($flight->{'to'}->{'hour'},0,5);
+					$departureTime = substr($flight->{'from'}->{'hour'},0, 5);
+					$arrivalTime = substr($flight->{'to'}->{'hour'},0, 5);
 				}
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_swiss');
 			} else return array();
 		} else return array();
 	}
@@ -308,21 +308,21 @@ 
 		global $globalBritishAirwaysKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if ($globalBritishAirwaysKey == '') return array();
 		$url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json";
 		$headers = array('Client-Key: '.$globalBritishAirwaysKey);
-		$json = $Common->getData($url,'get','',$headers);
+		$json = $Common->getData($url, 'get', '', $headers);
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'DepartureAirport'};
 			$ArrivalAirportIata = $parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ArrivalAirport'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways');
+			$departureTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_britishairways');
 		} else return array();
 	}
 
@@ -336,27 +336,27 @@ 
 		global $globalLufthansaKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array();
 		$url = "https://api.lufthansa.com/v1/oauth/token";
-		$post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('client_id' => $globalLufthansaKey['key'], 'client_secret' => $globalLufthansaKey['secret'], 'grant_type' => 'client_credentials');
+		$data = $Common->getData($url, 'post', $post);
 		$parsed_data = json_decode($data);
 		if (!isset($parsed_data->{'access_token'})) return array();
 		$token = $parsed_data->{'access_token'};
 		
 		$url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d');
-		$headers = array('Authorization: Bearer '.$token,'Accept: application/json');
-		$json = $Common->getData($url,'get','',$headers);
+		$headers = array('Authorization: Bearer '.$token, 'Accept: application/json');
+		$json = $Common->getData($url, 'get', '', $headers);
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			$ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'};
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa');
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_lufthansa');
 		} else return array();
 	}
 
@@ -370,23 +370,23 @@ 
 		global $globalTransaviaKey;
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
+		$numvol = sprintf('%04d', preg_replace('/^[A-Z]*/', '', $callsign));
+		if (!filter_var(preg_replace('/^[A-Z]*/', '', $callsign), FILTER_VALIDATE_INT)) return array();
 		if ($globalTransaviaKey == '') return array();
 		$url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		//$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		$headers = array('apikey: '.$globalTransaviaKey);
-		$json = $Common->getData($url,'get','',$headers);
+		$json = $Common->getData($url, 'get', '', $headers);
 		//echo 'result : '.$json;
 		if ($json == '') return array();
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
 			$DepartureAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'departureAirport'}->{'locationCode'};
-			$departureTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
+			$departureTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'departureDateTime'}));
 			$ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'};
-			$arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia');
+			$arrivalTime = date('H:i', strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_transavia');
 		} else return array();
 	}
 
@@ -397,14 +397,14 @@ 
 	*/
 	public function getTunisair($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp";
 		$data = $Common->getData($url);
 		$table = $Common->table2array($data);
 		foreach ($table as $flight) {
-			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d',$numvol)) {
-				return array('DepartureAirportIATA' => $flight[2],'DepartureTime' => str_replace('.',':',$flight[5]),'ArrivalAirportIATA' => $flight[3],'ArrivalTime' => str_replace('.',':',$flight[6]),'Source' => 'website_tunisair');
+			if (isset($flight[1]) && $flight[1] == "TU ".sprintf('%04d', $numvol)) {
+				return array('DepartureAirportIATA' => $flight[2], 'DepartureTime' => str_replace('.', ':', $flight[5]), 'ArrivalAirportIATA' => $flight[3], 'ArrivalTime' => str_replace('.', ':', $flight[6]), 'Source' => 'website_tunisair');
 			}
 		}
 		return array();
@@ -416,21 +416,21 @@ 
      * @param string $date
      * @return array Flight departure and arrival airports and time
      */
-	public function getVueling($callsign,$date = 'NOW') {
+	public function getVueling($callsign, $date = 'NOW') {
 		$Common = new Common();
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$final_date = str_replace('/', '%2F', $check_date->format('d/m/Y'));
 		$url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB";
 		$data = $Common->getData($url);
-		$data=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$data));
+		$data = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $data));
 		if ($data != '') {
-			preg_match('/flightOri=[A-Z]{3}/',$data,$result);
-			$DepartureAirportIata = str_replace('flightOri=','',$result[0]);
-			preg_match('/flightDest=[A-Z]{3}/',$data,$result);
-			$ArrivalAirportIata = str_replace('flightDest=','',$result[0]);
-			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
+			preg_match('/flightOri=[A-Z]{3}/', $data, $result);
+			$DepartureAirportIata = str_replace('flightOri=', '', $result[0]);
+			preg_match('/flightDest=[A-Z]{3}/', $data, $result);
+			$ArrivalAirportIata = str_replace('flightDest=', '', $result[0]);
+			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'Source' => 'website_vueling');
 			else return array();
 		}
 		return array();
@@ -444,27 +444,27 @@ 
 	*/
 	public function getIberia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "https://www.iberia.com/web/flightDetail.do";
-		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('numvuelo' => $numvol, 'fecha' => $check_date->format('Ymd'), 'airlineID' => 'IB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			//print_r($table);
 			if (count($table) > 0) {
 				$flight = $table;
-				preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-				preg_match('/([A-Z]{3})/',$flight[5][0],$ArrivalAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+				preg_match('/([A-Z]{3})/', $flight[5][0], $ArrivalAirportIataMatch);
 				$DepartureAirportIata = $DepartureAirportIataMatch[0];
 				$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-				$departureTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[3][2]))),0,5);
-				$arrivalTime = trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][1])));
+				$departureTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[3][2]))), 0, 5);
+				$arrivalTime = trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
-					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace('&nbsp;','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
+					$arrivalTime = substr(trim(str_replace(' lunes', '', str_replace('&nbsp;', '', $flight[5][2]))), 0, 5);
+				} else $arrivalTime = substr($arrivalTime, 0, 5);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_iberia');
 			}
 		}
 		return array();
@@ -478,11 +478,11 @@ 
      * @return array Flight departure and arrival airports and time
      */
 
-	private function getStarAlliance($callsign, $date = 'NOW',$carrier = '') {
+	private function getStarAlliance($callsign, $date = 'NOW', $carrier = '') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y');
 		$data = $Common->getData($url);
 		if ($data != '') {
@@ -491,13 +491,13 @@ 
 				$flight = $table;
 				//print_r($table);
 				if (isset($flight[25]) && isset($flight[29])) {
-					preg_match('/([A-Z]{3})/',$flight[25][1],$DepartureAirportIataMatch);
-					preg_match('/([A-Z]{3})/',$flight[25][3],$ArrivalAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][1], $DepartureAirportIataMatch);
+					preg_match('/([A-Z]{3})/', $flight[25][3], $ArrivalAirportIataMatch);
 					$DepartureAirportIata = $DepartureAirportIataMatch[0];
 					$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-					$departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5);
-					$arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5);
-					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance');
+					$departureTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][0])), 0, 5);
+					$arrivalTime = substr(trim(str_replace('Scheduled: ', '', $flight[29][1])), 0, 5);
+					return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_staralliance');
 				} else return array();
 			}
 			
@@ -515,10 +515,10 @@ 
 	*/
 	private function getAlitalia($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$url = "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -526,7 +526,7 @@ 
 			$ArrivalAirportIata = '';
 			$departureTime = $table[4];
 			$arrivalTime = $table[5];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_alitalia');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_alitalia');
 		}
 		return array();
 	}
@@ -539,21 +539,21 @@ 
 	*/
 	private function getBrussels($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
+		$url = "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
-		    $parsed_json = json_decode($data,true);
+		    $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');
+			$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();
@@ -631,21 +631,21 @@ 
 	*/
 	private function getFlyTap($callsign) {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1');
-		$data = $Common->getData($url,'post',$post);
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$post = array('arrivalsdepartures_content' => 'number', 'arrivalsdepartures_tp' => $numvol, 'arrivalsdepartures_trk' => 'ARR', 'arrivalsdepartures_date_trk' => '1', 'aptCode' => '', 'arrivalsdepartures' => 'DEP', 'arrivalsdepartures_date' => '1', 'aptCodeFrom' => '', 'aptCodeTo' => '', 'arrivalsdepartures2' => 'DEP', 'arrivalsdepartures_date2' => '1');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
-			$departureTime = trim(substr($table[15][0],0,5));
-			$arrivalTime = trim(substr($table[35][0],0,5));
-			preg_match('/([A-Z]{3})/',$table[11][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$table[31][0],$ArrivalAirportIataMatch);
+			$departureTime = trim(substr($table[15][0], 0, 5));
+			$arrivalTime = trim(substr($table[35][0], 0, 5));
+			preg_match('/([A-Z]{3})/', $table[11][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $table[31][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_flytap');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flytap');
 		}
 		return array();
 	}
@@ -667,10 +667,10 @@ 
 			} 
 		}
 		if ($airline_icao == '') return array();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -680,13 +680,13 @@ 
 				$darr = '';
 				$ahour = '';
 				$aarr = '';
-				$n = sscanf($sched,'%*s %5[0-9:] %*[^()] (%3[A-Z]) %5[0-9:] %*[^()] (%3[A-Z])',$dhour,$darr,$ahour,$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');
+				    $DepartureAirportIata = str_replace(array('(', ')'), '', $darr);
+				    $ArrivalAirportIata = str_replace(array('(', ')'), '', $aarr);
+				    return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_flightmapper');
 				}
 			}
 		}
@@ -718,7 +718,7 @@ 
 			$url = 'http://'.$globalFlightAwareUsername.':'.$globalFlightAwarePassword.'@flightxml.flightaware.com/json/FlightXML3/FlightInfoStatus?ident='.$callsign;
 			$data = $Common->getData($url);
 			if ($data != '') {
-				$result = json_decode($data,true);
+				$result = json_decode($data, true);
 				$flight = $result['FlightInfoStatusResult']['flights'][0];
 				if (isset($flight['origin'])) {
 					return array(
@@ -731,18 +731,18 @@ 
 			}
 		}
 		
-		$url= "http://flightaware.com/live/flight/".$callsign;
+		$url = "http://flightaware.com/live/flight/".$callsign;
 		$data = $Common->getData($url);
 		if ($data != '') {
-			preg_match(':<script>var trackpollBootstrap = (.*?);</script>:',$data,$result);
-			$flights = json_decode($result[1],true);
+			preg_match(':<script>var trackpollBootstrap = (.*?);</script>:', $data, $result);
+			$flights = json_decode($result[1], true);
 			$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']),
+				    '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']),
+				    'ArrivalTime' => date('H:i', $flight['activityLog']['flights'][0]['landingTimes']['scheduled']),
 				    'Source' => 'website_flightaware');
 			}
 		}
@@ -756,20 +756,20 @@ 
 	*/
 	public function getCostToTravel($callsign) {
 		$Common = new Common();
-		$url= "http://www.costtotravel.com/flight-number/".$callsign;
+		$url = "http://www.costtotravel.com/flight-number/".$callsign;
 		//$check_date = new Datetime($date);
 		//if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			if (isset($table[11][1])) {
-				if (is_numeric(substr($table[11][1],0,1))) $departureTime = substr($table[11][1],0,5);
+				if (is_numeric(substr($table[11][1], 0, 1))) $departureTime = substr($table[11][1], 0, 5);
 				else $departureTime = '';
-				if (is_numeric(substr($table[17][1],0,1))) $arrivalTime = substr($table[17][1],0,5);
+				if (is_numeric(substr($table[17][1], 0, 1))) $arrivalTime = substr($table[17][1], 0, 5);
 				else $arrivalTime = '';
-				$DepartureAirportIata = substr($table[13][1],0,3);
-				$ArrivalAirportIata = substr($table[15][1],0,3);
-				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_costtotravel');
+				$DepartureAirportIata = substr($table[13][1], 0, 3);
+				$ArrivalAirportIata = substr($table[15][1], 0, 3);
+				return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_costtotravel');
 			}
 		}
 		return array();
@@ -781,14 +781,14 @@ 
 	* @param string $date date we want flight number info
 	* @return array Flight departure and arrival airports and time
 	*/
-	private function getAirCanada($callsign,$date = 'NOW') {
+	private function getAirCanada($callsign, $date = 'NOW') {
 		$Common = new Common();
 		if (class_exists("DomDocument") === FALSE) return array();
 		date_default_timezone_set('UTC');
 		$check_date = new Datetime($date);
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		$url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
+		$url = "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
@@ -796,11 +796,11 @@ 
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
-			$departureTime = date('H:i',strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
+			$departureTime = date('H:i', strtotime($departure->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			$arrival = $dom->getElementsByTagName('ArrivalStationInfo')->item(0);
 			$ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
-			$arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada');
+			$arrivalTime = date('H:i', strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_aircanada');
 		} else return array();
 	}
 
@@ -812,21 +812,21 @@ 
 	*/
 	private function getVietnamAirlines($callsign, $date = 'NOW') {
 		$Common = new Common();
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		$url = "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			preg_match('/([A-Z]{3})/',$flight[3][0],$DepartureAirportIataMatch);
-			preg_match('/([A-Z]{3})/',$flight[21][0],$ArrivalAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[3][0], $DepartureAirportIataMatch);
+			preg_match('/([A-Z]{3})/', $flight[21][0], $ArrivalAirportIataMatch);
 			$DepartureAirportIata = $DepartureAirportIataMatch[0];
 			$ArrivalAirportIata = $ArrivalAirportIataMatch[0];
 			$departureTime = $flight[5][1];
 			$arrivalTime = $flight[23][1];
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_vietnamairlines');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_vietnamairlines');
 		}
 		return array();
 	}
@@ -838,16 +838,16 @@ 
 	* @param String $carrier airline code
 	* @return array Flight departure and arrival airports and time
 	*/
-	private function getAirBerlin($callsign, $date = 'NOW',$carrier = 'AB') {
+	private function getAirBerlin($callsign, $date = 'NOW', $carrier = 'AB') {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		//AB = airberlin, HG/NLY = NIKI, 4T/BHP = Belair 
-		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
+		$numvol = preg_replace('/^[A-Z]*/', '', $callsign);
 		$check_date = new Datetime($date);
-		$url= "http://www.airberlin.com/en-US/site/aims.php";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
-		$post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier);
-		$data = $Common->getData($url,'post',$post);
+		$url = "http://www.airberlin.com/en-US/site/aims.php";
+		if (!filter_var($numvol, FILTER_VALIDATE_INT)) return array();
+		$post = array('type' => 'departure', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => $carrier);
+		$data = $Common->getData($url, 'post', $post);
 		//echo $data;
 		$DepartureAirportIata = '';
 		$ArrivalAirportIata = '';
@@ -860,8 +860,8 @@ 
 			if (isset($flight[5][2])) $departureAirport = $flight[5][2];
 			else $departureAirport = '';
 		} else return array();
-		$post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB');
-		$data = $Common->getData($url,'post',$post);
+		$post = array('type' => 'arrival', 'searchFlightNo' => '1', 'requestsent' => 'true', 'flightno' => $numvol, 'date' => $check_date->format('Y-m-d'), 'carrier' => 'AB');
+		$data = $Common->getData($url, 'post', $post);
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
@@ -889,7 +889,7 @@ 
 			}
 		}
 		if (isset($DepartureAirportIata)) {
-			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
+			return array('DepartureAirportIATA' => $DepartureAirportIata, 'DepartureTime' => $departureTime, 'ArrivalAirportIATA' => $ArrivalAirportIata, 'ArrivalTime' => $arrivalTime, 'Source' => 'website_airberlin');
 		} else return array();
 	}
 
@@ -899,7 +899,7 @@ 
 	 * @param String $date Date
 	 * @return array Schedules info
 	*/
-	public function fetchSchedule($ident,$date = 'NOW') {
+	public function fetchSchedule($ident, $date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch, $globalOffline, $globalFlightAwareUsername;
 		//$Common = new Common();
 		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) return array();
@@ -969,7 +969,7 @@ 
 				// Brussels Airlines
 				case "BEL":
 				case "SN":
-					return $this->getBrussels($ident,$date);
+					return $this->getBrussels($ident, $date);
 /*
 				// Copa Airlines
 				case "CMP":
@@ -1068,7 +1068,7 @@ 
 				case "DS":
 				case "EZY":
 				case "EZS":
-					return $this->getEasyJet($ident,$date);
+					return $this->getEasyJet($ident, $date);
 				// Ryanair
 				case "FR":
 				case "RYR":
@@ -1120,19 +1120,19 @@ 
 					return $this->getIberia($ident);
 				// Vietnam Airlines
 				case "HVN":
-					return $this->getVietnamAirlines($ident,$date);
+					return $this->getVietnamAirlines($ident, $date);
 				// Air Berlin
 				case "AB":
 				case "BER":
-					return $this->getAirBerlin($ident,$date,'AB');
+					return $this->getAirBerlin($ident, $date, 'AB');
 				// NIKI
 				case "HG":
 				case "NLY":
-					return $this->getAirBerlin($ident,$date,'HG');
+					return $this->getAirBerlin($ident, $date, 'HG');
 				// BelAir
 				case "4T":
 				case "BHP":
-					return $this->getAirBerlin($ident,$date,'4T');
+					return $this->getAirBerlin($ident, $date, '4T');
 				default:
 					if (strlen($airline_icao) == 3) {
 						$Spotter = new Spotter($this->db);
@@ -1141,9 +1141,9 @@ 
 					}
 					// Randomly use a generic function to get hours
 					if (strlen($airline_icao) == 2) {
-						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightaware');
+						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightaware');
 						if (count($globalSchedulesSources) > 0) {
-							$rand = mt_rand(0,count($globalSchedulesSources)-1);
+							$rand = mt_rand(0, count($globalSchedulesSources) - 1);
 							$source = $globalSchedulesSources[$rand];
 							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
 							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);

Braces +180 added lines, -62 removed lines

@@ -24,7 +24,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection.');
+		if ($this->db === null) {
+			die('Error: No DB connection.');
+		}
 	}
 
     /**
@@ -141,7 +143,9 @@ 
 		$sth->closeCursor();
 		if (is_array($row) && count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/*
@@ -182,7 +186,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.airfrance.fr/cgi-bin/AF/FR/fr/local/resainfovol/infovols/detailsVolJson.do?codeCompagnie[0]=".$carrier."&numeroVol[0]=".$numvol."&dayFlightDate=".$check_date->format('d')."&yearMonthFlightDate=".$check_date->format('Ym');
 		$json = $Common->getData($url);
 		var_dump($json);
@@ -209,7 +215,9 @@ 
 			*/
 		
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airfrance');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -224,7 +232,9 @@ 
 		date_default_timezone_set($globalTimezone);
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.easyjet.com/ft/api/flights?date=".$check_date->format('Y-m-d')."&fn=".$callsign;
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -237,7 +247,9 @@ 
 			$arrivalTime = $parsed_json->{'flights'}[0]->{'dates'}->{'fsta'};
 
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_easyjet');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -248,7 +260,9 @@ 
 	private function getRyanair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.ryanair.com/fr/api/2/flight-info/0/50/";
 		$post = '{"flight":"'.$numvol.'","minDepartureTime":"00:00","maxDepartureTime":"23:59"}';
 		$headers = array('Content-Type: application/json','Content-Length: ' . strlen($post));
@@ -262,8 +276,12 @@ 
 				$departureTime = $parsed_json->{'flightInfo'}[0]->{'departureTime'};
 				$arrivalTime = $parsed_json->{'flightInfo'}[0]->{'arrivalTime'};
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime, 'Source' => 'website_ryanair');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -274,7 +292,9 @@ 
 	private function getSwiss($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.world-of-swiss.com/fr/routenetwork.json";
 		$json = $Common->getData($url);
 		$parsed_json = json_decode($json);
@@ -294,8 +314,12 @@ 
 			}
 			if (isset($DepartureAirportIata) && isset($ArrivalAirportIata)) {
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_swiss');
-			} else return array();
-		} else return array();
+			} else {
+				return array();
+			}
+		} else {
+			return array();
+		}
 	}
 	
 	/**
@@ -309,12 +333,18 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalBritishAirwaysKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalBritishAirwaysKey == '') {
+			return array();
+		}
 		$url = "https://api.ba.com/rest-v1/v1/flights;flightNumber=".$numvol.";scheduledDepartureDate=".$check_date->format('Y-m-d').".json";
 		$headers = array('Client-Key: '.$globalBritishAirwaysKey);
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$flights = $parsed_json->{'FlightsResponse'};
 		if (count($flights) > 0) {
@@ -323,7 +353,9 @@ 
 			$departureTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledDepartureDateTime'}));
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightsResponse'}->{'Flight'}->{'Sector'}->{'ScheduledArrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_britishairways');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -337,19 +369,27 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if (!isset($globalLufthansaKey) || $globalLufthansaKey == '' || !isset($globalLufthansaKey['key']) || $globalLufthansaKey['key'] == '') {
+			return array();
+		}
 		$url = "https://api.lufthansa.com/v1/oauth/token";
 		$post = array('client_id' => $globalLufthansaKey['key'],'client_secret' => $globalLufthansaKey['secret'],'grant_type' => 'client_credentials');
 		$data = $Common->getData($url,'post',$post);
 		$parsed_data = json_decode($data);
-		if (!isset($parsed_data->{'access_token'})) return array();
+		if (!isset($parsed_data->{'access_token'})) {
+			return array();
+		}
 		$token = $parsed_data->{'access_token'};
 		
 		$url = "https://api.lufthansa.com/v1/operations/flightstatus/LH".$numvol."/".$check_date->format('Y-m-d');
 		$headers = array('Authorization: Bearer '.$token,'Accept: application/json');
 		$json = $Common->getData($url,'get','',$headers);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		if (isset($parsed_json->{'FlightStatusResource'}) && count($parsed_json->{'FlightStatusResource'}) > 0) {
 			$DepartureAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Departure'}->{'AirportCode'};
@@ -357,7 +397,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'AirportCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'FlightStatusResource'}->{'Flights'}->{'Flight'}->{'Arrival'}->{'ScheduledTimeLocal'}->{'DateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_lufthansa');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -371,14 +413,20 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = sprintf('%04d',preg_replace('/^[A-Z]*/','',$callsign));
-		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) return array();
-		if ($globalTransaviaKey == '') return array();
+		if (!filter_var(preg_replace('/^[A-Z]*/','',$callsign),FILTER_VALIDATE_INT)) {
+			return array();
+		}
+		if ($globalTransaviaKey == '') {
+			return array();
+		}
 		$url = "https://tst.api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		//$url = "https://api.transavia.com/v1/flightstatus/departuredate/".$check_date->format('Ymd').'/flightnumber/HV'.$numvol;
 		$headers = array('apikey: '.$globalTransaviaKey);
 		$json = $Common->getData($url,'get','',$headers);
 		//echo 'result : '.$json;
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		
 		if (isset($parsed_json->{'data'}[0])) {
@@ -387,7 +435,9 @@ 
 			$ArrivalAirportIata = $parsed_json->{'data'}[0]->{'flight'}->{'arrivalAirport'}->{'locationCode'};
 			$arrivalTime = date('H:i',strtotime($parsed_json->{'data'}[0]->{'flight'}->{'arrivalDateTime'}));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_transavia');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -398,7 +448,9 @@ 
 	public function getTunisair($callsign) {
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.tunisair.com/site/publish/module/Volj/fr/Flight_List.asp";
 		$data = $Common->getData($url);
 		$table = $Common->table2array($data);
@@ -420,7 +472,9 @@ 
 		$Common = new Common();
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$final_date = str_replace('/','%2F',$check_date->format('d/m/Y'));
 		$url = "http://www.vueling.com/Base/BaseProxy/RenderMacro/?macroalias=FlightStatusResult&searchBy=bycode&date=".$final_date."&flightNumber=".$numvol."&idioma=en-GB";
 		$data = $Common->getData($url);
@@ -430,8 +484,11 @@ 
 			$DepartureAirportIata = str_replace('flightOri=','',$result[0]);
 			preg_match('/flightDest=[A-Z]{3}/',$data,$result);
 			$ArrivalAirportIata = str_replace('flightDest=','',$result[0]);
-			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
-			else return array();
+			if ($DepartureAirportIata != '' && $ArrivalAirportIata != '') {
+				return array('DepartureAirportIATA' => $DepartureAirportIata,'ArrivalAirportIATA' => $ArrivalAirportIata,'Source' => 'website_vueling');
+			} else {
+				return array();
+			}
 		}
 		return array();
 	}
@@ -446,7 +503,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "https://www.iberia.com/web/flightDetail.do";
 		$post = array('numvuelo' => $numvol,'fecha' => $check_date->format('Ymd'),'airlineID' => 'IB');
 		$data = $Common->getData($url,'post',$post);
@@ -463,7 +522,9 @@ 
 				$arrivalTime = trim(str_replace(' lunes','',str_replace(' ','',$flight[5][1])));
 				if ($arrivalTime == 'Hora estimada de llegada') {
 					$arrivalTime = substr(trim(str_replace(' lunes','',str_replace(' ','',$flight[5][2]))),0,5);
-				} else $arrivalTime = substr($arrivalTime,0,5);
+				} else {
+					$arrivalTime = substr($arrivalTime,0,5);
+				}
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_iberia');
 			}
 		}
@@ -482,7 +543,9 @@ 
 		$Common = new Common();
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$url = "http://www.staralliance.com/flifoQueryAction.do?myAirline=&airlineCode=".$carrier."&flightNo=".$numvol."&day=".$check_date->format('d')."&month=".$check_date->format('m')."&year=".$check_date->format('Y')."&departuredate=".$check_date->format('d-M-Y');
 		$data = $Common->getData($url);
 		if ($data != '') {
@@ -498,7 +561,9 @@ 
 					$departureTime = substr(trim(str_replace('Scheduled: ','',$flight[29][0])),0,5);
 					$arrivalTime = substr(trim(str_replace('Scheduled: ','',$flight[29][1])),0,5);
 					return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_staralliance');
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 			
 
@@ -518,7 +583,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://booking.alitalia.com/FlightStatus/fr_fr/FlightInfo?Brand=az&NumeroVolo=".$numvol."&DataCompleta=".$check_date->format('d/m/Y');
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->text2array($data);
@@ -543,7 +610,9 @@ 
 		$check_date = new Datetime($date);
 		$url= "http://www.brusselsairlines.com/api/flightstatus/getresults?from=NA&to=NA&date=".$check_date->format('d/m/Y')."&hour=NA&lookup=flightnumber&flightnumber=".$numvol."&publicationID=302";
 		//http://www.brusselsairlines.com/fr-fr/informations-pratiques/statut-de-votre-vol/resultat.aspx?flightnumber=".$numvol."&date=".$check_date->format('d/m/Y')."&lookup=flightnumber";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 		    //echo $data;
@@ -634,7 +703,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://www.flytap.com/France/fr/PlanifierEtReserver/Outils/DepartsEtArrivees";
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('arrivalsdepartures_content' => 'number','arrivalsdepartures_tp' => $numvol,'arrivalsdepartures_trk' => 'ARR','arrivalsdepartures_date_trk' => '1','aptCode' => '','arrivalsdepartures' => 'DEP','arrivalsdepartures_date' => '1','aptCodeFrom' => '','aptCodeTo' => '','arrivalsdepartures2' => 'DEP','arrivalsdepartures_date2' => '1');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -666,11 +737,15 @@ 
 				$airline_icao = substr($callsign, 0, 3);
 			} 
 		}
-		if ($airline_icao == '') return array();
+		if ($airline_icao == '') {
+			return array();
+		}
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://info.flightmapper.net/flight/".$airline_icao.'_'.$numvol;
 		//$check_date = new Datetime($date);
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -763,10 +838,16 @@ 
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			if (isset($table[11][1])) {
-				if (is_numeric(substr($table[11][1],0,1))) $departureTime = substr($table[11][1],0,5);
-				else $departureTime = '';
-				if (is_numeric(substr($table[17][1],0,1))) $arrivalTime = substr($table[17][1],0,5);
-				else $arrivalTime = '';
+				if (is_numeric(substr($table[11][1],0,1))) {
+					$departureTime = substr($table[11][1],0,5);
+				} else {
+					$departureTime = '';
+				}
+				if (is_numeric(substr($table[17][1],0,1))) {
+					$arrivalTime = substr($table[17][1],0,5);
+				} else {
+					$arrivalTime = '';
+				}
 				$DepartureAirportIata = substr($table[13][1],0,3);
 				$ArrivalAirportIata = substr($table[15][1],0,3);
 				return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_costtotravel');
@@ -783,16 +864,22 @@ 
 	*/
 	private function getAirCanada($callsign,$date = 'NOW') {
 		$Common = new Common();
-		if (class_exists("DomDocument") === FALSE) return array();
+		if (class_exists("DomDocument") === FALSE) {
+			return array();
+		}
 		date_default_timezone_set('UTC');
 		$check_date = new Datetime($date);
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$url= "http://services.aircanada.com/portal/rest/getFlightsByFlightNumber?forceTimetable=true&flightNumber=".$numvol."&carrierCode=AC&date=".$check_date->format('m-d-Y')."&app_key=AE919FDCC80311DF9BABC975DFD72085&cache=74249";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		$dom = new DomDocument();
 		$dom->loadXML($data);
-		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) return array();
+		if ($dom->getElementsByTagName('DepartureStationInfo')->length == 0) {
+			return array();
+		}
 		$departure = $dom->getElementsByTagName('DepartureStationInfo')->item(0);
 		if (isset($departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue)) {
 			$DepartureAirportIata = $departure->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
@@ -801,7 +888,9 @@ 
 			$ArrivalAirportIata = $arrival->getElementsByTagName('Airport')->item(0)->firstChild->nodeValue;
 			$arrivalTime = date('H:i',strtotime($arrival->getElementsByTagName('ScheduledTime')->item(0)->firstChild->nodeValue));
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_aircanada');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -815,7 +904,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "https://cat.sabresonicweb.com/SSWVN/meridia?posid=VNVN&page=flifoFlightInfoDetailsMessage_learn&action=flightInfoDetails&airline=VN&language=fr&depDay=".$check_date->format('j')."&depMonth=".strtoupper($check_date->format('M'))."&=&flight=".$numvol."&";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$data = $Common->getData($url);
 		if ($data != '') {
 			$table = $Common->table2array($data);
@@ -845,7 +936,9 @@ 
 		$numvol = preg_replace('/^[A-Z]*/','',$callsign);
 		$check_date = new Datetime($date);
 		$url= "http://www.airberlin.com/en-US/site/aims.php";
-		if (!filter_var($numvol,FILTER_VALIDATE_INT)) return array();
+		if (!filter_var($numvol,FILTER_VALIDATE_INT)) {
+			return array();
+		}
 		$post = array('type' => 'departure','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => $carrier);
 		$data = $Common->getData($url,'post',$post);
 		//echo $data;
@@ -855,11 +948,19 @@ 
 		if ($data != '') {
 			$table = $Common->table2array($data);
 			$flight = $table;
-			if (isset($flight[5][4])) $departureTime = $flight[5][4];
-			else $departureTime = '';
-			if (isset($flight[5][2])) $departureAirport = $flight[5][2];
-			else $departureAirport = '';
-		} else return array();
+			if (isset($flight[5][4])) {
+				$departureTime = $flight[5][4];
+			} else {
+				$departureTime = '';
+			}
+			if (isset($flight[5][2])) {
+				$departureAirport = $flight[5][2];
+			} else {
+				$departureAirport = '';
+			}
+		} else {
+			return array();
+		}
 		$post = array('type' => 'arrival','searchFlightNo' => '1','requestsent' => 'true', 'flightno' => $numvol,'date' => $check_date->format('Y-m-d'),'carrier' => 'AB');
 		$data = $Common->getData($url,'post',$post);
 		if ($data != '') {
@@ -872,10 +973,14 @@ 
 			    $arrivalTime = '';
 			    $arrivalAirport = '';
 			}
-		} else return array();
+		} 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';
 		$json = $Common->getData($url);
-		if ($json == '') return array();
+		if ($json == '') {
+			return array();
+		}
 		$parsed_json = json_decode($json);
 		$airports = $parsed_json->{'suggestList'};
 		if (count($airports) > 0) {
@@ -890,7 +995,9 @@ 
 		}
 		if (isset($DepartureAirportIata)) {
 			return array('DepartureAirportIATA' => $DepartureAirportIata,'DepartureTime' => $departureTime,'ArrivalAirportIATA' => $ArrivalAirportIata,'ArrivalTime' => $arrivalTime,'Source' => 'website_airberlin');
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/*
@@ -902,7 +1009,9 @@ 
 	public function fetchSchedule($ident,$date = 'NOW') {
 		global $globalSchedulesSources, $globalSchedulesFetch, $globalOffline, $globalFlightAwareUsername;
 		//$Common = new Common();
-		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) return array();
+		if ($globalSchedulesFetch === FALSE || (isset($globalOffline) && $globalOffline === TRUE)) {
+			return array();
+		}
 		$airline_icao = '';
 		if (!is_numeric(substr($ident, 0, 3)))
 		{
@@ -1137,18 +1246,27 @@ 
 					if (strlen($airline_icao) == 3) {
 						$Spotter = new Spotter($this->db);
 						$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
-						if (isset($airline_info[0]['iata'])) $airline_icao = $airline_info[0]['iata'];
+						if (isset($airline_info[0]['iata'])) {
+							$airline_icao = $airline_info[0]['iata'];
+						}
 					}
 					// Randomly use a generic function to get hours
 					if (strlen($airline_icao) == 2) {
-						if (!isset($globalSchedulesSources)) $globalSchedulesSources = array('flightmapper','costtotravel','flightaware');
+						if (!isset($globalSchedulesSources)) {
+							$globalSchedulesSources = array('flightmapper','costtotravel','flightaware');
+						}
 						if (count($globalSchedulesSources) > 0) {
 							$rand = mt_rand(0,count($globalSchedulesSources)-1);
 							$source = $globalSchedulesSources[$rand];
-							if ($source == 'flightmapper') return $this->getFlightMapper($ident);
-							elseif ($source == 'costtotravel') return $this->getCostToTravel($ident);
+							if ($source == 'flightmapper') {
+								return $this->getFlightMapper($ident);
+							} elseif ($source == 'costtotravel') {
+								return $this->getCostToTravel($ident);
+							}
 							//elseif ($source == 'flightradar24') return $this->getFlightRadar24($ident,$date);
-							elseif ($source == 'flightaware' && $globalFlightAwareUsername != '') return $this->getFlightAware($ident);
+							elseif ($source == 'flightaware' && $globalFlightAwareUsername != '') {
+								return $this->getFlightAware($ident);
+							}
 						}
 					}
 			}

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 {

Spacing +55 added lines, -55 removed lines

@@ -42,20 +42,20 @@ 
 	* @param String $date get data for a date
 	* @return array Return Accidents data in array
 	*/
-	public function getAccidentData($limit = '',$type = '',$date = '') {
+	public function getAccidentData($limit = '', $type = '', $date = '') {
 		global $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 		$Translation = new Translation($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		date_default_timezone_set('UTC');
 		$result = array();
 		$limit_query = '';
 		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[1]." OFFSET ".$limit_array[0];
@@ -64,29 +64,29 @@ 
 
 		if ($type != '') {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':date' => $date);
-				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) {
+					$query_values = array(':type' => $type, ':date' => $date);
+				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-					$query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31');
-				} elseif (preg_match("/^[0-9]{4}$/",$date)) {
+					$query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31');
+				} elseif (preg_match("/^[0-9]{4}$/", $date)) {
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					}
-					$query_values = array(':type' => $type,':date' => $date);
+					$query_values = array(':type' => $type, ':date' => $date);
 				} else {
 					$date = $date.'%';
 					if ($globalDBdriver == 'mysql') {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					} else {
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 						//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
-						$query_values = array(':type' => $type,':date' => $date);
+						$query_values = array(':type' => $type, ':date' => $date);
 					}
 				}
 			} else {
@@ -97,7 +97,7 @@ 
 			}
 		} else {
 			if ($date != '') {
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
 				} else {
@@ -116,18 +116,18 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return array();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
-			if (preg_match('/^[\w\-]+$/',$row['registration'])) {
+			if (preg_match('/^[\w\-]+$/', $row['registration'])) {
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+					else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -135,7 +135,7 @@ 
 						$data['aircraft_name'] = $aircraft_info[0]['type'];
 						$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
 					} else {
-						$data = array_merge($data,array('aircraft_type' => 'NA'));
+						$data = array_merge($data, array('aircraft_type' => 'NA'));
 					}
 					$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
 					if (!empty($owner_data)) {
@@ -143,18 +143,18 @@ 
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 				if ($row['registration'] == '') $row['registration'] = 'NA';
 				if ($row['ident'] == '') $row['ident'] = 'NA';
-				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
+				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
 				if (isset($identicao[0])) {
-					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+					if (substr($row['ident'], 0, 2) == 'AF') {
+						if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+						else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+					$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 				} else $icao = $row['ident'];
-				$icao = $Translation->checkTranslation($icao,false);
+				$icao = $Translation->checkTranslation($icao, false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 					//echo 'Check airline info... for '.$row['airline_name'].' ';
@@ -163,16 +163,16 @@ 
 					if (!empty($airline_info)) {
 						//echo 'data found !'."\n";
 						//print_r($airline_info);
-						$data = array_merge($data,$airline_info);
+						$data = array_merge($data, $airline_info);
 					} 
 					//else echo 'No data...'."\n";
 				}
-				$data = array_merge($row,$data);
+				$data = array_merge($row, $data);
 				if ($data['ident'] == null) $data['ident'] = $icao;
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
 				} else $data['message'] = strtolower($data['title']);
-				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
+				$ids = $Spotter->getAllIDByRegistration($data['registration'], true);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
 					$data['spotted'] = TRUE;
@@ -204,7 +204,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 			return array();
 		}
@@ -225,7 +225,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "Error : ".$e->getMessage();
 			return array();
 		}
@@ -241,15 +241,15 @@ 
 		if ($globalDebug) echo 'Import '.$file."\n";
 		$result = array();
 		if (file_exists($file)) {
-			if (($handle = fopen($file,'r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
+			if (($handle = fopen($file, 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
 					}
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
+			if (!empty($result)) $this->add($result, true);
 			elseif ($globalDebug) echo 'Nothing to import';
 		}
 	}
@@ -265,8 +265,8 @@ 
 		$all_md5_new = array();
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
 			if ($this->check_accidents_nb() > 0) {
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 						if (isset($data[1])) {
 							$year = $data[0];
 							$all_md5[$year] = $data[1];
@@ -276,10 +276,10 @@ 
 				}
 			}
 		}
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
 					if (isset($data[1])) {
 						$year = $data[0];
 						$all_md5_new[$year] = $data[1];
@@ -288,10 +288,10 @@ 
 				fclose($handle);
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
 		foreach ($result as $file => $md5) {
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
 		}
@@ -301,7 +301,7 @@ 
 	* Add data to DB
 	* @param Array $crash An array with accidents/incidents data
 	*/
-	public function add($crash,$new = false) {
+	public function add($crash, $new = false) {
 		global $globalTransaction, $globalDebug, $globalAircraftImageFetch;
 		require_once('class.Connection.php');
 		require_once('class.Image.php');
@@ -317,7 +317,7 @@ 
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
 		if ($globalTransaction) $Connection->db->beginTransaction();
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
@@ -330,15 +330,15 @@ 
 				$cr = array_map(function($value) {
 					return $value === "" ? NULL : $value;
 				}, $cr);
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetchAll(PDO::FETCH_ASSOC);
 					if ($result_check[0]['nb'] == 0) {
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
 						$sth->execute($query_values);
-						if ($cr['date'] > time()-(30*86400)) {
+						if ($cr['date'] > time() - (30*86400)) {
 							if ($globalAircraftImageFetch) {
 								$imgchk = $Image->getSpotterImage($cr['registration']);
 								if (empty($imgchk)) {
@@ -349,17 +349,17 @@ 
 								// elseif ($globalDebug) echo 'Image already in DB'."\n";
 							}
 							if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
-							$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
+							$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
 						}
 					}
 				}
-				if ($globalTransaction && $j % 1000 == 0) {
+				if ($globalTransaction && $j%1000 == 0) {
 					$Connection->db->commit();
 					$Connection->db->beginTransaction();
 				}
 			}
 			if ($globalTransaction) $Connection->db->commit();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalTransaction) $Connection->db->rollBack();
 			echo $e->getMessage();
 		}
@@ -377,7 +377,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -399,7 +399,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -418,7 +418,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return '';

Braces +87 added lines, -31 removed lines

@@ -20,7 +20,9 @@ 
 	public function __construct($dbc = null) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (Accident)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (Accident)');
+		}
 	}
 
 	/*
@@ -126,8 +128,11 @@ 
 				$data = array();
 				if ($row['registration'] != '') {
 					$image_array = $Image->getSpotterImage($row['registration']);
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					if (count($image_array) > 0) {
+						$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+					} else {
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+					}
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
 					if (!empty($aircraft_info)) {
@@ -143,17 +148,30 @@ 
 						$data['aircraft_base'] = $owner_data['base'];
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
 					}
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-				if ($row['registration'] == '') $row['registration'] = 'NA';
-				if ($row['ident'] == '') $row['ident'] = 'NA';
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+				if ($row['registration'] == '') {
+					$row['registration'] = 'NA';
+				}
+				if ($row['ident'] == '') {
+					$row['ident'] = 'NA';
+				}
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
 				if (isset($identicao[0])) {
 					if (substr($row['ident'],0,2) == 'AF') {
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+							$icao = $row['ident'];
+						} else {
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+						}
+					} else {
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					}
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-				} else $icao = $row['ident'];
+				} else {
+					$icao = $row['ident'];
+				}
 				$icao = $Translation->checkTranslation($icao,false);
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -168,10 +186,14 @@ 
 					//else echo 'No data...'."\n";
 				}
 				$data = array_merge($row,$data);
-				if ($data['ident'] == null) $data['ident'] = $icao;
+				if ($data['ident'] == null) {
+					$data['ident'] = $icao;
+				}
 				if ($data['title'] == null) {
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
-				} else $data['message'] = strtolower($data['title']);
+				} else {
+					$data['message'] = strtolower($data['title']);
+				}
 				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
 				$date = $data['date'];
 				if (isset($ids[$date])) {
@@ -190,8 +212,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/*
@@ -238,7 +261,9 @@ 
 	*/
 	public function import($file) {
 		global $globalDebug;
-		if ($globalDebug) echo 'Import '.$file."\n";
+		if ($globalDebug) {
+			echo 'Import '.$file."\n";
+		}
 		$result = array();
 		if (file_exists($file)) {
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -249,8 +274,11 @@ 
 				}
 				fclose($handle);
 			}
-			if (!empty($result)) $this->add($result,true);
-			elseif ($globalDebug) echo 'Nothing to import';
+			if (!empty($result)) {
+				$this->add($result,true);
+			} elseif ($globalDebug) {
+				echo 'Nothing to import';
+			}
 		}
 	}
 
@@ -286,14 +314,23 @@ 
 					}
 				}
 				fclose($handle);
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+			} elseif ($globalDebug) {
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
+			}
+		} elseif ($globalDebug) {
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
+		}
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
+		if (empty($result) && $globalDebug) {
+			echo 'Nothing to update';
+		}
 		foreach ($result as $file => $md5) {
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
+			} elseif ($globalDebug) {
+				echo 'Download '.$file.' failed';
+			}
 		}
 	}
 
@@ -310,13 +347,17 @@ 
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
 
-		if (empty($crash)) return false;
+		if (empty($crash)) {
+			return false;
+		}
 		if ($new === false) {
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
 			$sthd = $Connection->db->prepare($query_delete);
 			$sthd->execute(array(':source' => $crash[0]['source']));
 		}
-		if ($globalTransaction) $Connection->db->beginTransaction();
+		if ($globalTransaction) {
+			$Connection->db->beginTransaction();
+		}
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
 		$sth_check = $Connection->db->prepare($query_check);
@@ -331,7 +372,9 @@ 
 					return $value === "" ? NULL : $value;
 				}, $cr);
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					if (strpos($cr['registration'],'-') === FALSE) {
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
+					}
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
 					$sth_check->execute($query_check_values);
 					$result_check = $sth_check->fetchAll(PDO::FETCH_ASSOC);
@@ -342,13 +385,19 @@ 
 							if ($globalAircraftImageFetch) {
 								$imgchk = $Image->getSpotterImage($cr['registration']);
 								if (empty($imgchk)) {
-									if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
+									if ($globalDebug) {
+										echo "\t".'Get image for '.$cr['registration'].'...';
+									}
 									$Image->addSpotterImage($cr['registration']);
-									if ($globalDebug) echo "\t".'Done'."\n";
+									if ($globalDebug) {
+										echo "\t".'Done'."\n";
+									}
 								}
 								// elseif ($globalDebug) echo 'Image already in DB'."\n";
 							}
-							if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
+							if ($cr['title'] == '') {
+								$cr['title'] = $cr['registration'].' '.$cr['type'];
+							}
 							$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
 						}
 					}
@@ -358,9 +407,13 @@ 
 					$Connection->db->beginTransaction();
 				}
 			}
-			if ($globalTransaction) $Connection->db->commit();
+			if ($globalTransaction) {
+				$Connection->db->commit();
+			}
 		} catch(PDOException $e) {
-			if ($globalTransaction) $Connection->db->rollBack();
+			if ($globalTransaction) {
+				$Connection->db->rollBack();
+			}
 			echo $e->getMessage();
 		}
 		$sth_check->closeCursor();
@@ -403,8 +456,11 @@ 
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
     /**

require/class.ACARS.php

Indentation +90 added lines, -90 removed lines

@@ -32,11 +32,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) {
 		if (substr($ident,0,2) == 'AF') {
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -52,11 +52,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the live table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the live table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveAcarsData()
 	{
 		global $globalDBdriver;
@@ -76,11 +76,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the archive table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the archive table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteArchiveAcarsData()
 	{
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -100,13 +100,13 @@ 
 	}
 
 
-    /**
-     * Parse ACARS data
-     *
-     * @param String ACARS data in acarsdec data
-     *
-     * @return array
-     */
+	/**
+	 * Parse ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 * @return array
+	 */
 	public function parse($data) {
 		global $globalDebug;
 		//$Image = new Image($this->db);
@@ -736,11 +736,11 @@ 
 	}
 
 	/**
-	* Add ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Add ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	public function add($data,$message = array()) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -787,18 +787,18 @@ 
 		}
 	}
 
-    /**
-     * Add Live ACARS data in DB
-     *
-     * @param String $ident ident
-     * @param String $registration Registration of the aircraft
-     * @param String $label Label of the ACARS message
-     * @param String $block_id Block id of the ACARS message
-     * @param String $msg_no Number of the ACARS message
-     * @param String $message ACARS message
-     * @param string $decode
-     * @return bool
-     */
+	/**
+	 * Add Live ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 * @param string $decode
+	 * @return bool
+	 */
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -836,18 +836,18 @@ 
 		return false;
 	}
 
-    /**
-     * Add Archive ACARS data in DB
-     *
-     * @param String $ident ident
-     * @param String $registration Registration of the aircraft
-     * @param String $label Label of the ACARS message
-     * @param String $block_id Block id of the ACARS message
-     * @param String $msg_no Number of the ACARS message
-     * @param String $message ACARS message
-     * @param string $decode
-     * @return string
-     */
+	/**
+	 * Add Archive ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 * @param string $decode
+	 * @return string
+	 */
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -879,11 +879,11 @@ 
 	}
 
 	/**
-	* Get Message title from label from DB
-	*
-	* @param String $label
-	* @return String Return ACARS title
-	*/
+	 * Get Message title from label from DB
+	 *
+	 * @param String $label
+	 * @return String Return ACARS title
+	 */
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);
 		$this->db = $Connection->db;
@@ -902,10 +902,10 @@ 
 	}
 
 	/**
-	* List all Message title & label from DB
-	*
-	* @return array Return ACARS data in array
-	*/
+	 * List all Message title & label from DB
+	 *
+	 * @return array Return ACARS data in array
+	 */
 	public function getAllTitleLabel() {
 		$query = "SELECT * FROM acars_label ORDER BY title";
 		$query_values = array();
@@ -922,11 +922,11 @@ 
 	}
 
 	/**
-	* Get Live ACARS data from DB
-	*
-	* @param String $ident
-	* @return array Return ACARS data in array
-	*/
+	 * Get Live ACARS data from DB
+	 *
+	 * @param String $ident
+	 * @return array Return ACARS data in array
+	 */
 	public function getLiveAcarsData($ident) {
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
 		$query_values = array(':ident' => $ident);
@@ -942,13 +942,13 @@ 
 		else return array();
 	}
 
-    /**
-     * Get Latest ACARS data from DB
-     *
-     * @param string $limit
-     * @param string $label
-     * @return array Return ACARS data in array
-     */
+	/**
+	 * Get Latest ACARS data from DB
+	 *
+	 * @param string $limit
+	 * @param string $label
+	 * @return array Return ACARS data in array
+	 */
 	public function getLatestAcarsData($limit = '',$label = '') {
 		global $globalURL;
 		$Image = new Image($this->db);
@@ -1036,13 +1036,13 @@ 
 		else return array();
 	}
 
-    /**
-     * Get Archive ACARS data from DB
-     *
-     * @param string $limit
-     * @param string $label
-     * @return array Return ACARS data in array
-     */
+	/**
+	 * Get Archive ACARS data from DB
+	 *
+	 * @param string $limit
+	 * @param string $label
+	 * @return array Return ACARS data in array
+	 */
 	public function getArchiveAcarsData($limit = '',$label = '') {
 		global $globalURL;
 		$Image = new Image($this->db);
@@ -1131,17 +1131,17 @@ 
 		} else return array();
 	}
 
-    /**
-     * Add ModeS data to DB
-     *
-     * @param String $ident ident
-     * @param String $registration Registration of the aircraft
-     * @param String $icao
-     * @param String $ICAOTypeCode
-     * @param string $latitude
-     * @param string $longitude
-     * @return string
-     */
+	/**
+	 * Add ModeS data to DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $icao
+	 * @param String $ICAOTypeCode
+	 * @param string $latitude
+	 * @param string $longitude
+	 * @return string
+	 */
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);

Spacing +260 added lines, -260 removed lines

@@ -22,7 +22,7 @@ 
 	/*
 	 * Initialize DB connection
 	*/
-	public function __construct($dbc = null,$fromACARSscript = false) {
+	public function __construct($dbc = null, $fromACARSscript = false) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
 		if ($this->db === null) die('Error: No DB connection. (ACARS)');
@@ -39,14 +39,14 @@ 
 	* @return String the icao
 	*/
 	public function ident2icao($ident) {
-		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		if (substr($ident, 0, 2) == 'AF') {
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
 		} else {
 			$Spotter = new Spotter($this->db);
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
 			if (isset($identicao[0])) {
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
 			} else $icao = $ident;
 		}
 		return $icao;
@@ -70,7 +70,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -94,7 +94,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -120,15 +120,15 @@ 
 		$ident = '';
 		$message = '';
 		$result = array();
-		$n = sscanf($data,'%*[0-9a-z.] %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		$n = sscanf($data, '%*[0-9a-z.] %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0 || $message == '') $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0 || $message == '') $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0 || $message == '') $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0 || $message == '') $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0 || $message == '') $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
 		if ($n != 0 && ($registration != '' || $ident != '' || $label != '' || $block_id != '' || $msg_no != '')) {
-			$registration = str_replace('.','',$registration);
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
+			$registration = str_replace('.', '', $registration);
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
 		} else $message = $data;
 		$decode = array();
@@ -148,14 +148,14 @@ 
 				$temp = '';
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
-					$latitude = $la / 10000.0;
-					$longitude = $ln / 10000.0;
+					$latitude = $la/10000.0;
+					$longitude = $ln/10000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					// Temp not always available
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -167,19 +167,19 @@ 
 				$dhour = '';
 				$darr = '';
 				$ahour = '';
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
 				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+				elseif ($n == 2 || $n == 4) {
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
@@ -237,11 +237,11 @@ 
 				$ahour = '';
 				$aair = '';
 				$apiste = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -266,8 +266,8 @@ 
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$las = $las.'.'.$lass;
 					$lns = $lns.'.'.$lns;
-					$latitude = $las / 1000.0;
-					$longitude = $lns / 1000.0;
+					$latitude = $las/1000.0;
+					$longitude = $lns/1000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -362,17 +362,17 @@ 
 				$alt = '';
 				$fuel = '';
 				$speed = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
 				if ($n == 9) {
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
 					$decode['icao'] = $icao;
-					$latitude = $las / 100.0;
-					$longitude = $lns / 100.0;
+					$latitude = $las/100.0;
+					$longitude = $lns/100.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
 					$found = true;
 				}
 			}
@@ -391,7 +391,7 @@ 
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
 			}
@@ -424,7 +424,7 @@ 
 				$dair = '';
 				$darr = '';
 				$aident = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
@@ -456,7 +456,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -471,7 +471,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -481,7 +481,7 @@ 
 				}
 			}
 			if (!$found) {
-				$n = sscanf($message,'MET01%4c',$airport);
+				$n = sscanf($message, 'MET01%4c', $airport);
 				if ($n == 1) {
 					if ($globalDebug) echo 'airport name : '.$airport;
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -489,241 +489,241 @@ 
 				}
 			}
 			if ($label == 'H1') {
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
 				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
 				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
 				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
+				elseif (preg_match(':^#M1AAEP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
 				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
+				elseif (preg_match(':^#M2APWD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
 				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
 				}
-				elseif (preg_match(':^#CF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
+				elseif (preg_match(':^#CF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
 				}
-				elseif (preg_match(':^#DF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
+				elseif (preg_match(':^#DF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
 				}
-				elseif (preg_match(':^#EC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
+				elseif (preg_match(':^#EC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
 				}
-				elseif (preg_match(':^#EI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
+				elseif (preg_match(':^#EI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
 				}
-				elseif (preg_match(':^#H1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
+				elseif (preg_match(':^#H1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
 				}
-				elseif (preg_match(':^#H2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
+				elseif (preg_match(':^#H2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
 				}
-				elseif (preg_match(':^#HD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
+				elseif (preg_match(':^#HD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
 				}
-				elseif (preg_match(':^#M1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
+				elseif (preg_match(':^#M1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
 				}
-				elseif (preg_match(':^#M2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
+				elseif (preg_match(':^#M2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
 				}
-				elseif (preg_match(':^#M3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
+				elseif (preg_match(':^#M3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
 				}
-				elseif (preg_match(':^#MD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
+				elseif (preg_match(':^#MD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
 				}
-				elseif (preg_match(':^#PS:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
+				elseif (preg_match(':^#PS:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
 				}
-				elseif (preg_match(':^#S1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
+				elseif (preg_match(':^#S1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
 				}
-				elseif (preg_match(':^#S2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
+				elseif (preg_match(':^#S2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
 				}
-				elseif (preg_match(':^#SD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
+				elseif (preg_match(':^#SD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
 				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
+				elseif (preg_match(':^#T[0-8]:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
 				}
-				elseif (preg_match(':^#WO:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
+				elseif (preg_match(':^#WO:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
 				}
-				elseif (preg_match(':^#A1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#A1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#A3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
+				elseif (preg_match(':^#A3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
 				}
-				elseif (preg_match(':^#A4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
+				elseif (preg_match(':^#A4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
 				}
-				elseif (preg_match(':^#A6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
+				elseif (preg_match(':^#A6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
 				}
-				elseif (preg_match(':^#A8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
+				elseif (preg_match(':^#A8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#A9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
+				elseif (preg_match(':^#A9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
 				}
-				elseif (preg_match(':^#A0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
+				elseif (preg_match(':^#A0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
 				}
-				elseif (preg_match(':^#AA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#AA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#AB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
+				elseif (preg_match(':^#AB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#AC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
+				elseif (preg_match(':^#AC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
+				elseif (preg_match(':^#AD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
+				elseif (preg_match(':^#AF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
 				}
-				elseif (preg_match(':^#B1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#B1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
+				elseif (preg_match(':^#B2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
+				elseif (preg_match(':^#B3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
+				elseif (preg_match(':^#B4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
+				elseif (preg_match(':^#B6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
 				}
-				elseif (preg_match(':^#B8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
+				elseif (preg_match(':^#B8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#B9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
+				elseif (preg_match(':^#B9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
 				}
-				elseif (preg_match(':^#B0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
+				elseif (preg_match(':^#B0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
 				}
-				elseif (preg_match(':^#BA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#BA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#BB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
+				elseif (preg_match(':^#BB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#BC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
+				elseif (preg_match(':^#BC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
+				elseif (preg_match(':^#BD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BE:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
+				elseif (preg_match(':^#BE:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
 				}
-				elseif (preg_match(':^#BF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
+				elseif (preg_match(':^#BF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
 				}
-				elseif (preg_match(':^#H3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
+				elseif (preg_match(':^#H3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
 				}
 			}
 			if ($label == '10') {
-				if (preg_match(':^DTO01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
+				if (preg_match(':^DTO01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
 				}
-				elseif (preg_match(':^AIS01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
+				elseif (preg_match(':^AIS01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
 				}
-				elseif (preg_match(':^FTX01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
+				elseif (preg_match(':^FTX01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
 				}
-				elseif (preg_match(':^FPL01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
+				elseif (preg_match(':^FPL01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
 				}
-				elseif (preg_match(':^WAB01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
+				elseif (preg_match(':^WAB01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
 				}
-				elseif (preg_match(':^MET01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
+				elseif (preg_match(':^MET01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
 				}
-				elseif (preg_match(':^WAB02:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
+				elseif (preg_match(':^WAB02:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
 				}
 			}
 			if ($label == '15') {
-				if (preg_match(':^FST01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
+				if (preg_match(':^FST01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
 				}
 			}
 			if (!$found && $label == 'SA') {
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
 				if ($n == 4) {
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
 					}
 					elseif ($state == 'L') {
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
 					}
 					elseif ($type == 'S') {
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
 					}
 					elseif ($type == 'H') {
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
 					}
 					elseif ($type == 'G') {
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
 					}
 					elseif ($type == 'C') {
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
 					}
 					elseif ($type == '2') {
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
 					}
 					elseif ($type == 'X') {
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
 					}
 					elseif ($type == 'I') {
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
 					}
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
-					$decode = array_merge($vsta,$decode);
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
+					$decode = array_merge($vsta, $decode);
 				}
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
 			/*
 			// Business jets always use GS0001
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -744,21 +744,21 @@ 
 	* @param String ACARS data in acarsdec data
 	*
 	*/
-	public function add($data,$message = array()) {
+	public function add($data, $message = array()) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
 		$Schedule = new Schedule($this->db);
 		$Translation = new Translation($this->db);
 
-		$message = array_merge($message,$this->parse($data));
+		$message = array_merge($message, $this->parse($data));
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
-			$ident = (string)$message['ident'];
+			$ident = (string) $message['ident'];
 			$label = $message['label'];
 			$block_id = $message['block_id'];
 			$msg_no = $message['msg_no'];
 			$msg = $message['message'];
 			$decode = $message['decode'];
-			$registration = (string)$message['registration'];
+			$registration = (string) $message['registration'];
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
 			else $latitude = '';
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -772,20 +772,20 @@ 
 				$Image->addSpotterImage($registration);
 			}
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
 			if ($globalDebug && isset($info) && $info != '') echo $info;
 			if (count($decode) > 0) $decode_json = json_encode($decode);
 			else $decode_json = '';
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
 			}
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
 			if ($globalDebug && count($decode) > 0) {
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
 			}
 		}
 	}
@@ -802,7 +802,7 @@ 
      * @param string $decode
      * @return bool
      */
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -810,22 +810,22 @@ 
 			$this->db = $Connection->db;
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
 			try {
 				$stht = $this->db->prepare($query_test);
 				$stht->execute($query_test_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				echo "error : ".$e->getMessage();
 				return false;
 			}
 			if ($stht->fetchColumn() == 0) {
 				if ($globalDebug) echo "Add Live ACARS data...";
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					echo "error : ".$e->getMessage();
 					return false;
 				}
@@ -851,10 +851,10 @@ 
      * @param string $decode
      * @return string
      */
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
 			/*
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -869,11 +869,11 @@ 
 			*/
 			if ($globalDebug) echo "Add Live ACARS data...";
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($globalDebug) echo "Done\n";
@@ -895,7 +895,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return '';
 		}
@@ -915,7 +915,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return array();
 		}
@@ -936,7 +936,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return array();
 		}
@@ -952,7 +952,7 @@ 
      * @param string $label
      * @return array Return ACARS data in array
      */
-	public function getLatestAcarsData($limit = '',$label = '') {
+	public function getLatestAcarsData($limit = '', $label = '') {
 		global $globalURL;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -963,8 +963,8 @@ 
 		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[1]." OFFSET ".$limit_array[0];
@@ -980,7 +980,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return array();
 		}
@@ -988,39 +988,39 @@ 
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
-			$decode = json_decode($row['decode'],true);
+			$icao = $Translation->checkTranslation($icao, false);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1028,7 +1028,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1046,7 +1046,7 @@ 
      * @param string $label
      * @return array Return ACARS data in array
      */
-	public function getArchiveAcarsData($limit = '',$label = '') {
+	public function getArchiveAcarsData($limit = '', $label = '') {
 		global $globalURL;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -1056,8 +1056,8 @@ 
 		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[1]." OFFSET ".$limit_array[0];
@@ -1078,45 +1078,45 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			return array();
 		}
-		$i=0;
+		$i = 0;
 		$result = array();
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			$icao = '';
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
 			$icao = $Translation->checkTranslation($icao);
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1124,7 +1124,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1145,7 +1145,7 @@ 
      * @param string $longitude
      * @return string
      */
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
@@ -1158,7 +1158,7 @@ 
 			if ($globalDebug) echo "Ident or registration null, exit\n";
 			return '';
 		}
-		$registration = str_replace('.','',$registration);
+		$registration = str_replace('.', '', $registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1167,7 +1167,7 @@ 
 		try {
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1177,8 +1177,8 @@ 
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1186,7 +1186,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
@@ -1194,7 +1194,7 @@ 
 				$sth->closeCursor();
 				if (isset($result['modes'])) $hex = $result['modes'];
 				else $hex = '';
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
 				if ($this->fromACARSscript) $this->SI->add($SI_data);
 			}
 		}
@@ -1204,7 +1204,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1214,7 +1214,7 @@ 
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
 			else $ModeS = '';
 			if ($ModeS == '') {
-				$id = explode('-',$result['flightaware_id']);
+				$id = explode('-', $result['flightaware_id']);
 				$ModeS = $id[0];
 			}
 			if ($ModeS != '') {
@@ -1224,20 +1224,20 @@ 
 				try {
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
-				if (count($row) ==  0) {
+				if (count($row) == 0) {
 					if ($globalDebug) echo " Add to ModeS table - ";
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1245,15 +1245,15 @@ 
 					if ($globalDebug) echo " Update ModeS table - ";
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					} else {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
 					}
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1290,12 +1290,12 @@ 
 					elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
 				}
 				try {
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}

Braces +421 added lines, -265 removed lines

@@ -25,7 +25,9 @@ 
 	public function __construct($dbc = null,$fromACARSscript = false) {
 		$Connection = new Connection($dbc);
 		$this->db = $Connection->db();
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
+		if ($this->db === null) {
+			die('Error: No DB connection. (ACARS)');
+		}
 		if ($fromACARSscript) {
 			$this->fromACARSscript = true;
 			$this->SI = new SpotterImport($this->db);
@@ -40,14 +42,19 @@ 
 	*/
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$Spotter = new Spotter($this->db);
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -121,16 +128,30 @@ 
 		$message = '';
 		$result = array();
 		$n = sscanf($data,'%*[0-9a-z.] %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0 || $message == '') $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		if ($n == 0 || $message == '') {
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0 || $message == '') {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0 || $message == '') {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0 || $message == '') {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0 || $message == '') {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
 		if ($n != 0 && ($registration != '' || $ident != '' || $label != '' || $block_id != '' || $msg_no != '')) {
 			$registration = str_replace('.','',$registration);
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
-		} else $message = $data;
+			if ($globalDebug) {
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
+			}
+		} else {
+			$message = $data;
+		}
 		$decode = array();
 		$found = false;
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -150,12 +171,21 @@ 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$latitude = $la / 10000.0;
 					$longitude = $ln / 10000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 					// Temp not always available
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
+					}
+					if ($temp == '') {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
+					} else {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					}
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -169,25 +199,35 @@ 
 				$ahour = '';
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
+					if ($globalDebug) {
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
-				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+				} elseif ($n == 2 || $n  == 4) {
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($globalDebug) {
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
 					$found = true;
-				}
-				elseif ($n == 1) {
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
+				} elseif ($n == 1) {
+					if ($globalDebug) {
+						echo 'airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $darr);
@@ -205,7 +245,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -239,14 +281,23 @@ 
 				$apiste = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) {
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					}
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					if ($ahour == '') {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
+					} else {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					}
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode['icao'] = $icao;
 					$found = true;
@@ -268,9 +319,15 @@ 
 					$lns = $lns.'.'.$lns;
 					$latitude = $las / 1000.0;
 					$longitude = $lns / 1000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					}
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
@@ -288,7 +345,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -301,7 +360,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -314,7 +375,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
 				if ($n == 2) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -328,7 +391,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 6) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -341,7 +406,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 7) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -369,8 +436,12 @@ 
 					$decode['icao'] = $icao;
 					$latitude = $las / 100.0;
 					$longitude = $lns / 100.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
 					$found = true;
@@ -388,8 +459,12 @@ 
 				if ($n == 4) {
 					$latitude = $las;
 					$longitude = $lns;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
 					$found = true;
@@ -405,7 +480,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -426,7 +503,9 @@ 
 				$aident = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					$icao = trim($aident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode['icao'] = $icao;
@@ -443,7 +522,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -458,7 +539,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -473,7 +556,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -483,7 +568,9 @@ 
 			if (!$found) {
 				$n = sscanf($message,'MET01%4c',$airport);
 				if ($n == 1) {
-					if ($globalDebug) echo 'airport name : '.$airport;
+					if ($globalDebug) {
+						echo 'airport name : '.$airport;
+					}
 					$decode = array('Airport/Waypoint name' => $airport);
 					$found = true;
 				}
@@ -491,184 +578,126 @@ 
 			if ($label == 'H1') {
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
-				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
-				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
-				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
-				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
+				} elseif (preg_match(':^#M2APWD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
-				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
-				}
-				elseif (preg_match(':^#CF:',$message)) {
+				} elseif (preg_match(':^#CF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
-				}
-				elseif (preg_match(':^#DF:',$message)) {
+				} elseif (preg_match(':^#DF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
-				}
-				elseif (preg_match(':^#EC:',$message)) {
+				} elseif (preg_match(':^#EC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
-				}
-				elseif (preg_match(':^#EI:',$message)) {
+				} elseif (preg_match(':^#EI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
-				}
-				elseif (preg_match(':^#H1:',$message)) {
+				} elseif (preg_match(':^#H1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
-				}
-				elseif (preg_match(':^#H2:',$message)) {
+				} elseif (preg_match(':^#H2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
-				}
-				elseif (preg_match(':^#HD:',$message)) {
+				} elseif (preg_match(':^#HD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
-				}
-				elseif (preg_match(':^#M1:',$message)) {
+				} elseif (preg_match(':^#M1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
-				}
-				elseif (preg_match(':^#M2:',$message)) {
+				} elseif (preg_match(':^#M2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
-				}
-				elseif (preg_match(':^#M3:',$message)) {
+				} elseif (preg_match(':^#M3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
-				}
-				elseif (preg_match(':^#MD:',$message)) {
+				} elseif (preg_match(':^#MD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
-				}
-				elseif (preg_match(':^#PS:',$message)) {
+				} elseif (preg_match(':^#PS:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
-				}
-				elseif (preg_match(':^#S1:',$message)) {
+				} elseif (preg_match(':^#S1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
-				}
-				elseif (preg_match(':^#S2:',$message)) {
+				} elseif (preg_match(':^#S2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
-				}
-				elseif (preg_match(':^#SD:',$message)) {
+				} elseif (preg_match(':^#SD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
-				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
-				}
-				elseif (preg_match(':^#WO:',$message)) {
+				} elseif (preg_match(':^#WO:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
-				}
-				elseif (preg_match(':^#A1:',$message)) {
+				} elseif (preg_match(':^#A1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#A3:',$message)) {
+				} elseif (preg_match(':^#A3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
-				}
-				elseif (preg_match(':^#A4:',$message)) {
+				} elseif (preg_match(':^#A4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
-				}
-				elseif (preg_match(':^#A6:',$message)) {
+				} elseif (preg_match(':^#A6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
-				}
-				elseif (preg_match(':^#A8:',$message)) {
+				} elseif (preg_match(':^#A8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#A9:',$message)) {
+				} elseif (preg_match(':^#A9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
-				}
-				elseif (preg_match(':^#A0:',$message)) {
+				} elseif (preg_match(':^#A0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
-				}
-				elseif (preg_match(':^#AA:',$message)) {
+				} elseif (preg_match(':^#AA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#AB:',$message)) {
+				} elseif (preg_match(':^#AB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#AC:',$message)) {
+				} elseif (preg_match(':^#AC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AD:',$message)) {
+				} elseif (preg_match(':^#AD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AF:',$message)) {
+				} elseif (preg_match(':^#AF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
-				}
-				elseif (preg_match(':^#B1:',$message)) {
+				} elseif (preg_match(':^#B1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B2:',$message)) {
+				} elseif (preg_match(':^#B2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B3:',$message)) {
+				} elseif (preg_match(':^#B3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B4:',$message)) {
+				} elseif (preg_match(':^#B4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B6:',$message)) {
+				} elseif (preg_match(':^#B6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
-				}
-				elseif (preg_match(':^#B8:',$message)) {
+				} elseif (preg_match(':^#B8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#B9:',$message)) {
+				} elseif (preg_match(':^#B9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
-				}
-				elseif (preg_match(':^#B0:',$message)) {
+				} elseif (preg_match(':^#B0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
-				}
-				elseif (preg_match(':^#BA:',$message)) {
+				} elseif (preg_match(':^#BA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#BB:',$message)) {
+				} elseif (preg_match(':^#BB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#BC:',$message)) {
+				} elseif (preg_match(':^#BC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BD:',$message)) {
+				} elseif (preg_match(':^#BD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BE:',$message)) {
+				} elseif (preg_match(':^#BE:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
-				}
-				elseif (preg_match(':^#BF:',$message)) {
+				} elseif (preg_match(':^#BF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
-				}
-				elseif (preg_match(':^#H3:',$message)) {
+				} elseif (preg_match(':^#H3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
 				}
 			}
 			if ($label == '10') {
 				if (preg_match(':^DTO01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
-				}
-				elseif (preg_match(':^AIS01:',$message)) {
+				} elseif (preg_match(':^AIS01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
-				}
-				elseif (preg_match(':^FTX01:',$message)) {
+				} elseif (preg_match(':^FTX01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
-				}
-				elseif (preg_match(':^FPL01:',$message)) {
+				} elseif (preg_match(':^FPL01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
-				}
-				elseif (preg_match(':^WAB01:',$message)) {
+				} elseif (preg_match(':^WAB01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
-				}
-				elseif (preg_match(':^MET01:',$message)) {
+				} elseif (preg_match(':^MET01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
-				}
-				elseif (preg_match(':^WAB02:',$message)) {
+				} elseif (preg_match(':^WAB02:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
 				}
 			}
@@ -683,38 +712,28 @@ 
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
-					}
-					elseif ($state == 'L') {
+					} elseif ($state == 'L') {
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
-					}
-					elseif ($type == 'S') {
+					} elseif ($type == 'S') {
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
-					}
-					elseif ($type == 'H') {
+					} elseif ($type == 'H') {
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
-					}
-					elseif ($type == 'G') {
+					} elseif ($type == 'G') {
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
-					}
-					elseif ($type == 'C') {
+					} elseif ($type == 'C') {
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
-					}
-					elseif ($type == '2') {
+					} elseif ($type == '2') {
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
-					}
-					elseif ($type == 'X') {
+					} elseif ($type == 'X') {
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
-					}
-					elseif ($type == 'I') {
+					} elseif ($type == 'I') {
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
 					}
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -723,7 +742,9 @@ 
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') {
+				$decode = array_merge(array('Message title' => $title),$decode);
+			}
 			/*
 			// Business jets always use GS0001
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -759,31 +780,54 @@ 
 			$msg = $message['message'];
 			$decode = $message['decode'];
 			$registration = (string)$message['registration'];
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
-			else $latitude = '';
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
-			else $longitude = '';
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
-			else $airicao = '';
-			if (isset($decode['icao'])) $icao = $decode['icao'];
-			else $icao = $Translation->checkTranslation($ident);
+			if (isset($decode['latitude'])) {
+				$latitude = $decode['latitude'];
+			} else {
+				$latitude = '';
+			}
+			if (isset($decode['longitude'])) {
+				$longitude = $decode['longitude'];
+			} else {
+				$longitude = '';
+			}
+			if (isset($decode['airicao'])) {
+				$airicao = $decode['airicao'];
+			} else {
+				$airicao = '';
+			}
+			if (isset($decode['icao'])) {
+				$icao = $decode['icao'];
+			} else {
+				$icao = $Translation->checkTranslation($ident);
+			}
 			$image_array = $Image->getSpotterImage($registration);
 			if (!isset($image_array[0]['registration'])) {
 				$Image->addSpotterImage($registration);
 			}
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
-			if ($globalDebug && isset($info) && $info != '') echo $info;
-			if (count($decode) > 0) $decode_json = json_encode($decode);
-			else $decode_json = '';
+			if ($ident != 'GS0001') {
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			}
+			if ($globalDebug && isset($info) && $info != '') {
+				echo $info;
+			}
+			if (count($decode) > 0) {
+				$decode_json = json_encode($decode);
+			} else {
+				$decode_json = '';
+			}
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
 			}
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			if (!isset($globalACARSArchive)) {
+				$globalACARSArchive = array('10','80','81','82','3F');
+			}
+			if ($result && in_array($label,$globalACARSArchive)) {
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			}
 			if ($globalDebug && count($decode) > 0) {
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
 			}
@@ -808,7 +852,9 @@ 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
 			$Connection = new Connection($this->db);
 			$this->db = $Connection->db;
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
+			if ($globalDebug) {
+				echo "Test if not already in Live ACARS table...";
+			}
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
 			try {
@@ -819,7 +865,9 @@ 
 				return false;
 			}
 			if ($stht->fetchColumn() == 0) {
-				if ($globalDebug) echo "Add Live ACARS data...";
+				if ($globalDebug) {
+					echo "Add Live ACARS data...";
+				}
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
 				try {
@@ -830,10 +878,14 @@ 
 					return false;
 				}
 			} else {
-				if ($globalDebug) echo "Data already in DB...\n";
+				if ($globalDebug) {
+					echo "Data already in DB...\n";
+				}
 				return false;
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 			return true;
 		}
 		return false;
@@ -867,7 +919,9 @@ 
 			    	    }
 				    if ($stht->fetchColumn() == 0) {
 			*/
-			if ($globalDebug) echo "Add Live ACARS data...";
+			if ($globalDebug) {
+				echo "Add Live ACARS data...";
+			}
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
@@ -876,7 +930,9 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 		return '';
 	}
@@ -900,8 +956,11 @@ 
 			return '';
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0]['title'];
-		else return '';
+		if (count($row) > 0) {
+			return $row[0]['title'];
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -920,8 +979,11 @@ 
 			return array();
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row;
-		else return array();
+		if (count($row) > 0) {
+			return $row;
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -941,8 +1003,11 @@ 
 			return array();
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0];
-		else return array();
+		if (count($row) > 0) {
+			return $row[0];
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -990,19 +1055,35 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
@@ -1027,7 +1108,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1035,8 +1118,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
     /**
@@ -1089,31 +1173,51 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
 			$icao = '';
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1123,7 +1227,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1131,7 +1237,9 @@ 
 		if (!empty($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
     /**
@@ -1150,25 +1258,37 @@ 
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
 		$Spotter = new Spotter($this->db);
-		if ($globalDebug) echo "Test if we add ModeS data...";
+		if ($globalDebug) {
+			echo "Test if we add ModeS data...";
+		}
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
+		if ($icao == '') {
+			$icao = $Translation->checkTranslation($ident);
+		}
+		if ($globalDebug) {
+			echo '- Ident : '.$icao.' - ';
+		}
 		if ($ident == '' || $registration == '') {
-			if ($globalDebug) echo "Ident or registration null, exit\n";
+			if ($globalDebug) {
+				echo "Ident or registration null, exit\n";
+			}
 			return '';
 		}
 		$registration = str_replace('.','',$registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
+		if ($globalDebug) {
+			echo "Check if needed to add translation ".$ident.'... ';
+		}
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
 		$querysi_values = array(':registration' => $registration);
 		try {
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1176,9 +1296,14 @@ 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($globalDebug) {
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
+			}
+			if ($ident != $trans_ident) {
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
+			} elseif ($trans_ident == $ident) {
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			}
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1187,32 +1312,46 @@ 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
 				$sth->closeCursor();
-				if (isset($result['modes'])) $hex = $result['modes'];
-				else $hex = '';
+				if (isset($result['modes'])) {
+					$hex = $result['modes'];
+				} else {
+					$hex = '';
+				}
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
+				if ($this->fromACARSscript) {
+					$this->SI->add($SI_data);
+				}
 			}
 		}
-		if ($globalDebug) echo 'Done'."\n";
+		if ($globalDebug) {
+			echo 'Done'."\n";
+		}
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
 		$query_values = array(':ident' => $icao);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (isset($result['flightaware_id'])) {
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
-			else $ModeS = '';
+			if (isset($result['ModeS'])) {
+				$ModeS = $result['ModeS'];
+			} else {
+				$ModeS = '';
+			}
 			if ($ModeS == '') {
 				$id = explode('-',$result['flightaware_id']);
 				$ModeS = $id[0];
@@ -1225,24 +1364,32 @@ 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
 				if (count($row) ==  0) {
-					if ($globalDebug) echo " Add to ModeS table - ";
+					if ($globalDebug) {
+						echo " Add to ModeS table - ";
+					}
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				} else {
-					if ($globalDebug) echo " Update ModeS table - ";
+					if ($globalDebug) {
+						echo " Update ModeS table - ";
+					}
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1254,7 +1401,9 @@ 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1275,7 +1424,9 @@ 
 					    return "error : ".$e->getMessage();
 				}
 				*/
-				if ($globalDebug) echo " Update Spotter_output table - ";
+				if ($globalDebug) {
+					echo " Update Spotter_output table - ";
+				}
 				if ($ICAOTypeCode != '') {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1286,8 +1437,7 @@ 
 				} else {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
-					}
-					elseif ($globalDBdriver == 'pgsql') {
+					} elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1296,14 +1446,20 @@ 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
+			if ($globalDebug) {
+				echo " Can't find ModeS in spotter_output - ";
+			}
+		}
+		if ($globalDebug) {
+			echo "Done\n";
 		}
-		if ($globalDebug) echo "Done\n";
 		return '';
 	}
 }