Ysurac / FlightAirMap

require/class.SpotterArchive.php

Indentation +109 added lines, -109 removed lines

@@ -10,10 +10,10 @@ 
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -159,11 +159,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLastArchiveSpotterDataByIdent($ident) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -179,11 +179,11 @@ 
 
 
 	/**
-	* Gets last the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets last the spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLastArchiveSpotterDataById($id) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -209,11 +209,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAllArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -234,11 +234,11 @@ 
 	}
 
 	/**
-	* Gets coordinate & time spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getCoordArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -255,11 +255,11 @@ 
 	}
 
 	/**
-	* Gets coordinate & time spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getCoordArchiveSpotterDataByIdDate($id,$begindate,$enddate) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -277,11 +277,11 @@ 
 
 
 	/**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAltitudeArchiveSpotterDataByIdent($ident) {
 
 		date_default_timezone_set('UTC');
@@ -302,11 +302,11 @@ 
 	}
 
 	/**
-	* Gets altitude information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAltitudeArchiveSpotterDataById($id) {
 
 		date_default_timezone_set('UTC');
@@ -327,11 +327,11 @@ 
 	}
 
 	/**
-	* Gets altitude & speed information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude & speed information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAltitudeSpeedArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -348,11 +348,11 @@ 
 	}
 
 	/**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLastAltitudeArchiveSpotterDataByIdent($ident) {
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -402,11 +402,11 @@ 
 	}
 
 	/**
-	    * Gets Minimal Live Spotter data
-	    *
-	    * @return Array the spotter information
-	    *
-	    */
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -453,11 +453,11 @@ 
 	}
 
 	/**
-	    * Gets Minimal Live Spotter data
-	    *
-	    * @return Array the spotter information
-	    *
-	    */
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -524,11 +524,11 @@ 
 	}
 
 	/**
-	   * Gets count Live Spotter data
-	   *
-	   * @return Array the spotter information
-	   *
-	   */
+	 * Gets count Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterCount($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -574,11 +574,11 @@ 
 	// Spotter_Archive_output
 
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) {
 		global $globalTimezone, $globalDBdriver;
 		require_once(dirname(__FILE__).'/class.Translation.php');
@@ -870,11 +870,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -922,11 +922,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the owner
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -974,11 +974,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the pilot
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -1022,11 +1022,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') {
 		global $globalDBdriver;
 		/*
@@ -1066,11 +1066,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') {
 		global $globalDBdriver;
 		/*
@@ -1111,11 +1111,11 @@ 
 	}
 
 	/**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDateArchiveSpotterDataById($id,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1127,11 +1127,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDateArchiveSpotterDataByIdent($ident,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1143,11 +1143,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) {
 		global $global_query;
 		$Spotter = new Spotter($this->db);

Spacing +119 added lines, -119 removed lines

@@ -14,75 +14,75 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (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'])) {
@@ -92,7 +92,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 = '';
@@ -117,41 +117,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";
@@ -170,9 +170,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;
 	}
@@ -190,7 +190,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));
 		/*
@@ -203,7 +203,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;
 	}
@@ -217,14 +217,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;
 		}
@@ -242,11 +242,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;
 		}
@@ -260,14 +260,14 @@ 
 	* @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));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -287,12 +287,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;
 		}
@@ -312,12 +312,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;
 		}
@@ -335,11 +335,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;
 		}
@@ -356,12 +356,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;
 		}
@@ -377,11 +377,11 @@ 
 	 * @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;
 	}
 
@@ -395,7 +395,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -407,34 +407,34 @@ 
 	    * @return Array the spotter information
 	    *
 	    */
-	public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) {
+	public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 		//$filter_query = $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'])."')";
 		}
 
 		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 (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".'
 			          '.$filter_query.' ORDER BY flightaware_id';
 		} 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 (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".'
@@ -444,7 +444,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -458,7 +458,7 @@ 
 	    * @return Array the spotter information
 	    *
 	    */
-	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
+	public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
@@ -466,17 +466,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'])."')";
 		}
 
 
@@ -487,7 +487,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."'".')
@@ -502,7 +502,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."'".'
@@ -514,7 +514,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -529,22 +529,22 @@ 
 	   * @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';
@@ -559,7 +559,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -579,7 +579,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) {
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
 		require_once(dirname(__FILE__).'/class.Translation.php');
 		$Translation = new Translation($this->db);
@@ -629,7 +629,7 @@ 
 		}
 
 		if ($registration != "") {
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 			if (!is_string($registration)) {
 				return array();
 			} else {
@@ -638,7 +638,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 {
@@ -647,7 +647,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 {
@@ -664,7 +664,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 {
@@ -673,7 +673,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 {
@@ -682,7 +682,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 {
@@ -699,7 +699,7 @@ 
 		}
 
 		if ($airport != "") {
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
 			if (!is_string($airport)) {
 				return array();
 			} else {
@@ -708,7 +708,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 {
@@ -717,14 +717,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."')";
 				}
@@ -732,7 +732,7 @@ 
 		}
 
 		if ($owner != "") {
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 			if (!is_string($owner)) {
 				return array();
 			} else {
@@ -741,7 +741,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 {
@@ -750,7 +750,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 {
@@ -759,7 +759,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 {
@@ -768,7 +768,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 {
@@ -779,8 +779,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] != "") {
@@ -795,8 +795,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();
@@ -821,16 +821,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 {
@@ -844,12 +844,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;
 	}
 
@@ -864,7 +864,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 	}
@@ -897,8 +897,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];
@@ -936,7 +936,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)) {
@@ -950,8 +950,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];
@@ -988,7 +988,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)";
@@ -998,8 +998,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];
@@ -1027,7 +1027,7 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1055,7 +1055,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'];
@@ -1071,7 +1071,7 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1099,7 +1099,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'];
@@ -1116,13 +1116,13 @@ 
 	* @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;
 	}
 
@@ -1132,13 +1132,13 @@ 
 	* @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;
 	}
 
@@ -1148,14 +1148,14 @@ 
 	* @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)) {
@@ -1169,8 +1169,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];