Ysurac / FlightAirMap

require/class.Spotter.php

Spacing +1353 added lines, -1353 removed lines

@@ -4,7 +4,7 @@ 
 require_once(dirname(__FILE__).'/class.Image.php');
 $global_query = "SELECT spotter_output.* FROM spotter_output";
 
-class Spotter{
+class Spotter {
 	public $aircraft_correct_icaotype = array('CL64' => 'CL60',
 					'F9LX' => 'F900',
 					'K35T' => 'K35R',
@@ -59,62 +59,62 @@ 
 	* @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] != '') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_output.flightaware_id";
 					} else {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_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_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spf ON spf.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spf ON spf.flightaware_id = spotter_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spf ON spf.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spf ON spf.flightaware_id = spotter_output.flightaware_id";
 				}
 			}
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.flightaware_id = spotter_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.flightaware_id = spotter_output.flightaware_id";
 				}
 			}
 			if (isset($flt['registrations']) && !empty($flt['registrations'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_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_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sf ON sf.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sf ON sf.flightaware_id = spotter_output.flightaware_id";
 				}
 			}
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
 			if ($filter['airlines'][0] != '') {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sof ON sof.flightaware_id = spotter_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sof ON sof.flightaware_id = spotter_output.flightaware_id";
 			}
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
@@ -124,16 +124,16 @@ 
 			$filter_query_join .= " INNER JOIN (SELECT icao FROM airlines WHERE alliance = '".$filter['alliance']."') sal ON sal.icao = spotter_output.airline_icao ";
 		}
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spid ON spid.flightaware_id = spotter_output.flightaware_id";
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spid ON spid.flightaware_id = spotter_output.flightaware_id";
 			}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if (isset($filter['year']) && $filter['year'] != '') {
 			if ($globalDBdriver == 'mysql') {
@@ -159,7 +159,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;
@@ -174,7 +174,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
 	{
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
 		$Image = new Image($this->db);
@@ -204,7 +204,7 @@ 
 			$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();
 		}
 		
@@ -214,7 +214,7 @@ 
 		$spotter_array = array();
 		
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -258,7 +258,7 @@ 
 			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
 			if (isset($row['route_stop']) && $row['route_stop'] != '') {
 				$temp_array['route_stop'] = $row['route_stop'];
-				$allroute = explode(' ',$row['route_stop']);
+				$allroute = explode(' ', $row['route_stop']);
 				foreach ($allroute as $route) {
 					$route_airport_array = $this->getAllAirportInfo($route);
 					if (isset($route_airport_array[0]['name'])) {
@@ -311,17 +311,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");
 					}
 				}
@@ -357,9 +357,9 @@ 
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
 					if (is_numeric(substr($row['ident'], 2, 1))) {
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2),$fromsource);
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 2), $fromsource);
 					} elseif (is_numeric(substr($row['ident'], 3, 1))) {
-						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
+						$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
 					} else {
 						$airline_array = $this->getAllAirlineInfo('NA');
 					}
@@ -396,7 +396,7 @@ 
 				}
 			}
 			if (isset($temp_array['airline_iata']) && $temp_array['airline_iata'] != '') {
-				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'],3));
+				$acars_array = $ACARS->getLiveAcarsData($temp_array['airline_iata'].substr($temp_array['ident'], 3));
 				//$acars_array = ACARS->getLiveAcarsData('BA40YL');
 				if (count($acars_array) > 0) {
 					$temp_array['acars'] = $acars_array;
@@ -413,11 +413,11 @@ 
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
 			}
 
-			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
+			if ($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
 			{
 				if ($globalIVAO) {
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
+					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('', $temp_array['aircraft_type'], $temp_array['airline_icao']);
+					else $image_array = $Image->getSpotterImage('', $temp_array['aircraft_type']);
 				} else $image_array = $Image->getSpotterImage($temp_array['registration']);
 				if (count($image_array) > 0) {
 					$temp_array['image'] = $image_array[0]['image'];
@@ -441,7 +441,7 @@ 
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
 			}
 			
-			if ((!isset($globalIVAO) || ! $globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
+			if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
 				if ($schedules === true) {
 					$schedule_array = $Schedule->getSchedule($temp_array['ident']);
 					//print_r($schedule_array);
@@ -523,12 +523,12 @@ 
 			if (isset($row['squawk'])) {
 				$temp_array['squawk'] = $row['squawk'];
 				if ($row['squawk'] != '' && isset($temp_array['country_iso2'])) {
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['country_iso2']);
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['country_iso2']);
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
 				} elseif ($row['squawk'] != '' && isset($temp_array['over_country'])) {
-					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$temp_array['over_country']);
-					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
-				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'],$globalSquawkCountry);
+					$temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $temp_array['over_country']);
+					if ($temp_array['squawk_usage'] == '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
+				} elseif ($row['squawk'] != '' && isset($globalSquawkCountry)) $temp_array['squawk_usage'] = $this->getSquawkUsage($row['squawk'], $globalSquawkCountry);
 			}
     			
 			$temp_array['query_number_rows'] = $num_rows;
@@ -547,7 +547,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');
@@ -557,7 +557,7 @@ 
 
 		$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))
@@ -565,8 +565,8 @@ 
 				return false;
 			} 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 .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -598,37 +598,37 @@ 
 
 		if ($registration != "")
 		{
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 			if (!is_string($registration))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.registration = :registration";
-				$query_values = array_merge($query_values,array(':registration' => $registration));
+				$query_values = array_merge($query_values, array(':registration' => $registration));
 			}
 		}
 
 		if ($aircraft_icao != "")
 		{
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_icao))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.aircraft_icao = :aircraft_icao";
-				$query_values = array_merge($query_values,array(':aircraft_icao' => $aircraft_icao));
+				$query_values = array_merge($query_values, array(':aircraft_icao' => $aircraft_icao));
 			}
 		}
 
 		if ($aircraft_manufacturer != "")
 		{
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_manufacturer))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer";
-				$query_values = array_merge($query_values,array(':aircraft_manufacturer' => $aircraft_manufacturer));
+				$query_values = array_merge($query_values, array(':aircraft_manufacturer' => $aircraft_manufacturer));
 			}
 		}
 
@@ -644,25 +644,25 @@ 
 
 		if ($airline_icao != "")
 		{
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_icao))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.airline_icao = :airline_icao";
-				$query_values = array_merge($query_values,array(':airline_icao' => $airline_icao));
+				$query_values = array_merge($query_values, array(':airline_icao' => $airline_icao));
 			}
 		}
 
 		if ($airline_country != "")
 		{
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_country))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.airline_country = :airline_country";
-				$query_values = array_merge($query_values,array(':airline_country' => $airline_country));
+				$query_values = array_merge($query_values, array(':airline_country' => $airline_country));
 			}
 		}
 
@@ -689,31 +689,31 @@ 
 
 		if ($airport != "")
 		{
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
 			if (!is_string($airport))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :airport OR spotter_output.arrival_airport_icao = :airport)";
-				$query_values = array_merge($query_values,array(':airport' => $airport));
+				$query_values = array_merge($query_values, array(':airport' => $airport));
 			}
 		}
 
 		if ($airport_country != "")
 		{
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airport_country))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND (spotter_output.departure_airport_country = :airport_country OR spotter_output.arrival_airport_country = :airport_country)";
-				$query_values = array_merge($query_values,array(':airport_country' => $airport_country));
+				$query_values = array_merge($query_values, array(':airport_country' => $airport_country));
 			}
 		}
     
 		if ($callsign != "")
 		{
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign))
 			{
 				return false;
@@ -721,79 +721,79 @@ 
 				$translate = $Translation->ident2icao($callsign);
 				if ($translate != $callsign) {
 					$additional_query .= " AND (spotter_output.ident = :callsign OR spotter_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_output.ident = :callsign";
-					$query_values = array_merge($query_values,array(':callsign' => $callsign));
+					$query_values = array_merge($query_values, array(':callsign' => $callsign));
 				}
 			}
 		}
 
 		if ($owner != "")
 		{
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 			if (!is_string($owner))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.owner_name = :owner";
-				$query_values = array_merge($query_values,array(':owner' => $owner));
+				$query_values = array_merge($query_values, array(':owner' => $owner));
 			}
 		}
 
 		if ($pilot_name != "")
 		{
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 			if (!is_string($pilot_name))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.pilot_name = :pilot_name";
-				$query_values = array_merge($query_values,array(':pilot_name' => $pilot_name));
+				$query_values = array_merge($query_values, array(':pilot_name' => $pilot_name));
 			}
 		}
 
 		if ($pilot_id != "")
 		{
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
 			if (!is_string($pilot_id))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.pilot_id = :pilot_id";
-				$query_values = array_merge($query_values,array(':pilot_id' => $pilot_id));
+				$query_values = array_merge($query_values, array(':pilot_id' => $pilot_id));
 			}
 		}
 
 		if ($departure_airport_route != "")
 		{
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($departure_airport_route))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.departure_airport_icao = :departure_airport_route";
-				$query_values = array_merge($query_values,array(':departure_airport_route' => $departure_airport_route));
+				$query_values = array_merge($query_values, array(':departure_airport_route' => $departure_airport_route));
 			}
 		}
 
 		if ($arrival_airport_route != "")
 		{
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($arrival_airport_route))
 			{
 				return false;
 			} else {
 				$additional_query .= " AND spotter_output.arrival_airport_icao = :arrival_airport_route";
-				$query_values = array_merge($query_values,array(':arrival_airport_route' => $arrival_airport_route));
+				$query_values = array_merge($query_values, array(':arrival_airport_route' => $arrival_airport_route));
 			}
 		}
 
 		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] != "")
 			{                
@@ -809,8 +809,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);
@@ -841,8 +841,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)
 			{
@@ -871,23 +871,23 @@ 
 
 
 		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 spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance 
+				$query = "SELECT spotter_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2))) as distance 
 						FROM spotter_archive,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND spotter_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and spotter_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 						AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - spotter_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(spotter_archive.latitude*pi()/180)*POWER(SIN(($origLon-spotter_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
 			} else {
-				$query="SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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 
+				$query = "SELECT spotter_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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,spotter_output".$filter_query." spotter_output.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/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 - CAST(spotter_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(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.$orderby_query;
 			}
 		} else {		
-			$query  = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
+			$query = "SELECT spotter_output.* FROM spotter_output".$filter_query." spotter_output.ident <> '' 
 					".$additional_query."
 					".$orderby_query;
 		}
-		$spotter_array = $this->getDataFromDB($query, $query_values,$limit_query);
+		$spotter_array = $this->getDataFromDB($query, $query_values, $limit_query);
 		return $spotter_array;
 	}
 	
@@ -910,8 +910,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)
 			{
@@ -928,9 +928,9 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
 		}
 
-		$query  = $global_query.$filter_query." ".$orderby_query;
+		$query = $global_query.$filter_query." ".$orderby_query;
 
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
 
 		return $spotter_array;
 	}
@@ -976,34 +976,34 @@ 
 			{
 				return false;
 			} else {
-				if ($interval == "30m"){
+				if ($interval == "30m") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) <= $this_output.date ';
-				} else if ($interval == "1h"){
+				} else if ($interval == "1h") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) <= $this_output.date ';
-				} else if ($interval == "3h"){
+				} else if ($interval == "3h") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 3 HOUR) <= $this_output.date ';
-				} else if ($interval == "6h"){
+				} else if ($interval == "6h") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 6 HOUR) <= $this_output.date ';
-				} else if ($interval == "12h"){
+				} else if ($interval == "12h") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 HOUR) <= $this_output.date ';
-				} else if ($interval == "24h"){
+				} else if ($interval == "24h") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 24 HOUR) <= $this_output.date ';
-				} else if ($interval == "7d"){
+				} else if ($interval == "7d") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) <= $this_output.date ';
-				} else if ($interval == "30d"){
+				} else if ($interval == "30d") {
 					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 DAY) <= $this_output.date ';
 				} 
 			}
 		}
 
-		$query  = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output 
+		$query = "SELECT spotter_output.*, ( 6371 * acos( cos( radians($lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_output 
                    WHERE spotter_output.latitude <> '' 
 				   AND spotter_output.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
 				   ORDER BY distance";
 
-		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius),$limit_query);
+		$spotter_array = $this->getDataFromDB($query, array(':radius' => $radius), $limit_query);
 
 		return $spotter_array;
 	}
@@ -1015,21 +1015,21 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
+	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		$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)
 			{
@@ -1046,7 +1046,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
 		}
 
-		$query  = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
+		$query = $global_query." ".$filter_query." spotter_output.aircraft_name <> '' GROUP BY spotter_output.aircraft_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1065,15 +1065,15 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		$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)
 			{
@@ -1090,7 +1090,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
 		}
 
-		$query  = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
+		$query = $global_query." ".$filter_query." spotter_output.registration <> '' GROUP BY spotter_output.registration,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1104,20 +1104,20 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
+	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		$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)
 			{
@@ -1134,7 +1134,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
 		}
 
-		$query  = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
+		$query = $global_query." ".$filter_query." spotter_output.airline_name <> '' GROUP BY spotter_output.airline_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1154,7 +1154,7 @@ 
 		
 		date_default_timezone_set('UTC');
 		
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		$limit_query = '';
 		
@@ -1162,8 +1162,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)
 			{
@@ -1180,7 +1180,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
 		}
 
-		$query  = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
+		$query = $global_query." ".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' GROUP BY spotter_output.departure_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1199,14 +1199,14 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		$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)
 			{
@@ -1223,7 +1223,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC ";
 		}
 
-		$query  = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
+		$query = $global_query.$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' GROUP BY spotter_output.arrival_airport_icao,spotter_output.ident,spotter_output.spotter_id, spotter_output.flightaware_id, spotter_output.registration,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.aircraft_icao,spotter_output.aircraft_name,spotter_output.aircraft_manufacturer,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time,spotter_output.route_stop,spotter_output.date,spotter_output.latitude,spotter_output.longitude,spotter_output.waypoints,spotter_output.altitude,spotter_output.heading,spotter_output.ground_speed,spotter_output.highlight,spotter_output.squawk,spotter_output.ModeS,spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.verticalrate,spotter_output.owner_name,spotter_output.format_source,spotter_output.source_name,spotter_output.ground,spotter_output.last_ground,spotter_output.last_seen,spotter_output.last_latitude,spotter_output.last_longitude,spotter_output.last_altitude,spotter_output.last_ground_speed,spotter_output.real_arrival_airport_icao,spotter_output.real_arrival_airport_time ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1247,9 +1247,9 @@ 
 		$query_values = array(':id' => $id);
 
 		//$query  = $global_query." WHERE spotter_output.ident <> '' ".$additional_query." ";
-		$query  = $global_query." WHERE ".$additional_query." ";
+		$query = $global_query." WHERE ".$additional_query." ";
 
-		$spotter_array = $this->getDataFromDB($query,$query_values);
+		$spotter_array = $this->getDataFromDB($query, $query_values);
 
 		return $spotter_array;
 	}
@@ -1272,7 +1272,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))
@@ -1288,8 +1288,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)
 			{
@@ -1328,7 +1328,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))
@@ -1344,8 +1344,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)
 			{
@@ -1385,7 +1385,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_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot)";
@@ -1396,8 +1396,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)
 			{
@@ -1438,7 +1438,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($aircraft_type != "")
 		{
@@ -1455,8 +1455,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)
 			{
@@ -1512,8 +1512,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)
 			{
@@ -1529,7 +1529,7 @@ 
 		} else {
 			$orderby_query = " ORDER BY spotter_output.date DESC";
 		}
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		//$query = $global_query.$filter_query." spotter_output.ident <> '' ".$additional_query." ".$orderby_query;
 		$query = $global_query.$filter_query." ".$additional_query." ".$orderby_query;
@@ -1548,7 +1548,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
+	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
 		
@@ -1557,7 +1557,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		
 		if ($airline != "")
 		{
@@ -1574,8 +1574,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)
 			{
@@ -1605,7 +1605,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
 		
@@ -1613,7 +1613,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		
 		if ($airport != "")
 		{
@@ -1630,8 +1630,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)
 			{
@@ -1663,7 +1663,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
+	public function getSpotterDataByDate($date = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
 		
@@ -1671,7 +1671,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -1700,8 +1700,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)
 			{
@@ -1731,7 +1731,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
+	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
 		
@@ -1740,7 +1740,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($country != "")
 		{
 			if (!is_string($country))
@@ -1757,8 +1757,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)
 			{
@@ -1798,7 +1798,7 @@ 
 		$query_values = array();
 		$additional_query = '';
 		$limit_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		
 		if ($aircraft_manufacturer != "")
 		{
@@ -1815,8 +1815,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)
 			{
@@ -1858,14 +1858,14 @@ 
 		$query_values = array();
 		$additional_query = '';
 		$limit_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		if ($departure_airport_icao != "")
 		{
 			if (!is_string($departure_airport_icao))
 			{
 				return false;
 			} else {
-				$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
+				$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
 				$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao)";
 				//$additional_query .= " AND (spotter_output.departure_airport_icao = :departure_airport_icao AND spotter_output.real_departure_airport_icao IS NULL) OR spotter_output.real_departure_airport_icao = :departure_airport_icao";
 				$query_values = array(':departure_airport_icao' => $departure_airport_icao);
@@ -1878,10 +1878,10 @@ 
 			{
 				return false;
 			} else {
-				$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+				$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 				$additional_query .= " AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)";
 				//$additional_query .= " AND ((spotter_output.arrival_airport_icao = :arrival_airport_icao AND spotter_output.real_arrival_airport_icao IS NULL) OR spotter_output.real_arrival_airport_icao = :arrival_airport_icao)";
-				$query_values = array_merge($query_values,array(':arrival_airport_icao' => $arrival_airport_icao));
+				$query_values = array_merge($query_values, array(':arrival_airport_icao' => $arrival_airport_icao));
 			}
 		}
 		
@@ -1889,8 +1889,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)
 			{
@@ -1929,15 +1929,15 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		$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)
 			{
@@ -1954,7 +1954,7 @@ 
 			$orderby_query = " ORDER BY spotter_output.date DESC";
 		}
 
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' ".$orderby_query;
 
 		$spotter_array = $this->getDataFromDB($query, array(), $limit_query);
 
@@ -1967,19 +1967,19 @@ 
 	* @return String the highlight text
 	*
 	*/
-	public function getHighlightByRegistration($registration,$filter = array())
+	public function getHighlightByRegistration($registration, $filter = array())
 	{
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		$filter_query = $this->getFilter($filter,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filter, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		
-		$query  = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
+		$query = $global_query.$filter_query." spotter_output.highlight <> '' AND spotter_output.registration = :registration";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$highlight = $row['highlight'];
 		}
@@ -1995,14 +1995,14 @@ 
 	* @return String usage
 	*
 	*/
-	public function getSquawkUsage($squawk = '',$country = 'FR')
+	public function getSquawkUsage($squawk = '', $country = 'FR')
 	{
 		
-		$squawk = filter_var($squawk,FILTER_SANITIZE_STRING);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
+		$squawk = filter_var($squawk, FILTER_SANITIZE_STRING);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
 
 		$query  = "SELECT squawk.* FROM squawk WHERE squawk.code = :squawk AND squawk.country = :country LIMIT 1";
-		$query_values = array(':squawk' => ltrim($squawk,'0'), ':country' => $country);
+		$query_values = array(':squawk' => ltrim($squawk, '0'), ':country' => $country);
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -2024,9 +2024,9 @@ 
 	public function getAirportIcao($airport_iata = '')
 	{
 		
-		$airport_iata = filter_var($airport_iata,FILTER_SANITIZE_STRING);
+		$airport_iata = filter_var($airport_iata, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
+		$query = "SELECT airport.* FROM airport WHERE airport.iata = :airport LIMIT 1";
 		$query_values = array(':airport' => $airport_iata);
 		
 		$sth = $this->db->prepare($query);
@@ -2048,12 +2048,12 @@ 
 	* @return Float distance to the airport
 	*
 	*/
-	public function getAirportDistance($airport_icao,$latitude,$longitude)
+	public function getAirportDistance($airport_icao, $latitude, $longitude)
 	{
 		
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
+		$query = "SELECT airport.latitude, airport.longitude FROM airport WHERE airport.icao = :airport LIMIT 1";
 		$query_values = array(':airport' => $airport_icao);
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -2063,7 +2063,7 @@ 
 			$airport_latitude = $row['latitude'];
 			$airport_longitude = $row['longitude'];
 			$Common = new Common();
-			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
+			return $Common->distance($latitude, $longitude, $airport_latitude, $airport_longitude);
 		} else return '';
 	}
 	
@@ -2077,11 +2077,11 @@ 
 	public function getAllAirportInfo($airport = '')
 	{
 		
-		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+		$airport = filter_var($airport, FILTER_SANITIZE_STRING);
 
 		$query_values = array();
 		if ($airport == 'NA') {
-			return array(array('name' => 'Not available','city' => 'N/A', 'country' => 'N/A','iata' => 'NA','icao' => 'NA','altitude' => NULL,'latitude' => 0,'longitude' => 0,'type' => 'NA','home_link' => '','wikipedia_link' => '','image_thumb' => '', 'image' => ''));
+			return array(array('name' => 'Not available', 'city' => 'N/A', 'country' => 'N/A', 'iata' => 'NA', 'icao' => 'NA', 'altitude' => NULL, 'latitude' => 0, 'longitude' => 0, 'type' => 'NA', 'home_link' => '', 'wikipedia_link' => '', 'image_thumb' => '', 'image' => ''));
 		} elseif ($airport == '') {
 			$query  = "SELECT airport.name, airport.city, airport.country, airport.iata, airport.icao, airport.latitude, airport.longitude, airport.altitude, airport.type, airport.home_link, airport.wikipedia_link, airport.image_thumb, airport.image FROM airport";
 		} else {
@@ -2129,14 +2129,14 @@ 
 	{
 		$lst_countries = '';
 		foreach ($countries as $country) {
-			$country = filter_var($country,FILTER_SANITIZE_STRING);
+			$country = filter_var($country, FILTER_SANITIZE_STRING);
 			if ($lst_countries == '') {
 				$lst_countries = "'".$country."'";
 			} else {
 				$lst_countries .= ",'".$country."'";
 			}
 		}
-		$query  = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
+		$query = "SELECT airport.* FROM airport WHERE airport.country IN (".$lst_countries.")";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -2144,7 +2144,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['name'] = $row['name'];
 			$temp_array['city'] = $row['city'];
@@ -2172,10 +2172,10 @@ 
 	{
 		global $globalDBdriver;
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT airport.* FROM airport WHERE airport.latitude BETWEEN ".$minlat." AND ".$maxlat." AND airport.longitude BETWEEN ".$minlong." AND ".$maxlong." AND airport.type != 'closed'";
@@ -2187,7 +2187,7 @@ 
     
 		$airport_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array = $row;
 
@@ -2207,13 +2207,13 @@ 
 	public function getAllWaypointsInfobyCoord($coord)
 	{
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		//$query  = "SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
-		$query  = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
+		$query = "SELECT waypoints.* FROM waypoints WHERE (waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") OR (waypoints.latitude_end BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_end BETWEEN ".$minlong." AND ".$maxlong.")";
 		//$query  = "SELECT waypoints.* FROM waypoints";
 		//$query  = "SELECT waypoints.* FROM waypoints INNER JOIN (SELECT waypoints.* FROM waypoints WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong.") w ON w.name_end = waypoints.name_begin OR w.name_begin = waypoints.name_begin OR w.name_begin = waypoints.name_end OR w.name_end = waypoints.name_end";
 		//$query = "SELECT * FROM waypoints LEFT JOIN waypoints w ON waypoints.name_end = w.name_begin WHERE waypoints.latitude_begin BETWEEN ".$minlat." AND ".$maxlat." AND waypoints.longitude_begin BETWEEN ".$minlong." AND ".$maxlong;
@@ -2225,7 +2225,7 @@ 
     
 		$waypoints_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array = $row;
 
@@ -2247,10 +2247,10 @@ 
 	{
 		global $globalUseRealAirlines;
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
-		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
+		$airline_icao = strtoupper(filter_var($airline_icao, FILTER_SANITIZE_STRING));
 		if ($airline_icao == 'NA') {
 			$airline_array = array();
-			$airline_array[] = array('name' => 'Not Available','iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
+			$airline_array[] = array('name' => 'Not Available', 'iata' => 'NA', 'icao' => 'NA', 'callsign' => '', 'country' => 'NA', 'type' =>'');
 			return $airline_array;
 		} else {
 			if (strlen($airline_icao) == 2) {
@@ -2271,7 +2271,7 @@ 
 			if ($fromsource === NULL) {
 				$sth->execute(array(':airline_icao' => $airline_icao));
 			} else {
-				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
+				$sth->execute(array(':airline_icao' => $airline_icao, ':fromsource' => $fromsource));
 			}
                         /*
 			$airline_array = array();
@@ -2316,13 +2316,13 @@ 
 	{
 		global $globalUseRealAirlines;
 		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
-		$airline_name = strtolower(filter_var($airline_name,FILTER_SANITIZE_STRING));
-		$query  = "SELECT airlines.name, airlines.iata, airlines.icao, airlines.callsign, airlines.country, airlines.type FROM airlines WHERE lower(airlines.name) = :airline_name AND airlines.active = 'Y' AND airlines.forsource IS NULL LIMIT 1";
+		$airline_name = strtolower(filter_var($airline_name, FILTER_SANITIZE_STRING));
+		$query = "SELECT airlines.name, airlines.iata, airlines.icao, airlines.callsign, airlines.country, airlines.type FROM airlines WHERE lower(airlines.name) = :airline_name AND airlines.active = 'Y' AND airlines.forsource IS NULL LIMIT 1";
 		$sth = $this->db->prepare($query);
 		if ($fromsource === NULL) {
 			$sth->execute(array(':airline_name' => $airline_name));
 		} else {
-			$sth->execute(array(':airline_name' => $airline_name,':fromsource' => $fromsource));
+			$sth->execute(array(':airline_name' => $airline_name, ':fromsource' => $fromsource));
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (empty($result) && $fromsource !== NULL) {
@@ -2347,12 +2347,12 @@ 
 	*/
 	public function getAllAircraftInfo($aircraft_type)
 	{
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
 
 		if ($aircraft_type == 'NA') {
-			return array(array('icao' => 'NA','type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
+			return array(array('icao' => 'NA', 'type' => 'Not Available', 'manufacturer' => 'Not Available', 'aircraft_shadow' => NULL));
 		}
-		$query  = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
+		$query = "SELECT aircraft.icao, aircraft.type,aircraft.manufacturer,aircraft.aircraft_shadow, aircraft.official_page, aircraft.aircraft_description, aircraft.engine_type, aircraft.engine_count, aircraft.wake_category FROM aircraft WHERE aircraft.icao = :aircraft_type";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':aircraft_type' => $aircraft_type));
@@ -2384,7 +2384,7 @@ 
 	*/
 	public function getAircraftIcao($aircraft_type)
 	{
-		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
+		$aircraft_type = filter_var($aircraft_type, FILTER_SANITIZE_STRING);
 		$all_aircraft = array('737-300' => 'B733',
 				'777-200' => 'B772',
 				'777-200ER' => 'B772',
@@ -2396,10 +2396,10 @@ 
 				'A380' => 'A388');
 		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
 
-		$query  = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
+		$query = "SELECT aircraft.icao FROM aircraft WHERE aircraft.type LIKE :saircraft_type OR aircraft.type = :aircraft_type OR aircraft.icao = :aircraft_type LIMIT 1";
 		$aircraft_type = strtoupper($aircraft_type);
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%',':aircraft_type' => $aircraft_type,));
+		$sth->execute(array(':saircraft_type' => '%'.$aircraft_type.'%', ':aircraft_type' => $aircraft_type,));
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 		if (isset($result[0]['icao'])) return $result[0]['icao'];
 		else return '';
@@ -2412,10 +2412,10 @@ 
 	* @return String aircraft type
 	*
 	*/
-	public function getAllAircraftType($aircraft_modes,$source_type = '')
+	public function getAllAircraftType($aircraft_modes, $source_type = '')
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
-		$source_type = filter_var($source_type,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
+		$source_type = filter_var($source_type, FILTER_SANITIZE_STRING);
 
 		if ($source_type == '' || $source_type == 'modes') {
 			$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes AND aircraft_modes.source_type = 'modes' ORDER BY FirstCreated DESC LIMIT 1";
@@ -2446,9 +2446,9 @@ 
 	*/
 	public function getAllAircraftTypeByRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.registration = :registration ORDER BY FirstCreated DESC LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
@@ -2469,9 +2469,9 @@ 
 	*/
 	public function getAllIDByRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT spotter_id,flightaware_id, date FROM spotter_output WHERE spotter_output.registration = :registration";
+		$query = "SELECT spotter_id,flightaware_id, date FROM spotter_output WHERE spotter_output.registration = :registration";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
@@ -2479,7 +2479,7 @@ 
 		$idarray = array();
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$date = $row['date'];
-			$idarray[$date] = array('flightaware_id' => $row['flightaware_id'],'spotter_id' => $row['spotter_id']);
+			$idarray[$date] = array('flightaware_id' => $row['flightaware_id'], 'spotter_id' => $row['spotter_id']);
 		}
 		return $idarray;
 	}
@@ -2493,8 +2493,8 @@ 
 	*/
 	public function getOperator($operator)
 	{
-		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
-		$query  = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
+		$operator = filter_var($operator, FILTER_SANITIZE_STRING);
+		$query = "SELECT translation.operator_correct FROM translation WHERE translation.operator = :operator LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':operator' => $operator));
@@ -2515,9 +2515,9 @@ 
 	*/
 	public function getRouteInfo($callsign)
 	{
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
                 if ($callsign == '') return array();
-		$query  = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
+		$query = "SELECT routes.Operator_ICAO, routes.FromAirport_ICAO, routes.ToAirport_ICAO, routes.RouteStop, routes.FromAirport_Time, routes.ToAirport_Time FROM routes WHERE CallSign = :callsign LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':callsign' => $callsign));
@@ -2538,9 +2538,9 @@ 
 	*/
 	public function getAircraftInfoByRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
+		$query = "SELECT spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_icao FROM spotter_output WHERE spotter_output.registration = :registration";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
@@ -2548,7 +2548,7 @@ 
 		$aircraft_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['aircraft_icao'] = $row['aircraft_icao'];
@@ -2570,7 +2570,7 @@ 
 	*/
 	public function getAircraftOwnerByRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		$Connection = new Connection($this->db);
 		if ($Connection->tableExists('aircraft_owner')) {
 			$query  = "SELECT aircraft_owner.base, aircraft_owner.owner, aircraft_owner.date_first_reg FROM aircraft_owner WHERE registration = :registration LIMIT 1";
@@ -2592,7 +2592,7 @@ 
 	public function getAllFlightsforSitemap()
 	{
 		//$query  = "SELECT spotter_output.spotter_id, spotter_output.ident, spotter_output.airline_name, spotter_output.aircraft_name, spotter_output.aircraft_icao FROM spotter_output ORDER BY LIMIT ";
-		$query  = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
+		$query = "SELECT spotter_output.spotter_id FROM spotter_output ORDER BY spotter_id DESC LIMIT 200 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -2639,7 +2639,7 @@ 
 		$manufacturer_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 
@@ -2676,7 +2676,7 @@ 
 		$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_manufacturer'] = $row['aircraft_manufacturer'];
@@ -2697,8 +2697,8 @@ 
 	*/
 	public function getAllAircraftRegistrations($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.registration 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.registration 
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' 
 				ORDER BY spotter_output.registration ASC";
 
@@ -2708,7 +2708,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['registration'] = $row['registration'];
 
@@ -2725,11 +2725,11 @@ 
 	* @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 spotter_output.source_name 
+		$query = "SELECT DISTINCT spotter_output.source_name 
 				FROM spotter_output".$filter_query." spotter_output.source_name <> ''";
 		if ($type != '') {
 			$query_values = array(':type' => $type);
@@ -2744,7 +2744,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;
@@ -2760,11 +2760,11 @@ 
 	* @return Array list of airline names
 	*
 	*/
-	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
+	public function getAllAirlineNames($airline_type = '', $forsource = NULL, $filters = array())
 	{
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 		if ($airline_type == '' || $airline_type == 'all') {
 			/*
 			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
@@ -2783,7 +2783,7 @@ 
 				$query_data = array(':forsource' => $forsource);
 			}
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
+			$query = "SELECT DISTINCT spotter_output.airline_icao AS airline_icao, spotter_output.airline_name AS airline_name, spotter_output.airline_type AS airline_type
 					FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
 					AND spotter_output.airline_type = :airline_type 
 					ORDER BY spotter_output.airline_icao ASC";
@@ -2796,7 +2796,7 @@ 
 		$airline_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['airline_name'] = $row['airline_name'];
@@ -2813,10 +2813,10 @@ 
 	* @return Array list of alliance names
 	*
 	*/
-	public function getAllAllianceNames($forsource = NULL,$filters = array())
+	public function getAllAllianceNames($forsource = NULL, $filters = array())
 	{
-		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
-		$filter_query = $this->getFilter($filters,true,true);
+		global $globalAirlinesSource, $globalVATSIM, $globalIVAO;
+		$filter_query = $this->getFilter($filters, true, true);
 		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource;
 		elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim';
 		elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao';
@@ -2844,8 +2844,8 @@ 
 	*/
 	public function getAllAirlineCountries($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
 				FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
 				ORDER BY spotter_output.airline_country ASC";
 		
@@ -2856,7 +2856,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country'] = $row['airline_country'];
 
@@ -2876,9 +2876,9 @@ 
 	*/
 	public function getAllAirportNames($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$airport_array = array();
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao AS airport_icao, spotter_output.departure_airport_name AS airport_name, spotter_output.departure_airport_city AS airport_city, spotter_output.departure_airport_country AS airport_country
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_icao <> '' AND spotter_output.departure_airport_icao <> 'NA' 
 				ORDER BY spotter_output.departure_airport_city ASC";
 		
@@ -2887,7 +2887,7 @@ 
 		$sth->execute();
 
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_icao'] = $row['airport_icao'];
 			$temp_array['airport_name'] = $row['airport_name'];
@@ -2897,14 +2897,14 @@ 
 			$airport_array[$row['airport_city'].",".$row['airport_name']] = $temp_array;
 		}
 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao AS airport_icao, spotter_output.arrival_airport_name AS airport_name, spotter_output.arrival_airport_city AS airport_city, spotter_output.arrival_airport_country AS airport_country
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' 
 								ORDER BY spotter_output.arrival_airport_city ASC";
 					
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 		//	if ($airport_array[$row['airport_city'].",".$row['airport_name']]['airport_icao'] != $row['airport_icao'])
 		//	{
@@ -2928,8 +2928,8 @@ 
 	*/
 	public function getAllOwnerNames($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.owner_name
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.owner_name
 				FROM spotter_output".$filter_query." spotter_output.owner_name <> '' 
 				ORDER BY spotter_output.owner_name ASC";
 		
@@ -2946,8 +2946,8 @@ 
 	*/
 	public function getAllPilotNames($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.pilot_name, spotter_output.pilot_id
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.pilot_name, spotter_output.pilot_id
 				FROM spotter_output".$filter_query." spotter_output.pilot_name <> '' 
 				ORDER BY spotter_output.pilot_name ASC";
 		
@@ -2980,21 +2980,21 @@ 
    
 		$temp_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_country'] = $row['airport_country'];
 
 			$airport_array[$row['airport_country']] = $temp_array;
 		}
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
 								ORDER BY spotter_output.arrival_airport_country ASC";
 					
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if (isset($airport_array[$row['airport_country']]['airport_country']) && $airport_array[$row['airport_country']]['airport_country'] != $row['airport_country'])
 			{
@@ -3017,9 +3017,9 @@ 
 	*/
 	public function getAllCountries($filters = array())
 	{
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if ($Connection->tableExists('countries')) {
-			$query  = "SELECT countries.name AS airport_country
+			$query = "SELECT countries.name AS airport_country
 				FROM countries
 				ORDER BY countries.name ASC";
 			$sth = $this->db->prepare($query);
@@ -3028,14 +3028,14 @@ 
 			$temp_array = array();
 			$country_array = array();
 		
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$temp_array['country'] = $row['airport_country'];
 				$country_array[$row['airport_country']] = $temp_array;
 			}
 		} else {
-			$filter_query = $this->getFilter($filters,true,true);
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
+			$filter_query = $this->getFilter($filters, true, true);
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country AS airport_country
 								FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' 
 								ORDER BY spotter_output.departure_airport_country ASC";
 
@@ -3044,20 +3044,20 @@ 
    
 			$temp_array = array();
 			$country_array = array();
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$temp_array['country'] = $row['airport_country'];
 				$country_array[$row['airport_country']] = $temp_array;
 			}
 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country AS airport_country
 								FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' 
 								ORDER BY spotter_output.arrival_airport_country ASC";
 					
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if ($country_array[$row['airport_country']]['country'] != $row['airport_country'])
 			{
@@ -3067,14 +3067,14 @@ 
 			}
 		}
 		
-		$query  = "SELECT DISTINCT spotter_output.airline_country AS airline_country
+		$query = "SELECT DISTINCT spotter_output.airline_country AS airline_country
 								FROM spotter_output".$filter_query." spotter_output.airline_country <> '' 
 								ORDER BY spotter_output.airline_country ASC";
 					
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if (isset($country_array[$row['airline_country']]['country']) && $country_array[$row['airline_country']]['country'] != $row['airline_country'])
 			{
@@ -3098,8 +3098,8 @@ 
 	*/
 	public function getAllIdents($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.ident
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.ident
 								FROM spotter_output".$filter_query." spotter_output.ident <> '' 
 								ORDER BY spotter_output.date ASC LIMIT 700 OFFSET 0";
 
@@ -3109,7 +3109,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;
@@ -3123,9 +3123,9 @@ 
 	* @return Array number, icao, name and city of airports
 	*/
 
-	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
+	public function getLast7DaysAirportsDeparture($airport_icao = '', $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();
@@ -3190,7 +3190,7 @@ 
 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $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();
@@ -3274,7 +3274,7 @@ 
 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $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();
@@ -3307,9 +3307,9 @@ 
 	* @return Array number, icao, name and city of airports
 	*/
 
-	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
+	public function getLast7DaysDetectedAirportsArrival($airport_icao = '', $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();
@@ -3441,12 +3441,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
 								FROM spotter_output
 								WHERE spotter_output.date <> '' 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
 		} else {
-			$query  = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
+			$query = "SELECT DISTINCT to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
 								FROM spotter_output
 								WHERE spotter_output.date <> '' 
 								ORDER BY spotter_output.date ASC LIMIT 0,200";
@@ -3458,7 +3458,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'];
 
@@ -3478,7 +3478,7 @@ 
 	*/
 	public function getAllRoutes()
 	{
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route,  spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao 
 				FROM spotter_output
 				WHERE spotter_output.ident <> '' 
 				GROUP BY route
@@ -3489,7 +3489,7 @@ 
 
 		$routes_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['route'] = $row['route'];
 			$temp_array['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -3508,21 +3508,21 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
+	public function updateIdentSpotterData($flightaware_id = '', $ident = '', $fromsource = NULL)
 	{
 		if (!is_numeric(substr($ident, 0, 3)))
 		{
 			if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
 			} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
-				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
+				$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
 			} else {
 				$airline_array = $this->getAllAirlineInfo("NA");
 			}
 			if (count($airline_array) == 0) {
 				$airline_array = $this->getAllAirlineInfo("NA");
 			}
-			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
+			if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
 				$airline_array = $this->getAllAirlineInfo("NA");
 			}
 		} else {
@@ -3535,7 +3535,7 @@ 
 
 
 		$query = 'UPDATE spotter_output SET ident = :ident, airline_name = :airline_name, airline_icao = :airline_icao, airline_country = :airline_country, airline_type = :airline_type WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type);
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3556,11 +3556,11 @@ 
 	* @return String success or false
 	*
 	*/	
-	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
+	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '', $arrival_airport_time = '')
 	{
 		if ($groundspeed == '') $groundspeed = NULL;
 		$query = 'UPDATE spotter_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_ground = :last_ground, last_seen = :last_seen, real_arrival_airport_icao = :real_arrival_airport_icao, real_arrival_airport_time = :real_arrival_airport_time, last_ground_speed = :last_ground_speed WHERE flightaware_id = :flightaware_id';
-                $query_values = array(':flightaware_id' => $flightaware_id,':real_arrival_airport_icao' => $arrival_airport_icao,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
+                $query_values = array(':flightaware_id' => $flightaware_id, ':real_arrival_airport_icao' => $arrival_airport_icao, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':real_arrival_airport_time' => $arrival_airport_time, ':last_ground' => $ground, ':ident' => $ident);
 
 		try {
 			$sth = $this->db->prepare($query);
@@ -3600,7 +3600,7 @@ 
 	* @param String $verticalrate vertival rate of flight
 	* @return String success or false
 	*/
-	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '',$source_type = '')
+	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false, $format_source = '', $source_name = '', $source_type = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
 		
@@ -3623,14 +3623,14 @@ 
 			} else {
 				if ($ModeS != '') {
 					$timeelapsed = microtime(true);
-					$registration = $this->getAircraftRegistrationBymodeS($ModeS,$source_type);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$registration = $this->getAircraftRegistrationBymodeS($ModeS, $source_type);
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else {
-					$myhex = explode('-',$flightaware_id);
+					$myhex = explode('-', $flightaware_id);
 					if (count($myhex) > 0) {
 						$timeelapsed = microtime(true);
-						$registration = $this->getAircraftRegistrationBymodeS($myhex[0],$source_type);
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						$registration = $this->getAircraftRegistrationBymodeS($myhex[0], $source_type);
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 					}
 				}
 			}
@@ -3652,24 +3652,24 @@ 
 				{
 					$timeelapsed = microtime(true);
 					if (is_numeric(substr(substr($ident, 0, 3), -1, 1))) {
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2),$fromsource);
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 2), $fromsource);
 					} elseif (is_numeric(substr(substr($ident, 0, 4), -1, 1))) {
-						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3),$fromsource);
+						$airline_array = $this->getAllAirlineInfo(substr($ident, 0, 3), $fromsource);
 					} else {
 						$airline_array = $this->getAllAirlineInfo("NA");
 					}
 					if (count($airline_array) == 0) {
 						$airline_array = $this->getAllAirlineInfo("NA");
 					}
-					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == ""){
+					if (!isset($airline_array[0]['icao']) || $airline_array[0]['icao'] == "") {
 						$airline_array = $this->getAllAirlineInfo("NA");
 					}
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				} else {
 					$timeelapsed = microtime(true);
 					$airline_array = $this->getAllAirlineInfo("NA");
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAirlineInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 			}
 		} else $airline_array = array();
@@ -3686,27 +3686,27 @@ 
 				{
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo("NA");
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else {
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 			}
 		} else {
 			if ($ModeS != '') {
 				$timeelapsed = microtime(true);
-				$aircraft_icao = $this->getAllAircraftType($ModeS,$source_type);
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				$aircraft_icao = $this->getAllAircraftType($ModeS, $source_type);
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				if ($aircraft_icao == "" || $aircraft_icao == "XXXX")
 				{
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo("NA");
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else {
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 			}
 		}
@@ -3722,7 +3722,7 @@ 
 			} else {
 				$timeelapsed = microtime(true);
 				$departure_airport_array = $this->getAllAirportInfo($departure_airport_icao);
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			}
 		}
 		
@@ -3737,7 +3737,7 @@ 
 			} else {
 				$timeelapsed = microtime(true);
 				$arrival_airport_array = $this->getAllAirportInfo($arrival_airport_icao);
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAirportInfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			}
 		}
 
@@ -3790,7 +3790,7 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
@@ -3800,7 +3800,7 @@ 
 		{
 			$timeelapsed = microtime(true);
 			$image_array = $Image->getSpotterImage($registration);
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getSpotterImage : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			if (!isset($image_array[0]['registration']))
 			{
 				//echo "Add image !!!! \n";
@@ -3808,7 +3808,7 @@ 
 			}
 			$timeelapsed = microtime(true);
 			$owner_info = $this->getAircraftOwnerByRegistration($registration);
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftOwnerByRegistration : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			if ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
 		}
     
@@ -3816,33 +3816,33 @@ 
 		{
             		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
             		else $airline_icao = '';
-			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
+			$image_array = $Image->getSpotterImage('', $aircraft_icao, $airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
 				//echo "Add image !!!! \n";
-				$Image->addSpotterImage('',$aircraft_icao,$airline_icao);
+				$Image->addSpotterImage('', $aircraft_icao, $airline_icao);
 			}
 		}
     
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,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);
-		$waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING);
-		$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);
-		$squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT);
-		$route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING);
-		$ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING);
-		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING);
-		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT);
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, 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);
+		$waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING);
+		$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);
+		$squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT);
+		$route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING);
+		$ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING);
+		$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING);
+		$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
 	
 		if (count($airline_array) == 0) 
 		{
@@ -3870,7 +3870,7 @@ 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
                 if (!isset($aircraft_owner)) $aircraft_owner = NULL;
-                $query  = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
+                $query = "INSERT INTO spotter_output (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop,highlight,ModeS, pilot_id, pilot_name, verticalrate, owner_name, ground, format_source, source_name) 
                 VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name,:departure_airport_city,:departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date, :departure_airport_time, :arrival_airport_time, :squawk, :route_stop, :highlight, :ModeS, :pilot_id, :pilot_name, :verticalrate, :owner_name,:ground, :format_source, :source_name)";
 
                 $airline_name = $airline_array[0]['name'];
@@ -3880,7 +3880,7 @@ 
 		if ($airline_type == '') {
 			$timeelapsed = microtime(true);
 			$airline_type = $this->getAircraftTypeBymodeS($ModeS);
-			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftTypeBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 		}
 		if ($airline_type == null) $airline_type = '';
                 $aircraft_type = $aircraft_array[0]['type'];
@@ -3892,7 +3892,7 @@ 
                 $arrival_airport_name = $arrival_airport_array[0]['name'];
                 $arrival_airport_city = $arrival_airport_array[0]['city'];
                 $arrival_airport_country = $arrival_airport_array[0]['country'];
-                $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_type' => $aircraft_type,':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,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date,':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
+                $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_type' => $aircraft_type, ':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, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':highlight' => $highlight, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':owner_name' => $aircraft_owner, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name);
 
 		try {
 		        
@@ -3918,13 +3918,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
+			$query = "SELECT spotter_output.ident FROM spotter_output 
 								WHERE spotter_output.ident = :ident 
 								AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 								AND spotter_output.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT spotter_output.ident FROM spotter_output 
+			$query = "SELECT spotter_output.ident FROM spotter_output 
 								WHERE spotter_output.ident = :ident 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
@@ -3933,8 +3933,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'];
 		}
@@ -3960,8 +3960,8 @@ 
 				return false;
 			} 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 .= "(spotter_output.aircraft_icao like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
@@ -3976,11 +3976,11 @@ 
 			}
 		}
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.* FROM spotter_output 
+			$query = "SELECT spotter_output.* FROM spotter_output 
 				WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." 
 				AND spotter_output.date < UTC_TIMESTAMP()";
 		} else {
-			$query  = "SELECT spotter_output.* FROM spotter_output 
+			$query = "SELECT spotter_output.* FROM spotter_output 
 				WHERE spotter_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." 
 				AND spotter_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
 		}
@@ -3997,11 +3997,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(), $year = '', $month = '', $day = '')
+	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 			FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.airline_icao <> 'NA'";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -4021,28 +4021,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC";
@@ -4052,7 +4052,7 @@ 
 		$sth->execute($query_values);
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4069,11 +4069,11 @@ 
 	* @return Array the pilots list
 	*
 	*/
-	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '',$day = '')
+	public function countAllPilots($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.pilot_id, s.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.pilot_id, s.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 			FROM spotter_output LEFT JOIN (SELECT DISTINCT pilot_id, pilot_name, max(date) as date FROM spotter_output GROUP BY pilot_id, pilot_name) s ON s.pilot_id = spotter_output.pilot_id".$filter_query." spotter_output.pilot_id <> ''";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -4093,28 +4093,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		
@@ -4126,7 +4126,7 @@ 
 		$sth->execute($query_values);
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['pilot_name'] = $row['pilot_name'];
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -4146,7 +4146,7 @@ 
 	public function countAllPilotsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
 	{
 		global $globalDBdriver;
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.pilot_id, spotter_output.pilot_name, COUNT(spotter_output.pilot_id) AS pilot_count, spotter_output.format_source
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -4172,7 +4172,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['pilot_name'] = $row['pilot_name'];
 			$temp_array['pilot_id'] = $row['pilot_id'];
@@ -4190,11 +4190,11 @@ 
 	* @return Array the pilots list
 	*
 	*/
-	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllOwners($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 					FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -4214,28 +4214,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.owner_name ORDER BY owner_count DESC";
@@ -4245,7 +4245,7 @@ 
 		$sth->execute($query_values);
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['owner_name'] = $row['owner_name'];
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -4260,11 +4260,11 @@ 
 	* @return Array the pilots list
 	*
 	*/
-	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
+	public function countAllOwnersByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.owner_name, COUNT(spotter_output.owner_name) AS owner_count
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -4290,7 +4290,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['owner_name'] = $row['owner_name'];
 			$temp_array['owner_count'] = $row['owner_count'];
@@ -4306,11 +4306,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
+	public function countAllAirlinesByAircraft($aircraft_icao, $filters = array())
 	{
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 	    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
 			    ORDER BY airline_count DESC";
@@ -4322,7 +4322,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4342,11 +4342,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
+	public function countAllAirlineCountriesByAircraft($aircraft_icao, $filters = array())
 	{
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count, countries.iso3 AS airline_country_iso3 
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count, countries.iso3 AS airline_country_iso3 
 			FROM spotter_output, countries ".$filter_query." countries.name = spotter_output.airline_country AND spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
 			GROUP BY spotter_output.airline_country, countries.iso3
 			ORDER BY airline_country_count DESC
@@ -4359,7 +4359,7 @@ 
 		$airline_country_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4379,11 +4379,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByAirport($airport_icao,$filters = array())
+	public function countAllAirlinesByAirport($airport_icao, $filters = array())
 	{
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		    FROM spotter_output".$filter_query." spotter_output.airline_name <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao ) 
                     GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country
 		    ORDER BY airline_count DESC";
@@ -4395,7 +4395,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4414,11 +4414,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
+	public function countAllAirlineCountriesByAirport($airport_icao, $filters = array())
 	{
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao )
 					GROUP BY spotter_output.airline_country
 					ORDER BY airline_country_count DESC
@@ -4431,7 +4431,7 @@ 
 		$airline_country_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4448,11 +4448,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllAirlinesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 			FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
 					GROUP BY spotter_output.airline_name
 					ORDER BY airline_count DESC";
@@ -4463,7 +4463,7 @@ 
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4483,11 +4483,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
 					GROUP BY spotter_output.airline_country
 					ORDER BY airline_country_count DESC
@@ -4500,7 +4500,7 @@ 
 		$airline_country_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4516,11 +4516,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByDate($date,$filters = array())
+	public function countAllAirlinesByDate($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);
@@ -4528,12 +4528,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 			FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country 
 					ORDER BY airline_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+			$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 			FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 					GROUP BY spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country
 					ORDER BY airline_count DESC";
@@ -4544,7 +4544,7 @@ 
 
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4564,11 +4564,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByDate($date,$filters = array())
+	public function countAllAirlineCountriesByDate($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);
@@ -4576,13 +4576,13 @@ 
 		} else $offset = '+00:00';
 		
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 					GROUP BY spotter_output.airline_country
 					ORDER BY airline_country_count DESC
 					LIMIT 10 OFFSET 0";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+			$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 					GROUP BY spotter_output.airline_country
 					ORDER BY airline_country_count DESC
@@ -4594,7 +4594,7 @@ 
  
 		$airline_country_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4611,11 +4611,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByIdent($ident,$filters = array())
+	public function countAllAirlinesByIdent($ident, $filters = array())
 	{
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 		FROM spotter_output".$filter_query." spotter_output.ident = :ident  
 				GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country
 				ORDER BY airline_count DESC";
@@ -4632,11 +4632,11 @@ 
 	* @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_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 		FROM spotter_output".$filter_query." spotter_output.owner_name = :owner  
 				GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country
 				ORDER BY airline_count DESC";
@@ -4653,47 +4653,47 @@ 
 	* @return String Duration of all flights
 	*
 	*/
-	public function getFlightDurationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
+	public function getFlightDurationByOwner($owner, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT SUM(last_seen - date) AS duration 
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT SUM(last_seen - date) AS duration 
 				FROM spotter_output".$filter_query." spotter_output.owner_name = :owner 
 				AND last_seen > date";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$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);
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (is_numeric($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']);
+		if (is_numeric($result[0]['duration'])) return gmdate('H:i:s', $result[0]['duration']);
 		elseif ($result[0]['duration'] == '') return 0;
 		else return $result[0]['duration'];
 	}
@@ -4704,14 +4704,14 @@ 
 	* @return String Duration of all flights
 	*
 	*/
-	public function countFlightsByOwner($owner,$filters = array())
+	public function countFlightsByOwner($owner, $filters = array())
 	{
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(*) AS nb 
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(*) AS nb 
 				FROM spotter_output".$filter_query." spotter_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));
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -4724,14 +4724,14 @@ 
 	* @return String Duration of all flights
 	*
 	*/
-	public function countFlightsByPilot($pilot,$filters = array())
+	public function countFlightsByPilot($pilot, $filters = array())
 	{
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(*) AS nb 
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(*) AS nb 
 				FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilod_id = :pilot)";
 		$query_values = array();
-		$query_values = array_merge($query_values,array(':pilot' => $pilot));
+		$query_values = array_merge($query_values, array(':pilot' => $pilot));
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -4744,47 +4744,47 @@ 
 	* @return String Duration of all flights
 	*
 	*/
-	public function getFlightDurationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
+	public function getFlightDurationByPilot($pilot, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT SUM(last_seen - date) AS duration 
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT SUM(last_seen - date) AS duration 
 		 		FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
 		 		AND last_seen > date";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$query_values = array_merge($query_values,array(':pilot' => $pilot));
+		$query_values = array_merge($query_values, array(':pilot' => $pilot));
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (is_int($result[0]['duration'])) return gmdate('H:i:s',$result[0]['duration']);
+		if (is_int($result[0]['duration'])) return gmdate('H:i:s', $result[0]['duration']);
 		else return $result[0]['duration'];
 	}
 
@@ -4794,11 +4794,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByPilot($pilot,$filters = array())
+	public function countAllAirlinesByPilot($pilot, $filters = array())
 	{
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 		FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
 				GROUP BY spotter_output.airline_icao, spotter_output.airline_name, spotter_output.airline_country
 				ORDER BY airline_count DESC";
@@ -4815,25 +4815,25 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
+	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 			FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
 					GROUP BY spotter_output.airline_name
 					ORDER BY airline_count DESC";
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
       
 		$airline_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4851,13 +4851,13 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
+	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
       
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
 				GROUP BY spotter_output.airline_country
 				ORDER BY airline_country_count DESC
@@ -4865,11 +4865,11 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
       
 		$airline_country_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4887,11 +4887,11 @@ 
 	* @return Array the airline list
 	*
 	*/
-	public function countAllAirlinesByCountry($country,$filters = array())
+	public function countAllAirlinesByCountry($country, $filters = array())
 	{
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
 		 	    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
 			    GROUP BY spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country 
 			    ORDER BY airline_count DESC";
@@ -4902,7 +4902,7 @@ 
 
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_name'] = $row['airline_name'];
 			$temp_array['airline_icao'] = $row['airline_icao'];
@@ -4921,11 +4921,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllAirlineCountriesByCountry($country,$filters = array())
+	public function countAllAirlineCountriesByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
 		 		FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
 				GROUP BY spotter_output.airline_country
 				ORDER BY airline_country_count DESC
@@ -4937,7 +4937,7 @@ 
 
 		$airline_country_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -4957,35 +4957,35 @@ 
 	public function countAllAirlineCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count, countries.iso3 AS airline_country_iso3
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count, countries.iso3 AS airline_country_iso3
 		 			FROM countries, spotter_output".$filter_query." countries.name = spotter_output.airline_country AND spotter_output.airline_country <> '' AND spotter_output.airline_country <> 'NA'";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.airline_country, countries.iso3
@@ -4997,7 +4997,7 @@ 
 
 		$airline_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airline_country_count'] = $row['airline_country_count'];
 			$temp_array['airline_country'] = $row['airline_country'];
@@ -5014,11 +5014,11 @@ 
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
 		//$filter_query = $this->getFilter($filters,true,true);
-		$Connection= new Connection($this->db);
+		$Connection = new Connection($this->db);
 		if (!$Connection->tableExists('countries')) return array();
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -5033,7 +5033,7 @@ 
 */
 		require_once('class.SpotterLive.php');
 		$SpotterLive = new SpotterLive();
-		$filter_query = $SpotterLive->getFilter($filters,true,true);
+		$filter_query = $SpotterLive->getFilter($filters, true, true);
 		$filter_query .= ' over_country IS NOT NULL';
                 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -5060,7 +5060,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'];
@@ -5078,11 +5078,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
 		    FROM spotter_output ".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> ''";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -5102,28 +5102,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 
@@ -5135,7 +5135,7 @@ 
 
 		$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'];
@@ -5152,11 +5152,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '', $day = '')
+	public function countAllAircraftTypesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT spotter_output.airline_icao, spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA'";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -5176,28 +5176,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 
@@ -5209,7 +5209,7 @@ 
 
 		$aircraft_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['aircraft_icao'] = $row['aircraft_icao'];
@@ -5227,11 +5227,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllAircraftTypesByMonths($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT EXTRACT(month from spotter_output.date) as month, EXTRACT(year from spotter_output.date) as year,spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_name  <> '' AND spotter_output.aircraft_icao  <> '' AND spotter_output.airline_icao <>'' AND spotter_output.airline_icao <> 'NA' ";
 		if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
@@ -5256,7 +5256,7 @@ 
 
 		$aircraft_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['aircraft_icao'] = $row['aircraft_icao'];
@@ -5275,13 +5275,13 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
+	public function countAllAircraftRegistrationByAircraft($aircraft_icao, $filters = array())
 	{
 		$Image = new Image($this->db);
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
 				FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_icao = :aircraft_icao  
 				GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
 				ORDER BY registration_count DESC";
@@ -5292,14 +5292,14 @@ 
 		$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'];
 			$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'];
@@ -5318,11 +5318,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
+	public function countAllAircraftTypesByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 			    FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND spotter_output.airline_icao = :airline_icao 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
 			    ORDER BY aircraft_icao_count DESC";
@@ -5333,7 +5333,7 @@ 
 		$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'];
@@ -5351,13 +5351,13 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
+	public function countAllAircraftRegistrationByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.airline_icao = :airline_icao 
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
 			    ORDER BY registration_count DESC";
@@ -5367,14 +5367,14 @@ 
 
 		$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'];
 			$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'];
@@ -5393,11 +5393,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
+	public function countAllAircraftManufacturerByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.airline_icao = :airline_icao 
 				GROUP BY spotter_output.aircraft_manufacturer 
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -5408,7 +5408,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5425,12 +5425,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
+	public function countAllAircraftTypesByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 				FROM spotter_output".$filter_query." spotter_output.aircraft_icao <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao) 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
 				ORDER BY aircraft_icao_count DESC";
@@ -5440,7 +5440,7 @@ 
 
 		$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'];
@@ -5458,13 +5458,13 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
+	public function countAllAircraftRegistrationByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)   
                     GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
 		    ORDER BY registration_count DESC";
@@ -5474,14 +5474,14 @@ 
 
 		$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'];
 			$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'];
@@ -5499,11 +5499,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
+	public function countAllAircraftManufacturerByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)  
                     GROUP BY spotter_output.aircraft_manufacturer 
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -5514,7 +5514,7 @@ 
 
 		$aircraft_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5529,12 +5529,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
                     GROUP BY spotter_output.aircraft_name 
 					ORDER BY aircraft_icao_count DESC";
@@ -5543,7 +5543,7 @@ 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
 		$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'];
@@ -5562,11 +5562,11 @@ 
 	*/
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
                     GROUP BY spotter_output.registration 
 					ORDER BY registration_count DESC";
@@ -5576,14 +5576,14 @@ 
 		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer));
 		$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'];
 			$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']);
 				$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -5600,11 +5600,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByDate($date,$filters = array())
+	public function countAllAircraftTypesByDate($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);
@@ -5612,12 +5612,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 					FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
 					ORDER BY aircraft_icao_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 					FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
 					GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
 					ORDER BY aircraft_icao_count DESC";
@@ -5628,7 +5628,7 @@ 
 
 		$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'];
@@ -5646,12 +5646,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByDate($date,$filters = array())
+	public function countAllAircraftRegistrationByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
@@ -5659,12 +5659,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
 					ORDER BY registration_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name    
+			$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name    
 					FROM spotter_output".$filter_query." spotter_output.registration <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 					GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
 					ORDER BY registration_count DESC";
@@ -5675,14 +5675,14 @@ 
 
 		$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'];
 			$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'];
@@ -5701,11 +5701,11 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByDate($date,$filters = array())
+	public function countAllAircraftManufacturerByDate($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);
@@ -5713,12 +5713,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 				GROUP BY spotter_output.aircraft_manufacturer 
 				ORDER BY aircraft_manufacturer_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+			$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 				FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 				GROUP BY spotter_output.aircraft_manufacturer 
 				ORDER BY aircraft_manufacturer_count DESC";
@@ -5730,7 +5730,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -5747,11 +5747,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByIdent($ident,$filters = array())
+	public function countAllAircraftTypesByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 				FROM spotter_output".$filter_query." spotter_output.ident = :ident 
 				GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
 				ORDER BY aircraft_icao_count DESC";
@@ -5762,7 +5762,7 @@ 
 		$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'];
@@ -5779,45 +5779,45 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftTypesByPilot($pilot, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 				FROM spotter_output".$filter_query." (spotter_output.pilot_id = :pilot OR spotter_output.pilot_name = :pilot)";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 
 		$query .= " GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao
 				ORDER BY aircraft_icao_count DESC";
-		$query_values = array_merge($query_values,array(':pilot' => $pilot));
+		$query_values = array_merge($query_values, array(':pilot' => $pilot));
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -5829,44 +5829,44 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftTypesByOwner($owner, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer 
 				FROM spotter_output".$filter_query." spotter_output.owner_name = :owner";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_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);
@@ -5878,13 +5878,13 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
+	public function countAllAircraftRegistrationByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name  
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.ident = :ident   
                     GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name
 		    ORDER BY registration_count DESC";
@@ -5896,14 +5896,14 @@ 
 		$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'];
 			$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'];
@@ -5921,44 +5921,44 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftRegistrationByOwner($owner, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$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);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name  
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND spotter_output.owner_name = :owner";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$query_values = array_merge($query_values,array(':owner' => $owner));
+		$query_values = array_merge($query_values, array(':owner' => $owner));
 
 		$query .= " GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_name
 		    ORDER BY registration_count DESC";
@@ -5970,7 +5970,7 @@ 
 		$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'];
@@ -5978,7 +5978,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'];
@@ -5996,44 +5996,44 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftRegistrationByPilot($pilot, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.registration, spotter_output.airline_name  
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot)";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$query_values = array_merge($query_values,array(':pilot' => $pilot));
+		$query_values = array_merge($query_values, array(':pilot' => $pilot));
 
 		$query .= " GROUP BY spotter_output.registration,spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer, spotter_output.airline_name
 		    ORDER BY registration_count DESC";
@@ -6045,7 +6045,7 @@ 
 		$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'];
@@ -6053,7 +6053,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'];
@@ -6072,11 +6072,11 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
+	public function countAllAircraftManufacturerByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.ident = :ident  
                     GROUP BY spotter_output.aircraft_manufacturer 
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -6086,7 +6086,7 @@ 
 		$sth->execute(array(':ident' => $ident));
 		$aircraft_array = array();
 		$temp_array = array();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -6101,42 +6101,42 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftManufacturerByOwner($owner, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_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_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.owner_name = :owner";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$query_values = array_merge($query_values,array(':owner' => $owner));
+		$query_values = array_merge($query_values, array(':owner' => $owner));
 
 		$query .= " GROUP BY spotter_output.aircraft_manufacturer 
 		    ORDER BY aircraft_manufacturer_count DESC";
@@ -6153,42 +6153,42 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftManufacturerByPilot($pilot, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
 		    FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot)";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
-		$query_values = array_merge($query_values,array(':pilot' => $pilot));
+		$query_values = array_merge($query_values, array(':pilot' => $pilot));
 
 		$query .= " GROUP BY spotter_output.aircraft_manufacturer 
 		    ORDER BY aircraft_manufacturer_count DESC";
@@ -6206,24 +6206,24 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
+	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 		
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
                     FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
                     GROUP BY spotter_output.aircraft_name 
 					ORDER BY aircraft_icao_count DESC";
  
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
 		$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'];
@@ -6239,33 +6239,33 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
+	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name   
                     FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)   
                     GROUP BY spotter_output.registration 
 					ORDER BY registration_count DESC";
 
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
       
 		$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'];
 			$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'];
@@ -6285,25 +6285,25 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
+	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao) 
                     GROUP BY spotter_output.aircraft_manufacturer 
 					ORDER BY aircraft_manufacturer_count DESC";
 
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao));
       
 		$aircraft_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -6323,11 +6323,11 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftTypesByCountry($country,$filters = array())
+	public function countAllAircraftTypesByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
 			    GROUP BY spotter_output.aircraft_name, spotter_output.aircraft_icao 
 			    ORDER BY aircraft_icao_count DESC";
@@ -6339,7 +6339,7 @@ 
 		$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'];
@@ -6358,12 +6358,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationByCountry($country,$filters = array())
+	public function countAllAircraftRegistrationByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
 			    FROM spotter_output".$filter_query." spotter_output.registration <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country)    
 			    GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name 
 			    ORDER BY registration_count DESC";
@@ -6375,14 +6375,14 @@ 
 		$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'];
 			$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'];
@@ -6402,11 +6402,11 @@ 
 	* @return Array the aircraft manufacturer list
 	*
 	*/
-	public function countAllAircraftManufacturerByCountry($country,$filters = array())
+	public function countAllAircraftManufacturerByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer <> '' AND (((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country) 
                     GROUP BY spotter_output.aircraft_manufacturer 
 					ORDER BY aircraft_manufacturer_count DESC";
@@ -6418,7 +6418,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -6437,38 +6437,38 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftManufacturers($filters = array(),$year = '',$month = '',$day = '')
+	public function countAllAircraftManufacturers($filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
                 $query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.aircraft_manufacturer
@@ -6482,7 +6482,7 @@ 
 		$manufacturer_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['aircraft_manufacturer'] = $row['aircraft_manufacturer'];
 			$temp_array['aircraft_manufacturer_count'] = $row['aircraft_manufacturer_count'];
@@ -6501,12 +6501,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
+	public function countAllAircraftRegistrations($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
 		$Image = new Image($this->db);
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output ".$filter_query." spotter_output.registration <> '' AND spotter_output.registration <> 'NA'";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6526,28 +6526,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
@@ -6559,7 +6559,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['registration'] = $row['registration'];
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -6567,7 +6567,7 @@ 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 			$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'];
@@ -6586,12 +6586,12 @@ 
 	* @return Array the aircraft list
 	*
 	*/
-	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
+	public function countAllAircraftRegistrationsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$Image = new Image($this->db);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.registration, COUNT(spotter_output.registration) AS aircraft_registration_count, spotter_output.aircraft_icao,  spotter_output.aircraft_name, spotter_output.airline_name    
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6619,7 +6619,7 @@ 
 		$aircraft_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['registration'] = $row['registration'];
 			$temp_array['aircraft_registration_count'] = $row['aircraft_registration_count'];
@@ -6628,7 +6628,7 @@ 
 			$temp_array['aircraft_name'] = $row['aircraft_name'];
 			$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'];
@@ -6647,11 +6647,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
 				FROM airport, spotter_output".$filter_query." airport.icao = spotter_output.departure_airport_icao AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6671,28 +6671,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
                 $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
@@ -6704,7 +6704,7 @@ 
 
 		$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'];
@@ -6724,11 +6724,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
+	public function countAllDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6757,7 +6757,7 @@ 
 		$airport_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['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -6777,11 +6777,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country, airport.latitude as departure_airport_latitude, airport.longitude as departure_airport.longitude
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country, airport.latitude as departure_airport_latitude, airport.longitude as departure_airport.longitude
 				FROM airport, spotter_output".$filter_query." spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6801,28 +6801,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
                 $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
@@ -6835,7 +6835,7 @@ 
 		$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'];
@@ -6856,11 +6856,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array())
+	public function countAllDetectedDepartureAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country
 				FROM airport, spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_departure_airport_icao <> '' AND spotter_output.real_departure_airport_icao <> 'NA' AND airport.icao = spotter_output.real_departure_airport_icao ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6889,7 +6889,7 @@ 
 		$airport_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['airport_departure_icao'] = $row['departure_airport_icao'];
@@ -6909,11 +6909,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
+	public function countAllDepartureAirportsByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.airline_icao = :airline_icao AND spotter_output.departure_airport_icao <> '' 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    ORDER BY airport_departure_icao_count DESC";
@@ -6925,7 +6925,7 @@ 
 		$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'];
@@ -6947,11 +6947,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
+	public function countAllDepartureAirportCountriesByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS departure_airport_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS departure_airport_country_iso3 
 			FROM countries,spotter_output".$filter_query." countries.name = spotter_output.departure_airport_country AND spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
 			GROUP BY spotter_output.departure_airport_country, countries.iso3
 			ORDER BY airport_departure_country_count DESC";
@@ -6962,7 +6962,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -6980,11 +6980,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
+	public function countAllDepartureAirportsByAircraft($aircraft_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_icao = :aircraft_icao AND spotter_output.departure_airport_icao <> '' 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 			    ORDER BY airport_departure_icao_count DESC";
@@ -6996,7 +6996,7 @@ 
 		$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'];
@@ -7017,11 +7017,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
+	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS departure_airport_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS departure_airport_country_iso3 
 			FROM countries, spotter_output".$filter_query." countries.name = spotter_output.departure_airport_country AND spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
 			GROUP BY spotter_output.departure_airport_country, countries.iso3
 			ORDER BY airport_departure_country_count DESC";
@@ -7033,7 +7033,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7051,11 +7051,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
+	public function countAllDepartureAirportsByRegistration($registration, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.registration = :registration AND spotter_output.departure_airport_icao <> '' 
                     GROUP BY spotter_output.departure_airport_icao
 					ORDER BY airport_departure_icao_count DESC";
@@ -7067,7 +7067,7 @@ 
 		$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'];
@@ -7088,11 +7088,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
+	public function countAllDepartureAirportCountriesByRegistration($registration, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.registration = :registration 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7104,7 +7104,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7122,11 +7122,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
+	public function countAllDepartureAirportsByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao = :airport_icao AND spotter_output.departure_airport_icao <> '' 
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 			    ORDER BY airport_departure_icao_count DESC";
@@ -7138,7 +7138,7 @@ 
 		$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'];
@@ -7159,11 +7159,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
+	public function countAllDepartureAirportCountriesByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.arrival_airport_icao = :airport_icao 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7175,7 +7175,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7194,11 +7194,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer AND spotter_output.departure_airport_icao <> '' 
                     GROUP BY spotter_output.departure_airport_icao
 					ORDER BY airport_departure_icao_count DESC";
@@ -7210,7 +7210,7 @@ 
 		$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'];
@@ -7231,11 +7231,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7247,7 +7247,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7265,11 +7265,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByDate($date,$filters = array())
+	public function countAllDepartureAirportsByDate($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);
@@ -7277,12 +7277,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 					ORDER BY airport_departure_icao_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date
 					GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 					ORDER BY airport_departure_icao_count DESC";
@@ -7294,7 +7294,7 @@ 
 		$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'];
@@ -7315,11 +7315,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
+	public function countAllDepartureAirportCountriesByDate($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);
@@ -7327,12 +7327,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 					GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+			$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 					FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 					GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7344,7 +7344,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7362,11 +7362,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByIdent($ident,$filters = array())
+	public function countAllDepartureAirportsByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.ident = :ident 
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 		    ORDER BY airport_departure_icao_count DESC";
@@ -7378,7 +7378,7 @@ 
 		$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'];
@@ -7398,11 +7398,11 @@ 
 	* @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_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.owner_name = :owner 
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 		    ORDER BY airport_departure_icao_count DESC";
@@ -7414,7 +7414,7 @@ 
 		$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'];
@@ -7434,11 +7434,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByPilot($pilot,$filters = array())
+	public function countAllDepartureAirportsByPilot($pilot, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
                     GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 		    ORDER BY airport_departure_icao_count DESC";
@@ -7449,7 +7449,7 @@ 
 		$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'];
@@ -7471,11 +7471,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
+	public function countAllDepartureAirportCountriesByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.ident = :ident 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7487,7 +7487,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7504,11 +7504,11 @@ 
 	* @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_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.owner_name = :owner 
 			GROUP BY spotter_output.departure_airport_country
 			ORDER BY airport_departure_country_count DESC";
@@ -7524,11 +7524,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByPilot($pilot,$filters = array())
+	public function countAllDepartureAirportCountriesByPilot($pilot, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
 			GROUP BY spotter_output.departure_airport_country
 			ORDER BY airport_departure_country_count DESC";
@@ -7546,12 +7546,12 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportsByCountry($country,$filters = array())
+	public function countAllDepartureAirportsByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
+		$query = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
 			    GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country 
 			    ORDER BY airport_departure_icao_count DESC";
@@ -7563,7 +7563,7 @@ 
 		$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'];
@@ -7584,11 +7584,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
+	public function countAllDepartureAirportCountriesByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7600,7 +7600,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
@@ -7623,11 +7623,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude as arrival_airport_latitude, airport.longitude as arrival_airport_longitude 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude as arrival_airport_latitude, airport.longitude as arrival_airport_longitude 
 				FROM airport, spotter_output".$filter_query." airport.icao = spotter_output.arrival_airport_icao AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -7647,28 +7647,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
                 $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude, airport.longitude
@@ -7682,7 +7682,7 @@ 
 		$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'];
@@ -7707,11 +7707,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
+	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, country.iso3 AS arrival_airport_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, country.iso3 AS arrival_airport_country_iso3 
 			FROM countries,spotter_output".$filter_query." countries.name = spotter_output.arrival_airport_country AND spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -7741,7 +7741,7 @@ 
 		$airport_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['airport_arrival_icao'] = $row['arrival_airport_icao'];
@@ -7767,11 +7767,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, airport.latitude AS arrival_airport_latitude, airport.longitude AS arrival_airport_longitude 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, airport.latitude AS arrival_airport_latitude, airport.longitude AS arrival_airport_longitude 
 			FROM airport,spotter_output".$filter_query." spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -7791,28 +7791,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
@@ -7825,7 +7825,7 @@ 
       
 		$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'];
@@ -7848,11 +7848,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array())
+	public function countAllDetectedArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false, $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country 
 			FROM airport,spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.real_arrival_airport_icao <> '' AND spotter_output.real_arrival_airport_icao <> 'NA' AND airport.icao = spotter_output.real_arrival_airport_icao ";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -7882,7 +7882,7 @@ 
 		$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'];
@@ -7908,9 +7908,9 @@ 
 	*/
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.airline_icao = :airline_icao 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -7921,7 +7921,7 @@ 
 		$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'];
@@ -7942,12 +7942,12 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
+	public function countAllArrivalAirportCountriesByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 		
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS arrival_airport_country_iso3 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS arrival_airport_country_iso3 
 			FROM countries, spotter_output".$filter_query." countries.name = spotter_output.arrival_airport_country AND spotter_output.arrival_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
 			GROUP BY spotter_output.arrival_airport_country, countries.iso3
 			ORDER BY airport_arrival_country_count DESC";
@@ -7959,7 +7959,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -7976,11 +7976,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
+	public function countAllArrivalAirportsByAircraft($aircraft_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -7992,7 +7992,7 @@ 
 		$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'];
@@ -8014,11 +8014,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
+	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
 			    FROM countries, spotter_output".$filter_query." countries.name = spotter_output.arrival_airport_country AND spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
 			    GROUP BY spotter_output.arrival_airport_country, countries.iso3
 			    ORDER BY airport_arrival_country_count DESC";
@@ -8030,7 +8030,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8048,12 +8048,12 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
+	public function countAllArrivalAirportsByRegistration($registration, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.registration = :registration 
                     GROUP BY spotter_output.arrival_airport_icao
 					ORDER BY airport_arrival_icao_count DESC";
@@ -8065,7 +8065,7 @@ 
 		$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'];
@@ -8086,11 +8086,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
+	public function countAllArrivalAirportCountriesByRegistration($registration, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.registration = :registration 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8102,7 +8102,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8121,11 +8121,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
+	public function countAllArrivalAirportsByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.departure_airport_icao = :airport_icao 
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -8137,7 +8137,7 @@ 
 		$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'];
@@ -8158,11 +8158,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
+	public function countAllArrivalAirportCountriesByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.departure_airport_icao = :airport_icao 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8174,7 +8174,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8192,11 +8192,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
                     GROUP BY spotter_output.arrival_airport_icao
 					ORDER BY airport_arrival_icao_count DESC";
@@ -8208,7 +8208,7 @@ 
 		$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'];
@@ -8230,11 +8230,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
+	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8246,7 +8246,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8265,11 +8265,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByDate($date,$filters = array())
+	public function countAllArrivalAirportsByDate($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);
@@ -8277,12 +8277,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date  
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 					ORDER BY airport_arrival_icao_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date  
 					GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 					ORDER BY airport_arrival_icao_count DESC";
@@ -8294,7 +8294,7 @@ 
 		$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'];
@@ -8318,8 +8318,8 @@ 
 	public function countAllArrivalAirportCountriesByDate($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);
@@ -8327,12 +8327,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date 
 					GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+			$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 					FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date 
 					GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8344,7 +8344,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8362,11 +8362,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByIdent($ident,$filters = array())
+	public function countAllArrivalAirportsByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.ident = :ident  
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -8378,7 +8378,7 @@ 
 		$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'];
@@ -8398,11 +8398,11 @@ 
 	* @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_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND spotter_output.owner_name = :owner 
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -8413,7 +8413,7 @@ 
 		$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'];
@@ -8433,11 +8433,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByPilot($pilot,$filters = array())
+	public function countAllArrivalAirportsByPilot($pilot, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 		    FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
                     GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 		    ORDER BY airport_arrival_icao_count DESC";
@@ -8448,7 +8448,7 @@ 
 		$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'];
@@ -8470,9 +8470,9 @@ 
 	*/
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.ident = :ident 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8484,7 +8484,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8503,9 +8503,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_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$owner = filter_var($owner, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 		    FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.owner_name = :owner 
                     GROUP BY spotter_output.arrival_airport_country
 		    ORDER BY airport_arrival_country_count DESC";
@@ -8523,9 +8523,9 @@ 
 	*/
 	public function countAllArrivalAirportCountriesByPilot($pilot, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 		    FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
                     GROUP BY spotter_output.arrival_airport_country
 		    ORDER BY airport_arrival_country_count DESC";
@@ -8543,11 +8543,11 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportsByCountry($country,$filters = array())
+	public function countAllArrivalAirportsByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country  
 			    GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY airport_arrival_icao_count DESC";
@@ -8559,7 +8559,7 @@ 
 		$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'];
@@ -8580,12 +8580,12 @@ 
 	* @return Array the airport list
 	*
 	*/
-	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
+	public function countAllArrivalAirportCountriesByCountry($country, $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8597,7 +8597,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['arrival_airport_country'] = $row['arrival_airport_country'];
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
@@ -8616,38 +8616,38 @@ 
 	* @return Array the airport departure list
 	*
 	*/
-	public function countAllDepartureCountries($filters = array(),$year = '',$month = '', $day = '')
+	public function countAllDepartureCountries($filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count, countries.iso3 AS airport_departure_country_iso3 
 				FROM countries,spotter_output".$filter_query." countries.name = spotter_output.departure_airport_country AND spotter_output.departure_airport_country <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.departure_airport_country, countries.iso3
@@ -8661,7 +8661,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_departure_country_count'] = $row['airport_departure_country_count'];
 			$temp_array['airport_departure_country'] = $row['departure_airport_country'];
@@ -8679,38 +8679,38 @@ 
 	* @return Array the airport arrival list
 	*
 	*/
-	public function countAllArrivalCountries($limit = true,$filters = array(),$year = '',$month = '',$day = '')
+	public function countAllArrivalCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 
 			FROM countries, spotter_output".$filter_query." countries.name = spotter_output.arrival_airport_country AND spotter_output.arrival_airport_country <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.arrival_airport_country, countries.iso3
@@ -8724,7 +8724,7 @@ 
 		$airport_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['airport_arrival_country_count'] = $row['airport_arrival_country_count'];
 			$temp_array['airport_arrival_country'] = $row['arrival_airport_country'];
@@ -8748,8 +8748,8 @@ 
 	*/
 	public function countAllRoutes($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''
                     GROUP BY route,spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
                     ORDER BY route_count DESC
@@ -8762,7 +8762,7 @@ 
 		$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'];
@@ -8789,11 +8789,11 @@ 
 	* @return Array the route list
 	*
 	*/
-	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
+	public function countAllRoutesByAircraft($aircraft_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_icao = :aircraft_icao 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY route_count DESC";
@@ -8804,7 +8804,7 @@ 
 		$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'];
@@ -8831,9 +8831,9 @@ 
 	*/
 	public function countAllRoutesByRegistration($registration, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 			FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.registration = :registration 
                     GROUP BY route
                     ORDER BY route_count DESC";
@@ -8845,7 +8845,7 @@ 
 		$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'];
@@ -8873,9 +8873,9 @@ 
 	*/
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.airline_icao = :airline_icao 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY route_count DESC";
@@ -8887,7 +8887,7 @@ 
 		$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'];
@@ -8915,9 +8915,9 @@ 
 	*/
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY route_count DESC";
@@ -8928,7 +8928,7 @@ 
 		$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'];
@@ -8956,9 +8956,9 @@ 
 	*/
 	public function countAllRoutesByCountry($country, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 			    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country 
 			    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country 
 			    ORDER BY route_count DESC";
@@ -8969,7 +8969,7 @@ 
 		$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'];
@@ -8997,8 +8997,8 @@ 
 	public function countAllRoutesByDate($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);
@@ -9006,12 +9006,12 @@ 
 		} else $offset = '+00:00';
 		
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date  
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 				    ORDER BY route_count DESC";
 		} else {
-			$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+			$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 				    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = :date  
 				    GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 				    ORDER BY route_count DESC";
@@ -9023,7 +9023,7 @@ 
 		$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'];
@@ -9050,9 +9050,9 @@ 
 	*/
 	public function countAllRoutesByIdent($ident, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.ident = :ident   
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
                     ORDER BY route_count DESC";
@@ -9064,7 +9064,7 @@ 
 		$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'];
@@ -9088,11 +9088,11 @@ 
 	* @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_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_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_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.owner_name = :owner 
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
                     ORDER BY route_count DESC";
@@ -9104,7 +9104,7 @@ 
 		$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'];
@@ -9128,11 +9128,11 @@ 
 	* @return Array the route list
 	*
 	*/
-	public function countAllRoutesByPilot($pilot,$filters = array())
+	public function countAllRoutesByPilot($pilot, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
                     GROUP BY route, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
                     ORDER BY route_count DESC";
@@ -9144,7 +9144,7 @@ 
 		$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'];
@@ -9171,9 +9171,9 @@ 
 	*/
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-		$query  = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
+		$query = "SELECT DISTINCT concat(spotter_output.departure_airport_icao, ' - ',  spotter_output.arrival_airport_icao) AS route, count(concat(spotter_output.departure_airport_icao, ' - ', spotter_output.arrival_airport_icao)) AS route_count, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.aircraft_manufacturer = :aircraft_manufacturer   
                     GROUP BY route
                     ORDER BY route_count DESC";
@@ -9185,7 +9185,7 @@ 
 		$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'];
@@ -9213,8 +9213,8 @@ 
 	*/
 	public function countAllRoutesWithWaypoints($filters = array())
 	{
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.waypoints AS route, count(spotter_output.waypoints) AS route_count, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name AS airport_departure_name, spotter_output.departure_airport_city AS airport_departure_city, spotter_output.departure_airport_country AS airport_departure_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name AS airport_arrival_name, spotter_output.arrival_airport_city AS airport_arrival_city, spotter_output.arrival_airport_country AS airport_arrival_country
 		    FROM spotter_output".$filter_query." spotter_output.ident <> '' AND spotter_output.waypoints <> '' 
                     GROUP BY route, spotter_output.spotter_id, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
                     ORDER BY route_count DESC
@@ -9227,7 +9227,7 @@ 
 		$routes_array = array();
 		$temp_array = array();
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array['spotter_id'] = $row['spotter_id'];
 			$temp_array['route_count'] = $row['route_count'];
@@ -9252,11 +9252,11 @@ 
 	* @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 spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name, spotter_output.airline_icao  
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
@@ -9270,28 +9270,28 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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(spotter_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 spotter_output.date) = :day";
-				$query_values = array_merge($query_values,array(':day' => $day));
+				$query_values = array_merge($query_values, array(':day' => $day));
 			}
 		}
 		$query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
@@ -9303,7 +9303,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'];
@@ -9325,8 +9325,8 @@ 
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.ident, COUNT(spotter_output.ident) AS callsign_icao_count, spotter_output.airline_name  
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''  AND spotter_output.airline_icao <> '' ";
 		 if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
@@ -9345,7 +9345,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'];
@@ -9399,7 +9399,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'];
@@ -9424,15 +9424,15 @@ 
 			$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 spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_count DESC
 								LIMIT 10 OFFSET 0";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
 								FROM spotter_output 
 								WHERE spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, date_name 
@@ -9447,7 +9447,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'];
@@ -9473,7 +9473,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(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -9494,7 +9494,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'];
@@ -9519,7 +9519,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(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
@@ -9540,7 +9540,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'];
@@ -9561,7 +9561,7 @@ 
 	public function countAllDatesLastMonthByAirlines($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();
@@ -9569,13 +9569,13 @@ 
 		} else $offset = '+00:00';
 		
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY spotter_output.date ASC";
 			$query_data = array(':offset' => $offset);
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') AS date_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.date >= CURRENT_TIMESTAMP AT TIME ZONE INTERVAL :offset - INTERVAL '1 MONTHS'
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_name ASC";
@@ -9588,7 +9588,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'];
@@ -9635,7 +9635,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'];
@@ -9656,7 +9656,7 @@ 
 	public function countAllMonthsByAirlines($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();
@@ -9664,12 +9664,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
 								FROM spotter_output 
 								WHERE spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name 
@@ -9683,7 +9683,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'];
@@ -9710,14 +9710,14 @@ 
 			$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 YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
 								GROUP BY year_name, month_name 
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_type = 'military'
 								GROUP BY year_name, month_name 
 								ORDER BY date_count DESC";
@@ -9729,7 +9729,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'];
@@ -9755,15 +9755,15 @@ 
 			$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 YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
 								FROM spotter_output".$filter_query." owner_name <> ''
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
 								FROM spotter_output".$filter_query." owner_name <> ''
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
@@ -9775,7 +9775,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'];
@@ -9796,7 +9796,7 @@ 
 	public function countAllMonthsOwnersByAirlines($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();
@@ -9804,12 +9804,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct owner_name) as date_count
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct owner_name) as date_count
 								FROM spotter_output".$filter_query." owner_name <> '' AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
@@ -9821,7 +9821,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'];
@@ -9848,15 +9848,15 @@ 
 			$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 YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
 								FROM spotter_output".$filter_query." pilot_id <> '' AND pilot_id IS NOT NULL
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
@@ -9868,7 +9868,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'];
@@ -9889,7 +9889,7 @@ 
 	public function countAllMonthsPilotsByAirlines($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();
@@ -9897,12 +9897,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct pilot_id) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
 								GROUP BY spotter_output.airline_icao,year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct pilot_id) as date_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND pilot_id <> '' AND pilot_id IS NOT NULL
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
@@ -9914,7 +9914,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'];
@@ -9936,7 +9936,7 @@ 
 	public function countAllMonthsAirlines($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();
@@ -9944,12 +9944,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct airline_icao) as date_count
 								FROM spotter_output".$filter_query." airline_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct airline_icao) as date_count
 								FROM spotter_output".$filter_query." airline_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
@@ -9961,7 +9961,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'];
@@ -9987,15 +9987,15 @@ 
 			$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 YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
 								FROM spotter_output".$filter_query." aircraft_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
@@ -10007,7 +10007,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'];
@@ -10029,7 +10029,7 @@ 
 	public function countAllMonthsAircraftsByAirlines($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();
@@ -10037,12 +10037,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
+			$query = "SELECT spotter_output.airline_icao,YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(distinct aircraft_icao) as date_count
 								FROM spotter_output".$filter_query." aircraft_icao <> ''  AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(distinct aircraft_icao) as date_count
 								FROM spotter_output".$filter_query." aircraft_icao <> '' AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
@@ -10054,7 +10054,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'];
@@ -10081,15 +10081,15 @@ 
 			$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 YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
+			$query = "SELECT YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
+			$query = "SELECT EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' 
 								GROUP BY year_name, month_name
 								ORDER BY date_count DESC";
@@ -10101,7 +10101,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'];
@@ -10123,7 +10123,7 @@ 
 	public function countAllMonthsRealArrivalsByAirlines($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();
@@ -10131,12 +10131,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
+			$query = "SELECT spotter_output.airline_icao, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS month_name, count(real_arrival_airport_icao) as date_count
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(YEAR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS year_name,EXTRACT(MONTH FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS month_name, count(real_arrival_airport_icao) as date_count
 								FROM spotter_output".$filter_query." real_arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, year_name, month_name
 								ORDER BY date_count DESC";
@@ -10148,7 +10148,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'];
@@ -10176,7 +10176,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(spotter_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 								FROM spotter_output".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
@@ -10197,7 +10197,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'];
@@ -10217,7 +10217,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -10265,7 +10265,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'];
@@ -10285,7 +10285,7 @@ 
 	public function countAllHoursByAirlines($orderby, $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();
@@ -10303,7 +10303,7 @@ 
 		}
 		
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT spotter_output.airline_icao, HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, hour_name 
 								".$orderby_sql;
@@ -10316,7 +10316,7 @@ 
   */    
 		$query_data = array(':offset' => $offset);
 		} else {
-			$query  = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT spotter_output.airline_icao, EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' 
 								GROUP BY spotter_output.airline_icao, hour_name 
 								".$orderby_sql;
@@ -10329,7 +10329,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'];
@@ -10352,34 +10352,34 @@ 
 	public function countAllHoursByAirline($airline_icao, $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();
 			$offset = $datetime->format('P');
 		} else $offset = '+00:00';
 
-		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.airline_icao = :airline_icao
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':airline_icao' => $airline_icao,':offset' => $offset));
+		$sth->execute(array(':airline_icao' => $airline_icao, ':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'];
@@ -10402,8 +10402,8 @@ 
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10411,24 +10411,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.aircraft_icao = :aircraft_icao
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':aircraft_icao' => $aircraft_icao,':offset' => $offset));
+		$sth->execute(array(':aircraft_icao' => $aircraft_icao, ':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'];
@@ -10449,8 +10449,8 @@ 
 	public function countAllHoursByRegistration($registration, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10458,24 +10458,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.registration = :registration
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':registration' => $registration,':offset' => $offset));
+		$sth->execute(array(':registration' => $registration, ':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'];
@@ -10496,8 +10496,8 @@ 
 	public function countAllHoursByAirport($airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$airport_icao = filter_var($airport_icao, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10505,24 +10505,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :airport_icao OR spotter_output.arrival_airport_icao = :airport_icao)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':airport_icao' => $airport_icao,':offset' => $offset));
+		$sth->execute(array(':airport_icao' => $airport_icao, ':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'];
@@ -10541,11 +10541,11 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
+	public function countAllHoursByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10553,24 +10553,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.aircraft_manufacturer = :aircraft_manufacturer
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer,':offset' => $offset));
+		$sth->execute(array(':aircraft_manufacturer' => $aircraft_manufacturer, ':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'];
@@ -10592,8 +10592,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);
@@ -10601,12 +10601,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -10618,7 +10618,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'];
@@ -10640,8 +10640,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();
@@ -10649,12 +10649,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.ident = :ident 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -10662,12 +10662,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'];
@@ -10687,8 +10687,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();
@@ -10696,12 +10696,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.owner_name = :owner 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." spotter_output.owner_name = :owner 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -10709,12 +10709,12 @@ 
       
 		
 		$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'];
@@ -10734,8 +10734,8 @@ 
 	public function countAllHoursByPilot($pilot, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$pilot = filter_var($pilot, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10743,12 +10743,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.pilot_name = :pilot OR spotter_output.pilot_id = :pilot) 
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -10756,12 +10756,12 @@ 
       
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':pilot' => $pilot,':offset' => $offset));
+		$sth->execute(array(':pilot' => $pilot, ':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'];
@@ -10780,12 +10780,12 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
+	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING);
-		$arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING);
+		$arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10793,24 +10793,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." (spotter_output.departure_airport_icao = :departure_airport_icao) AND (spotter_output.arrival_airport_icao = :arrival_airport_icao)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao,':arrival_airport_icao' => $arrival_airport_icao,':offset' => $offset));
+		$sth->execute(array(':departure_airport_icao' => $departure_airport_icao, ':arrival_airport_icao' => $arrival_airport_icao, ':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'];
@@ -10831,8 +10831,8 @@ 
 	public function countAllHoursByCountry($country, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$country = filter_var($country,FILTER_SANITIZE_STRING);
+		$filter_query = $this->getFilter($filters, true, true);
+		$country = filter_var($country, FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -10840,24 +10840,24 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." ((spotter_output.departure_airport_country = :country) OR (spotter_output.arrival_airport_country = :country)) OR spotter_output.airline_country = :country
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		}
 		
 		$sth = $this->db->prepare($query);
-		$sth->execute(array(':country' => $country,':offset' => $offset));
+		$sth->execute(array(':country' => $country, ':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'];
@@ -10877,29 +10877,29 @@ 
 	* @return Integer the number of aircrafts
 	*
 	*/
-	public function countOverallAircrafts($filters = array(),$year = '',$month = '')
+	public function countOverallAircrafts($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(DISTINCT spotter_output.aircraft_icao) AS aircraft_count  
                     FROM spotter_output".$filter_query." spotter_output.ident <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 
@@ -10914,29 +10914,29 @@ 
 	* @return Integer the number of aircrafts
 	*
 	*/
-	public function countOverallArrival($filters = array(),$year = '',$month = '')
+	public function countOverallArrival($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(spotter_output.real_arrival_airport_icao) AS arrival_count  
                     FROM spotter_output".$filter_query." spotter_output.arrival_airport_icao <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		
@@ -10951,29 +10951,29 @@ 
 	* @return Integer the number of pilots
 	*
 	*/
-	public function countOverallPilots($filters = array(),$year = '',$month = '')
+	public function countOverallPilots($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(DISTINCT spotter_output.pilot_id) AS pilot_count  
                     FROM spotter_output".$filter_query." spotter_output.pilot_id <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		$sth = $this->db->prepare($query);
@@ -10987,29 +10987,29 @@ 
 	* @return Integer the number of owners
 	*
 	*/
-	public function countOverallOwners($filters = array(),$year = '',$month = '')
+	public function countOverallOwners($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(DISTINCT spotter_output.owner_name) AS owner_count  
                     FROM spotter_output".$filter_query." spotter_output.owner_name <> ''";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
 		$sth = $this->db->prepare($query);
@@ -11024,32 +11024,32 @@ 
 	* @return Integer the number of flights
 	*
 	*/
-	public function countOverallFlights($filters = array(),$year = '',$month = '')
+	public function countOverallFlights($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count FROM spotter_output";
+		$queryi = "SELECT COUNT(spotter_output.spotter_id) AS flight_count FROM spotter_output";
 		$query_values = array();
 		$query = '';
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_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);
@@ -11062,29 +11062,29 @@ 
 	* @return Integer the number of flights
 	*
 	*/
-	public function countOverallMilitaryFlights($filters = array(),$year = '',$month = '')
+	public function countOverallMilitaryFlights($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$filter_query = $this->getFilter($filters,true,true);
-		$query  = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
+		$filter_query = $this->getFilter($filters, true, true);
+		$query = "SELECT COUNT(spotter_output.spotter_id) AS flight_count  
                     FROM airlines,spotter_output".$filter_query." spotter_output.airline_icao = airlines.icao AND airlines.type = 'military'";
 		$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
       
@@ -11101,10 +11101,10 @@ 
 	* @return Integer the number of airlines
 	*
 	*/
-	public function countOverallAirlines($filters = array(),$year = '',$month = '')
+	public function countOverallAirlines($filters = array(), $year = '', $month = '')
 	{
 		global $globalDBdriver;
-		$queryi  = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count 
+		$queryi = "SELECT COUNT(DISTINCT spotter_output.airline_name) AS airline_count 
 							FROM spotter_output";
       
 		$query_values = array();
@@ -11112,23 +11112,23 @@ 
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_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 spotter_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(spotter_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 spotter_output.date) = :month";
-				$query_values = array_merge($query_values,array(':month' => $month));
+				$query_values = array_merge($query_values, array(':month' => $month));
 			}
 		}
                 if ($query == '') $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);
@@ -11146,7 +11146,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();
@@ -11154,12 +11154,12 @@ 
 		} else $offset = '+00:00';
 
 		if ($globalDBdriver == 'mysql') {
-			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
+			$query = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) = CURDATE()
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
 		} else {
-			$query  = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
+			$query = "SELECT EXTRACT(HOUR FROM spotter_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
 								FROM spotter_output".$filter_query." to_char(spotter_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
 								GROUP BY hour_name 
 								ORDER BY hour_name ASC";
@@ -11171,7 +11171,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'];
@@ -11190,14 +11190,14 @@ 
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
 	{
 		global $global_query, $globalDBdriver, $globalTimezone;
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		date_default_timezone_set('UTC');
 		$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[0].",".$limit_array[1];
@@ -11250,7 +11250,7 @@ 
 			    GROUP BY spotter_output.ident,spotter_output.airline_name,spotter_output.airline_icao,spotter_output.airline_country,spotter_output.airline_type,spotter_output.departure_airport_icao,spotter_output.departure_airport_name,spotter_output.departure_airport_city,spotter_output.departure_airport_country,spotter_output.departure_airport_time,spotter_output.arrival_airport_icao,spotter_output.arrival_airport_name,spotter_output.arrival_airport_city,spotter_output.arrival_airport_country,spotter_output.arrival_airport_time, to_char(spotter_output.date,'HH')
 			    HAVING count(spotter_output.ident) > 5$orderby_query";
 			//echo $query;
-			$spotter_array = $this->getDataFromDB($query.$limit_query,array(':timezone' => $globalTimezone));
+			$spotter_array = $this->getDataFromDB($query.$limit_query, array(':timezone' => $globalTimezone));
 			/*
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':timezone' => $globalTimezone));
@@ -11269,9 +11269,9 @@ 
 	*/
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
 	{
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
+		$flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT spotter_output.spotter_id
+		$query = "SELECT spotter_output.spotter_id
 								FROM spotter_output 
 								WHERE spotter_output.flightaware_id = '".$flightaware_id."'";
         
@@ -11279,7 +11279,7 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			return $row['spotter_id'];
 		}
@@ -11304,23 +11304,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;	
 	}	
@@ -11346,63 +11346,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";
@@ -11455,8 +11455,8 @@ 
 	*/
 	public function getAircraftRegistrationBymodeS($aircraft_modes, $source_type = '')
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
-		$source_type = filter_var($source_type,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
+		$source_type = filter_var($source_type, FILTER_SANITIZE_STRING);
 		if ($source_type == '' || $source_type == 'modes') {
 			$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes AND aircraft_modes.source_type = 'modes' ORDER BY FirstCreated DESC LIMIT 1";
 		} else {
@@ -11483,10 +11483,10 @@ 
 	* @return String the aircraft type
 	*
 	*/
-	public function getAircraftTypeBymodeS($aircraft_modes,$source_type = '')
+	public function getAircraftTypeBymodeS($aircraft_modes, $source_type = '')
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
-		$source_type = filter_var($source_type,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
+		$source_type = filter_var($source_type, FILTER_SANITIZE_STRING);
 		if ($source_type == '' || $source_type == 'modes') {
 			$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes AND aircraft_modes.source_type = 'modes' ORDER BY FirstCreated DESC LIMIT 1";
 		} else {
@@ -11514,11 +11514,11 @@ 
 	* @param Float $longitude longitute of the flight
 	* @return String the countrie
 	*/
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
 	{
 		global $globalDBdriver, $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 '';
@@ -11558,7 +11558,7 @@ 
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $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 '';
@@ -11590,19 +11590,19 @@ 
 	*/
 	public function convertAircraftRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		$registration_prefix = '';
 		$registration_1 = substr($registration, 0, 1);
 		$registration_2 = substr($registration, 0, 2);
 
 		//first get the prefix based on two characters
-		$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
+		$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_2";
       
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration_2' => $registration_2));
         
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$registration_prefix = $row['registration_prefix'];
 		}
@@ -11610,11 +11610,11 @@ 
 		//if we didn't find a two chracter prefix lets just search the one with one character
 		if ($registration_prefix == '')
 		{
-			$query  = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
+			$query = "SELECT aircraft_registration.registration_prefix FROM aircraft_registration WHERE registration_prefix = :registration_1";
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':registration_1' => $registration_1));
 	        
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$registration_prefix = $row['registration_prefix'];
 			}
@@ -11628,7 +11628,7 @@ 
 			} else {
 				$registration = preg_replace("/^(.{1})/", "$1-", $registration);
 			}
-		} else if(strlen($registration_prefix) == 2){
+		} else if (strlen($registration_prefix) == 2) {
 			if (0 === strpos($registration, 'N')) {
 				$registration = preg_replace("/^(.{2})/", "$1", $registration);
 			} else {
@@ -11647,17 +11647,17 @@ 
 	*/
 	public function countryFromAircraftRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		
 		$registration_prefix = '';
-		$registration_test = explode('-',$registration);
+		$registration_test = explode('-', $registration);
 		$country = '';
 		if ($registration_test[0] != $registration) {
 			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
 	      
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':registration_1' => $registration_test[0]));
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				//$registration_prefix = $row['registration_prefix'];
 				$country = $row['country'];
@@ -11668,13 +11668,13 @@ 
 
 			$country = '';
 			//first get the prefix based on two characters
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
       
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':registration_2' => $registration_2));
         
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$registration_prefix = $row['registration_prefix'];
 				$country = $row['country'];
@@ -11683,12 +11683,12 @@ 
 			//if we didn't find a two chracter prefix lets just search the one with one character
 			if ($registration_prefix == "")
 			{
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
 	      
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':registration_1' => $registration_1));
 	        
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 				{
 					//$registration_prefix = $row['registration_prefix'];
 					$country = $row['country'];
@@ -11708,17 +11708,17 @@ 
 	*/
 	public function registrationPrefixFromAircraftRegistration($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		
 		$registration_prefix = '';
-		$registration_test = explode('-',$registration);
+		$registration_test = explode('-', $registration);
 		//$country = '';
 		if ($registration_test[0] != $registration) {
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
 	      
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':registration_1' => $registration_test[0]));
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$registration_prefix = $row['registration_prefix'];
 				//$country = $row['country'];
@@ -11728,13 +11728,13 @@ 
 		        $registration_2 = substr($registration, 0, 2);
 
 			//first get the prefix based on two characters
-			$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
+			$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
       
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':registration_2' => $registration_2));
         
-			while($row = $sth->fetch(PDO::FETCH_ASSOC))
+			while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 			{
 				$registration_prefix = $row['registration_prefix'];
 				//$country = $row['country'];
@@ -11743,12 +11743,12 @@ 
 			//if we didn't find a two chracter prefix lets just search the one with one character
 			if ($registration_prefix == "")
 			{
-				$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
+				$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_1 LIMIT 1";
 	      
 				$sth = $this->db->prepare($query);
 				$sth->execute(array(':registration_1' => $registration_1));
 	        
-				while($row = $sth->fetch(PDO::FETCH_ASSOC))
+				while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 				{
 					$registration_prefix = $row['registration_prefix'];
 					//$country = $row['country'];
@@ -11769,13 +11769,13 @@ 
 	*/
 	public function countryFromAircraftRegistrationCode($registration)
 	{
-		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 		
 		$country = '';
-		$query  = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
+		$query = "SELECT aircraft_registration.registration_prefix, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration LIMIT 1";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':registration' => $registration));
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$country = $row['country'];
 		}
@@ -11788,9 +11788,9 @@ 
 	* @param String $flightaware_id flightaware_id from spotter_output table
 	* @param String $highlight New highlight value
 	*/
-	public function setHighlightFlight($flightaware_id,$highlight) {
+	public function setHighlightFlight($flightaware_id, $highlight) {
 		
-		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
+		$query = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':flightaware_id' => $flightaware_id, ':highlight' => $highlight));
 	}
@@ -11802,13 +11802,13 @@ 
 	* @param String $date Date of spotted aircraft
 	* @param String $highlight New highlight value
 	*/
-	public function setHighlightFlightByRegistration($registration,$highlight, $date = '') {
+	public function setHighlightFlightByRegistration($registration, $highlight, $date = '') {
 		if ($date == '') {
 			$query  = "UPDATE spotter_output SET highlight = :highlight WHERE spotter_id IN (SELECT MAX(spotter_id) FROM spotter_output WHERE registration = :registration)";
 			$query_values = array(':registration' => $registration, ':highlight' => $highlight);
 		} else {
 			$query  = "UPDATE spotter_output SET highlight = :highlight WHERE registration = :registration AND date(date) = :date";
-			$query_values = array(':registration' => $registration, ':highlight' => $highlight,':date' => $date);
+			$query_values = array(':registration' => $registration, ':highlight' => $highlight, ':date' => $date);
 		}
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -11838,7 +11838,7 @@ 
 		
 		$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;
 		}
 
@@ -11848,7 +11848,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_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("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_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;
 		
@@ -11982,14 +11982,14 @@ 
 		}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$departure_airport_array = $this->getAllAirportInfo($row['fromairport_icao']);
 			$arrival_airport_array = $this->getAllAirportInfo($row['toairport_icao']);
 			if (count($departure_airport_array) > 0 && count($arrival_airport_array) > 0) {
-				$update_query="UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
+				$update_query = "UPDATE spotter_output SET departure_airport_icao = :fromicao, arrival_airport_icao = :toicao, departure_airport_name = :departure_airport_name, departure_airport_city = :departure_airport_city, departure_airport_country = :departure_airport_country, arrival_airport_name = :arrival_airport_name, arrival_airport_city = :arrival_airport_city, arrival_airport_country = :arrival_airport_country WHERE spotter_id = :spotter_id";
 				$sthu = $this->db->prepare($update_query);
-				$sthu->execute(array(':fromicao' => $row['fromairport_icao'],':toicao' => $row['toairport_icao'],':spotter_id' => $row['spotter_id'],':departure_airport_name' => $departure_airport_array[0]['name'],':departure_airport_city' => $departure_airport_array[0]['city'],':departure_airport_country' => $departure_airport_array[0]['country'],':arrival_airport_name' => $arrival_airport_array[0]['name'],':arrival_airport_city' => $arrival_airport_array[0]['city'],':arrival_airport_country' => $arrival_airport_array[0]['country']));
+				$sthu->execute(array(':fromicao' => $row['fromairport_icao'], ':toicao' => $row['toairport_icao'], ':spotter_id' => $row['spotter_id'], ':departure_airport_name' => $departure_airport_array[0]['name'], ':departure_airport_city' => $departure_airport_array[0]['city'], ':departure_airport_country' => $departure_airport_array[0]['country'], ':arrival_airport_name' => $arrival_airport_array[0]['name'], ':arrival_airport_city' => $arrival_airport_array[0]['city'], ':arrival_airport_country' => $arrival_airport_array[0]['country']));
 			}
 		}
 		
@@ -12002,7 +12002,7 @@ 
 		}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if (is_numeric(substr($row['ident'], -1, 1)))
 			{
@@ -12011,11 +12011,11 @@ 
 				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3),$fromsource);
+				$airline_array = $this->getAllAirlineInfo(substr($row['ident'], 0, 3), $fromsource);
 				if (isset($airline_array[0]['name'])) {
-					$update_query  = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
+					$update_query = "UPDATE spotter_output SET spotter_output.airline_name = :airline_name, spotter_output.airline_icao = :airline_icao, spotter_output.airline_country = :airline_country, spotter_output.airline_type = :airline_type WHERE spotter_output.spotter_id = :spotter_id";
 					$sthu = $this->db->prepare($update_query);
-					$sthu->execute(array(':airline_name' => $airline_array[0]['name'],':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
+					$sthu->execute(array(':airline_name' => $airline_array[0]['name'], ':airline_icao' => $airline_array[0]['icao'], ':airline_country' => $airline_array[0]['country'], ':airline_type' => $airline_array[0]['type'], ':spotter_id' => $row['spotter_id']));
 				}
 			}
 		}
@@ -12035,18 +12035,18 @@ 
 		}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if ($row['aircraft_icao'] != '') {
 				$aircraft_name = $this->getAllAircraftInfo($row['aircraft_icao']);
-				if ($row['registration'] != ""){
+				if ($row['registration'] != "") {
 					$image_array = $Image->getSpotterImage($row['registration']);
 					if (!isset($image_array[0]['registration'])) {
 						$Image->addSpotterImage($row['registration']);
 					}
 				}
 				if (count($aircraft_name) > 0) {
-					$update_query  = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
+					$update_query = "UPDATE spotter_output SET spotter_output.aircraft_name = :aircraft_name, spotter_output.aircraft_manufacturer = :aircraft_manufacturer WHERE spotter_output.spotter_id = :spotter_id";
 					$sthu = $this->db->prepare($update_query);
 					$sthu->execute(array(':aircraft_name' => $aircraft_name[0]['type'], ':aircraft_manufacturer' => $aircraft_name[0]['manufacturer'], ':spotter_id' => $row['spotter_id']));
 				}
@@ -12061,10 +12061,10 @@ 
 		$query = "SELECT spotter_output.spotter_id, spotter_output.last_latitude, spotter_output.last_longitude, spotter_output.last_altitude, spotter_output.arrival_airport_icao, spotter_output.real_arrival_airport_icao FROM spotter_output";
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			if ($row['last_latitude'] != '' && $row['last_longitude'] != '') {
-				$closestAirports = $this->closestAirports($row['last_latitude'],$row['last_longitude'],$globalClosestMinDist);
+				$closestAirports = $this->closestAirports($row['last_latitude'], $row['last_longitude'], $globalClosestMinDist);
 				$airport_icao = '';
 				 if (isset($closestAirports[0])) {
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
@@ -12078,7 +12078,7 @@ 
 								break;
 							}
 						}
-					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100+1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude']+5000))) {
+					} elseif ($row['last_altitude'] == 0 || ($row['last_altitude'] != '' && ($closestAirports[0]['altitude'] <= $row['last_altitude']*100 + 1000 && $row['last_altitude']*100 < $closestAirports[0]['altitude'] + 5000))) {
 						$airport_icao = $closestAirports[0]['icao'];
 						if ($globalDebug) echo "\o/ NP --++ Find arrival airport. Airport ICAO : ".$airport_icao." !  Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
 					} else {
@@ -12089,28 +12089,28 @@ 
 				}
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
 					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
-					$update_query="UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
+					$update_query = "UPDATE spotter_output SET real_arrival_airport_icao = :airport_icao WHERE spotter_id = :spotter_id";
 					$sthu = $this->db->prepare($update_query);
-					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));
+					$sthu->execute(array(':airport_icao' => $airport_icao, ':spotter_id' => $row['spotter_id']));
 				}
 			}
 		}
 	}
 	
-	public function closestAirports($origLat,$origLon,$dist = 10) {
+	public function closestAirports($origLat, $origLon, $dist = 10) {
 		global $globalDBdriver;
-		$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
+		$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
 /*
 		$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - abs(latitude))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(abs(latitude)*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
                       FROM airport WHERE longitude between ($origLon-$dist/abs(cos(radians($origLat))*69)) and ($origLon+$dist/abs(cos(radians($origLat))*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                       having distance < $dist ORDER BY distance limit 100;";
 */
 		if ($globalDBdriver == 'mysql') {
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and latitude between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(latitude*pi()/180)*POWER(SIN(($origLon-longitude)*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
                 } else {
-			$query="SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
+			$query = "SELECT name, icao, latitude, longitude, altitude, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2))) as distance 
 	                      FROM airport WHERE CAST(longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 	                      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(longitude as double precision))*pi()/180/2),2)))) < $dist ORDER BY distance limit 100;";
     		}

require/class.SpotterImport.php

Spacing +134 added lines, -134 removed lines

@@ -33,12 +33,12 @@ 
 		$currentdate = date('Y-m-d');
 		$sourcestat = $Stats->getStatsSource($currentdate);
 		if (!empty($sourcestat)) {
-		    foreach($sourcestat as $srcst) {
+		    foreach ($sourcestat as $srcst) {
 		    	$type = $srcst['stats_type'];
 			if ($type == 'polar' || $type == 'hist') {
 			    $source = $srcst['source_name'];
 			    $data = $srcst['source_data'];
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
 	    		}
 		    }
 		}
@@ -50,7 +50,7 @@ 
 
     }
 
-    public function get_Schedule($id,$ident) {
+    public function get_Schedule($id, $ident) {
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
 	// Get schedule here, so it's done only one time
 	
@@ -75,8 +75,8 @@ 
 		$schedule = $Schedule->fetchSchedule($operator);
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
 		    // Should also check if route schedule = route from DB
 		    if ($schedule['DepartureAirportIATA'] != '') {
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -96,7 +96,7 @@ 
 			    }
 			}
 		    }
-		    $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']);
+		    $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']);
 		}
 	    } else $scheduleexist = true;
 	} else $scheduleexist = true;
@@ -104,7 +104,7 @@ 
        if ($scheduleexist) {
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
     		$sch = $Schedule->getSchedule($operator);
-		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time']));
+		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time']));
        }
 	$Spotter->db = null;
 	$Schedule->db = null;
@@ -131,7 +131,7 @@ 
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
     		    $Spotter = new Spotter($this->db);
         	    $real_arrival = $this->arrival($key);
-        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+        	    if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
         	}
 	    }
 	}
@@ -145,7 +145,7 @@ 
         $airport_time = '';
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
     	    if (isset($closestAirports[0])) {
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -160,7 +160,7 @@ 
         		    break;
         		}
         	    }
-        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) {
+        	} elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) {
         		$airport_icao = $closestAirports[0]['icao'];
         		$airport_time = $this->all_flights[$key]['datetime'];
         	} else {
@@ -173,7 +173,7 @@ 
         } else {
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
         }
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
     }
 
 
@@ -184,7 +184,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_flights as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
+        	if ($flight['lastupdate'] < (time() - 3000)) {
             	    if (isset($this->all_flights[$key]['id'])) {
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
 			/*
@@ -196,7 +196,7 @@ 
             		    $real_arrival = $this->arrival($key);
             		    $Spotter = new Spotter($this->db);
             	    	    if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
-				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']);
+				$result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			    }
 			// Put in archive
@@ -233,7 +233,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
 	    //print_r($line);
   	    if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) {
 
@@ -266,25 +266,25 @@ 
 		
 		if (!isset($this->all_flights[$id])) {
 		    $this->all_flights[$id] = array();
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => ''));
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => ''));
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 //			if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi')));
 //			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
 		}
 		if (isset($line['source_type']) && $line['source_type'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
 		}
 		
 		//print_r($this->all_flights);
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -293,20 +293,20 @@ 
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			    $Spotter = new Spotter($this->db);
 			    if (isset($this->all_flights[$id]['source_type'])) {
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
 			    } else {
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 			}
 		    }
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
 		}
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $line['aircraft_icao']));
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -314,7 +314,7 @@ 
 				$Spotter = new Spotter($this->db);
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
 				$Spotter->db = null;
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 			}
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -322,15 +322,15 @@ 
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
 		}
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
 		}
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60) {
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
@@ -343,24 +343,24 @@ 
 		    }
 		} else {
 			date_default_timezone_set('UTC');
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
 		}
 
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
 		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
 		}
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id']));
 		}
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name']));
 		}
  
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 			    $timeelapsed = microtime(true);
@@ -371,10 +371,10 @@ 
 			    elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
 			    elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
 			    elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
-            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
+            		    $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
 			    if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 			}
 		    }
 
@@ -386,25 +386,25 @@ 
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
   */
-		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+		    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 
 		    //$putinarchive = true;
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
 		    }
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
 		    }
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
 			$timeelapsed = microtime(true);
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				$Spotter = new Spotter($this->db);
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => ''));
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => ''));
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
                         }
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
 			$timeelapsed = microtime(true);
@@ -418,34 +418,34 @@ 
 				$Translation->db = null;
 			    }
 			    $Spotter->db = null;
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
                     	}
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
 				//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop']));
-		    		$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop']));
+		    		$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop']));
 		    	    }
 			}
 			if (!isset($globalFork)) $globalFork = TRUE;
 			if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
 			}
 		    }
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
 		    //$dataFound = true;
 		} else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
 		    if ($distance > 1000 && $distance < 10000) {
 		    // use datetime
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
+			if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
 		    }
 		}
@@ -453,11 +453,11 @@ 
 
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) {
+	    	    if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) {
 			if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) {
+			    if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) {
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -467,10 +467,10 @@ 
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					$Spotter = new Spotter($this->db);
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
 					$Spotter->db = null;
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
 				    }
 				}
@@ -480,13 +480,13 @@ 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			    //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -504,13 +504,13 @@ 
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 			    //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == ''  || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) {
 				if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') {
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_flights[$id]['time_last_coord'] = time();
 				}
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
 				/*
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -528,46 +528,46 @@ 
 		    } else if ($globalDebug && $timediff > 30) {
 			$this->tmd = $this->tmd + 1;
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
 		    //$dataFound = true;
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
 		    //$dataFound = true;
 		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
 			// Here we force archive of flight because after ground it's a new one (or should be)
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
-			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
-			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
+			if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi')));
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
+			elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
 		    }
 		    if ($line['ground'] != 1) $line['ground'] = 0;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
 		    //$dataFound = true;
 		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) {
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 			    $highlight = '';
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -576,47 +576,47 @@ 
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 				    $Spotter = new Spotter($this->db);
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
 				    $Spotter->db = null;
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				}
 				//$putinarchive = true;
 				//$highlight = '';
 			    }
 			    
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true;
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n";
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
   		    // If not enough messages and ACARS set heading to 0
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
   		}
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
 
 //		print_r($this->all_flights[$id]);
 		//gets the callsign from the last hour
@@ -626,7 +626,7 @@ 
 		if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
 		    $this->all_flights[$id]['lastupdate'] = time();
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == ''  || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    //print_r($this->all_flights);
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -637,61 +637,61 @@ 
 				    $SpotterLive = new SpotterLive($this->db);
 				    if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson')) {
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($line['id'])) {
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    } else $recent_ident = '';
-				    $SpotterLive->db=null;
+				    $SpotterLive->db = null;
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 				} else $recent_ident = '';
 			    } else {
 				$recent_ident = '';
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 				//adds the spotter data for the archive
 				$ignoreImport = false;
-				foreach($globalAirportIgnore as $airportIgnore) {
+				foreach ($globalAirportIgnore as $airportIgnore) {
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					$ignoreImport = true;
 				    }
 				}
 				if (count($globalAirportAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirportIgnore as $airportIgnore) {
+				    foreach ($globalAirportIgnore as $airportIgnore) {
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 					    $ignoreImport = true;
 					}
 				    }
 				}
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalAirlineAccept as $airlineAccept) {
-					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+				    foreach ($globalAirlineAccept as $airlineAccept) {
+					if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 					    $ignoreImport = false;
 					}
 				    }
 				}
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 				    $ignoreImport = true;
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 					    $ignoreImport = false;
 					}
@@ -703,32 +703,32 @@ 
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
-				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+				    if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				    $timeelapsed = microtime(true);
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
-					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']);
+					    $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']);
 					    $Spotter->db = null;
 					    if ($globalDebug && isset($result)) echo $result."\n";
 					}
 				    }
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        foreach ($this->stats as $date => $data) {
+					    foreach ($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -766,14 +766,14 @@ 
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $SpotterLive = new SpotterLive($this->db);
 					    $SpotterLive->deleteLiveSpotterData();
-					    $SpotterLive->db=null;
+					    $SpotterLive->db = null;
 					}
 				    }
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
 			    } else {
-				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa'  || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
+				if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson')) {
 				    $this->all_flights[$id]['id'] = $recent_ident;
 				    $this->all_flights[$id]['addedSpotter'] = 1;
 				}
@@ -781,7 +781,7 @@ 
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					    $Spotter = new Spotter($this->db);
-					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']);
+					    $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']);
 					    $Spotter->db = null;
 					}
 				    }
@@ -807,37 +807,37 @@ 
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
 
-		    foreach($globalAirportIgnore as $airportIgnore) {
+		    foreach ($globalAirportIgnore as $airportIgnore) {
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 			    $ignoreImport = true;
 			}
 		    }
 		    if (count($globalAirportAccept) > 0) {
 		        $ignoreImport = true;
-		        foreach($globalAirportIgnore as $airportIgnore) {
+		        foreach ($globalAirportIgnore as $airportIgnore) {
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
-			foreach($globalAirlineIgnore as $airlineIgnore) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) {
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) {
 				$ignoreImport = true;
 			    }
 			}
 		    }
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalAirlineAccept as $airlineAccept) {
-			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) {
+			foreach ($globalAirlineAccept as $airlineAccept) {
+			    if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) {
 				$ignoreImport = false;
 			    }
 			}
 		    }
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
 			$ignoreImport = true;
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
 			        $ignoreImport = false;
 			    }
@@ -845,23 +845,23 @@ 
 		    }
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
 				$timeelapsed = microtime(true);
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
 					$SpotterLive = new SpotterLive($this->db);
-					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
+					$result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
 					$SpotterLive->db = null;
 					if ($globalDebug) echo $result."\n";
 				    }
 				}
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
-					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']);
+					$APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']);
 				}
 				$this->all_flights[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				// Put statistics in $this->stats variable
 				//if ($line['format_source'] != 'aprs') {
@@ -880,19 +880,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -907,9 +907,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -922,7 +922,7 @@ 
 				$this->all_flights[$id]['lastupdate'] = time();
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {

airline-statistics-departure-airport-country.php

Spacing +8 added lines, -8 removed lines

@@ -7,13 +7,13 @@ 
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
@@ -22,9 +22,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($airline == $airline_name['airline_icao'])
+		if ($airline == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -62,7 +62,7 @@ 
 	include('airline-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Departure Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	$airport_country_array = $Spotter->countAllDepartureAirportCountriesByAirline($airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -70,7 +70,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],';
 	}
@@ -117,7 +117,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

airline-statistics-arrival-airport-country.php

Spacing +8 added lines, -8 removed lines

@@ -7,13 +7,13 @@ 
         header('Location: '.$globalURL.'/airline');
         die();
 }
-$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();
-$spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1","");
+$spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", "");
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']);
+	$title = sprintf(_("Most Common Arrival Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/airline" method="post">';
@@ -22,9 +22,9 @@ 
 	$Stats = new Stats();
 	$airline_names = $Stats->getAllAirlineNames();
 	if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames();
-	foreach($airline_names as $airline_name)
+	foreach ($airline_names as $airline_name)
 	{
-		if($_GET['airline'] == $airline_name['airline_icao'])
+		if ($_GET['airline'] == $airline_name['airline_icao'])
 		{
 			print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>';
 		} else {
@@ -62,7 +62,7 @@ 
 	include('airline-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByAirline($airline);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -70,7 +70,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -118,7 +118,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';