Ysurac / FlightAirMap

require/class.SpotterLive.php

Indentation +204 added lines, -204 removed lines

@@ -12,10 +12,10 @@ 
 
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
@@ -111,11 +111,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -157,11 +157,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -214,11 +214,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveSpotterData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -236,7 +236,7 @@ 
 			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
-                } else {
+				} else {
 /*
 			$query  = "SELECT a.aircraft_shadow, a.engine_type, a.engine_count, a.wake_category, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
@@ -248,7 +248,7 @@ 
 //			echo $query;
 		}
 
-    		try {
+			try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
 		} catch(PDOException $e) {
@@ -260,11 +260,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -291,11 +291,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -320,11 +320,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestSpotterForLayar($lat, $lng, $radius, $interval)
 	{
 		$Spotter = new Spotter($this->db);
@@ -334,145 +334,145 @@ 
 				return false;
 			}
 		}
-        if ($lng != '')
-                {
-                        if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+		if ($lng != '')
+				{
+						if (!is_numeric($lng))
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
-        if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
-        }
-
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+		if ($interval != '')
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
+		}
+
+				$query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataByIdent($ident)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataByIdent($ident,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveSpotterDataById($id)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveSpotterDataById($id,$date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveSpotterDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+				$query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -485,12 +485,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -518,18 +518,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveSpotterDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -543,23 +543,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date";
 			$query  = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date';
-            		//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
+					//$query  = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)";
 		} else {
 			$query  = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -571,18 +571,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -590,8 +590,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -599,20 +599,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['flightaware_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -623,9 +623,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -669,17 +669,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -691,17 +691,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -714,11 +714,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -744,14 +744,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -777,14 +777,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -810,14 +810,14 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by ModeS
-	*
-	* @return String the ModeS
-	*
-	*/
+	 * Check recent aircraft by ModeS
+	 *
+	 * @return String the ModeS
+	 *
+	 */
 	public function checkModeSRecent($modes)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -844,19 +844,19 @@ 
 			$ident_result = $row['flightaware_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -991,10 +991,10 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
             	
 		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, 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, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,: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,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country)';
@@ -1004,14 +1004,14 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
-                	return "error : ".$e->getMessage();
-                }
+				} catch(PDOException $e) {
+					return "error : ".$e->getMessage();
+				}
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to SBS archive : ';
-		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to SBS archive : ';
+			$SpotterArchive = new SpotterArchive($this->db);
+			$result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 		return "success";
 

Spacing +112 added lines, -112 removed lines

@@ -16,45 +16,45 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_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_live.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_live.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_live.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_live.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'])."')) spi ON spi.flightaware_id = spotter_live.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'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id";
 				}
 			}
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.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'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id";
 			}
 		}
 		if (isset($filter['alliance']) && !empty($filter['alliance'])) {
@@ -64,10 +64,10 @@ 
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id ";
 		}
 		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'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.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']."'";
@@ -96,15 +96,15 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -127,8 +127,8 @@ 
 		if ($limit != '')
 		{
 			$limit_array = explode(',', $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
@@ -151,7 +151,7 @@ 
 		} else {
 			$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true);
 
 		return $spotter_array;
 	}
@@ -167,7 +167,7 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -178,7 +178,7 @@ 
 			$query  = 'SELECT a.aircraft_shadow, spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0";
 */
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query." spotter_live.latitude <> 0 AND spotter_live.longitude <> 0";
 
 //			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date ORDER BY spotter_live.date GROUP BY spotter_live.flightaware_id'.$filter_query;
@@ -193,7 +193,7 @@ 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
 */
 
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query." spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'";
 
 
@@ -204,7 +204,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -224,7 +224,7 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -233,7 +233,7 @@ 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category,icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 */
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
                 } else {
@@ -242,7 +242,7 @@ 
 			FROM spotter_live LEFT JOIN (SELECT aircraft_shadow,engine_type, engine_count, wake_category, icao FROM aircraft) a ON spotter_live.aircraft_icao = a.icao".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 */
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source 
 			FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' 
 			ORDER BY spotter_live.flightaware_id, spotter_live.date";
 //			echo $query;
@@ -251,7 +251,7 @@ 
     		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -268,7 +268,7 @@ 
 	public function getLiveSpotterCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -281,7 +281,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -304,10 +304,10 @@ 
 		$filter_query = $this->getFilter($filter);
 
 		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 spotter_output.* FROM spotter_output WHERE spotter_output.flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL ".$globalLiveInterval." SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong.")";
@@ -360,7 +360,7 @@ 
                 if ($interval == '1m')
                 {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';
-                } else if ($interval == '15m'){
+                } else if ($interval == '15m') {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date ';
                 } 
             }
@@ -368,14 +368,14 @@ 
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date ';   
         }
 
-                $query  = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
+                $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live 
                    WHERE spotter_live.latitude <> '' 
                                    AND spotter_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
 
                 return $spotter_array;
         }
@@ -393,9 +393,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true);
 
 		return $spotter_array;
 	}
@@ -406,16 +406,16 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveSpotterDataByIdent($ident,$date)
+	public function getDateLiveSpotterDataByIdent($ident, $date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-                $date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+                $date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 
 		return $spotter_array;
 	}
@@ -432,9 +432,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true);
 
 		return $spotter_array;
 	}
@@ -445,15 +445,15 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveSpotterDataById($id,$date)
+	public function getDateLiveSpotterDataById($id, $date)
 	{
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
-                $date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
+                $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC';
+                $date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
 
 		return $spotter_array;
 	}
@@ -470,13 +470,13 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
+                $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident';
 
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -491,7 +491,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getAllLiveSpotterDataById($id,$liveinterval = false)
+	public function getAllLiveSpotterDataById($id, $liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -510,7 +510,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -528,12 +528,12 @@ 
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = self::$global_query.' WHERE spotter_live.ident = :ident';
+		$query = self::$global_query.' WHERE spotter_live.ident = :ident';
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -563,7 +563,7 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -586,14 +586,14 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 			$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
                         $i = 0;
-                        $j =0;
+                        $j = 0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			foreach($all as $row)
+			foreach ($all as $row)
 			{
 				$i++;
 				$j++;
@@ -601,9 +601,9 @@ 
 					if ($globalDebug) echo ".";
 				    	try {
 						
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error";
 					}
                                 	$query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN (';
@@ -614,9 +614,9 @@ 
 			if ($i > 0) {
     				try {
 					
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error";
 				}
 			}
@@ -629,7 +629,7 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 /*			$query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN (";
@@ -677,13 +677,13 @@ 
 	public function deleteLiveSpotterDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM spotter_live WHERE ident = :ident';
+		$query = 'DELETE FROM spotter_live WHERE ident = :ident';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -699,13 +699,13 @@ 
 	public function deleteLiveSpotterDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
+		$query = 'DELETE FROM spotter_live WHERE flightaware_id = :id';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -723,13 +723,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident FROM spotter_live 
+			$query = 'SELECT spotter_live.ident FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 				AND spotter_live.date < UTC_TIMESTAMP()';
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT spotter_live.ident FROM spotter_live 
+			$query = "SELECT spotter_live.ident FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -738,8 +738,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'];
 		}
@@ -756,13 +756,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ident = :ident 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -771,8 +771,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['flightaware_id'];
 		}
@@ -789,13 +789,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.flightaware_id = :id 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':id' => $id);
 		} else {
-			$query  = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.flightaware_id = :id 
 				AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
 //				AND spotter_live.date < now() AT TIME ZONE 'UTC'";
@@ -804,8 +804,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['flightaware_id'];
 		}
@@ -822,13 +822,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
+			$query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ModeS = :modes 
 				AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
 //				AND spotter_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':modes' => $modes);
 		} else {
-			$query  = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
+			$query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live 
 				WHERE spotter_live.ModeS = :modes 
 				AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'";
 //			//	AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
@@ -837,8 +837,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['spotter_live_id'];
 			$ident_result = $row['flightaware_id'];
@@ -857,7 +857,7 @@ 
 	* @return String success or false
 	*
 	*/
-	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '')
+	public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
 		$Common = new Common();
@@ -950,26 +950,26 @@ 
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
 
         
-		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,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);
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
-		$over_country = filter_var($over_country,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);
+		$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);
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
+		$verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT);
 
 		$airline_name = '';
 		$airline_icao = '';
@@ -991,26 +991,26 @@ 
 		$arrival_airport_country = '';
 		
             	
-            	if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL;
-            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL;
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+            	if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+            	if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
             	
-		$query  = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, 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, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
+		$query = 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, 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, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country) 
 		VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,: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,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_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_shadow' => $aircraft_shadow,':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,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_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_shadow' => $aircraft_shadow, ':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, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country);
 		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                 	return "error : ".$e->getMessage();
                 }
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
 		    if ($globalDebug) echo '(Add to SBS archive : ';
 		    $SpotterArchive = new SpotterArchive($this->db);
-		    $result =  $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country);
+		    $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country);
 		    if ($globalDebug) echo $result.')';
 		}
 		return "success";
@@ -1019,7 +1019,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC"));
 		return $orderby;
 	}
 

require/class.Spotter.php

Spacing +1343 added lines, -1343 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,45 +59,45 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_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['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']))) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_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'])) {
@@ -107,16 +107,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') {
@@ -142,7 +142,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;
@@ -157,7 +157,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);
@@ -187,7 +187,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();
 		}
 		
@@ -197,7 +197,7 @@ 
 		$spotter_array = array();
 		
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$num_rows++;
 			$temp_array = array();
@@ -241,7 +241,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'])) {
@@ -294,17 +294,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");
 					}
 				}
@@ -340,9 +340,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');
 					}
@@ -379,7 +379,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;
@@ -396,11 +396,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'];
@@ -424,7 +424,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);
@@ -506,12 +506,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;
@@ -530,7 +530,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');
@@ -540,7 +540,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))
@@ -548,8 +548,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 ";
@@ -581,37 +581,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));
 			}
 		}
 
@@ -627,25 +627,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));
 			}
 		}
 
@@ -672,31 +672,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;
@@ -704,79 +704,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_NUMBER_INT);
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 			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] != "")
 			{                
@@ -792,8 +792,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);
@@ -824,8 +824,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)
 			{
@@ -854,23 +854,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;
 	}
 	
@@ -893,8 +893,8 @@ 
 		{
 			$limit_array = explode(",", $limit);
 			
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
@@ -911,9 +911,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;
 	}
@@ -959,34 +959,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;
 	}
@@ -998,21 +998,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)
 			{
@@ -1029,7 +1029,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);
 
@@ -1048,15 +1048,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)
 			{
@@ -1073,7 +1073,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);
 
@@ -1087,20 +1087,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)
 			{
@@ -1117,7 +1117,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);
 
@@ -1137,7 +1137,7 @@ 
 		
 		date_default_timezone_set('UTC');
 		
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		$limit_query = '';
 		
@@ -1145,8 +1145,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)
 			{
@@ -1163,7 +1163,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);
 
@@ -1182,14 +1182,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)
 			{
@@ -1206,7 +1206,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);
 
@@ -1230,9 +1230,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;
 	}
@@ -1255,7 +1255,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))
@@ -1271,8 +1271,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)
 			{
@@ -1311,7 +1311,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))
@@ -1327,8 +1327,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)
 			{
@@ -1368,7 +1368,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)";
@@ -1379,8 +1379,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)
 			{
@@ -1421,7 +1421,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 != "")
 		{
@@ -1438,8 +1438,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)
 			{
@@ -1495,8 +1495,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,7 +1512,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;
@@ -1531,7 +1531,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;
 		
@@ -1540,7 +1540,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		
 		if ($airline != "")
 		{
@@ -1557,8 +1557,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)
 			{
@@ -1588,7 +1588,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;
 		
@@ -1596,7 +1596,7 @@ 
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 		
 		if ($airport != "")
 		{
@@ -1613,8 +1613,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)
 			{
@@ -1646,7 +1646,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;
 		
@@ -1654,7 +1654,7 @@ 
 		$limit_query = '';
 		$additional_query = '';
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 		
 		if ($date != "")
 		{
@@ -1683,8 +1683,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)
 			{
@@ -1714,7 +1714,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;
 		
@@ -1723,7 +1723,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))
@@ -1740,8 +1740,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)
 			{
@@ -1781,7 +1781,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 != "")
 		{
@@ -1798,8 +1798,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)
 			{
@@ -1841,14 +1841,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);
@@ -1861,10 +1861,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));
 			}
 		}
 		
@@ -1872,8 +1872,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)
 			{
@@ -1912,15 +1912,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)
 			{
@@ -1937,7 +1937,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);
 
@@ -1950,19 +1950,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'];
 		}
@@ -1978,14 +1978,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);
@@ -2007,9 +2007,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);
@@ -2031,12 +2031,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);
@@ -2046,7 +2046,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 '';
 	}
 	
@@ -2060,11 +2060,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 {
@@ -2112,14 +2112,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();
@@ -2127,7 +2127,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'];
@@ -2155,10 +2155,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'";
@@ -2170,7 +2170,7 @@ 
     
 		$airport_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array = $row;
 
@@ -2190,13 +2190,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;
@@ -2208,7 +2208,7 @@ 
     
 		$waypoints_array = array();
 		
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$temp_array = $row;
 
@@ -2230,10 +2230,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) {
@@ -2254,7 +2254,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();
@@ -2299,13 +2299,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) {
@@ -2330,12 +2330,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));
@@ -2367,7 +2367,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',
@@ -2379,10 +2379,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 '';
@@ -2397,9 +2397,9 @@ 
 	*/
 	public function getAllAircraftType($aircraft_modes)
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
 
-		$query  = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
+		$query = "SELECT aircraft_modes.ICAOTypeCode FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -2422,9 +2422,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));
@@ -2445,9 +2445,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));
@@ -2455,7 +2455,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;
 	}
@@ -2469,8 +2469,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));
@@ -2491,9 +2491,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));
@@ -2514,9 +2514,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));
@@ -2524,7 +2524,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'];
@@ -2546,7 +2546,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";
@@ -2568,7 +2568,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();
@@ -2615,7 +2615,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'];
 
@@ -2652,7 +2652,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'];
@@ -2673,8 +2673,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";
 
@@ -2684,7 +2684,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'];
 
@@ -2701,11 +2701,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);
@@ -2720,7 +2720,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;
@@ -2736,11 +2736,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
@@ -2759,7 +2759,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";
@@ -2772,7 +2772,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'];
@@ -2789,10 +2789,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';
@@ -2820,8 +2820,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";
 		
@@ -2832,7 +2832,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'];
 
@@ -2852,9 +2852,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";
 		
@@ -2863,7 +2863,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'];
@@ -2873,14 +2873,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'])
 		//	{
@@ -2904,8 +2904,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";
 		
@@ -2922,8 +2922,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";
 		
@@ -2956,21 +2956,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'])
 			{
@@ -2993,9 +2993,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);
@@ -3004,14 +3004,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";
 
@@ -3020,20 +3020,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'])
 			{
@@ -3043,14 +3043,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'])
 			{
@@ -3074,8 +3074,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";
 
@@ -3085,7 +3085,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;
@@ -3099,9 +3099,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();
@@ -3166,7 +3166,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();
@@ -3250,7 +3250,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();
@@ -3283,9 +3283,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();
@@ -3417,12 +3417,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";
@@ -3434,7 +3434,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'];
 
@@ -3454,7 +3454,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
@@ -3465,7 +3465,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'];
@@ -3484,21 +3484,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 {
@@ -3511,7 +3511,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);
@@ -3532,11 +3532,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);
@@ -3576,7 +3576,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 = '', $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 = '')
+	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $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 = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
 		
@@ -3600,13 +3600,13 @@ 
 				if ($ModeS != '') {
 					$timeelapsed = microtime(true);
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					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]);
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 					}
 				}
 			}
@@ -3628,24 +3628,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();
@@ -3662,27 +3662,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);
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				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";
 				}
 			}
 		}
@@ -3698,7 +3698,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";
 			}
 		}
 		
@@ -3713,7 +3713,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";
 			}
 		}
 
@@ -3766,7 +3766,7 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60)
+		if ($date == "" || strtotime($date) < time() - 20*60)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
@@ -3776,7 +3776,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";
@@ -3784,7 +3784,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']));
 		}
     
@@ -3792,33 +3792,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) 
 		{
@@ -3846,7 +3846,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'];
@@ -3856,7 +3856,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'];
@@ -3868,7 +3868,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 {
 		        
@@ -3894,13 +3894,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'";
@@ -3909,8 +3909,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'];
 		}
@@ -3936,8 +3936,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 ";
@@ -3952,11 +3952,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'";
 		}
@@ -3973,11 +3973,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') {
@@ -3997,28 +3997,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";
@@ -4028,7 +4028,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'];
@@ -4045,11 +4045,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') {
@@ -4069,28 +4069,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));
 			}
 		}
 		
@@ -4102,7 +4102,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'];
@@ -4122,7 +4122,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') {
@@ -4148,7 +4148,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'];
@@ -4166,11 +4166,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') {
@@ -4190,28 +4190,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";
@@ -4221,7 +4221,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'];
@@ -4236,11 +4236,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') {
@@ -4266,7 +4266,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'];
@@ -4282,11 +4282,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";
@@ -4298,7 +4298,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'];
@@ -4318,11 +4318,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
+		$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
 		 			FROM spotter_output".$filter_query." spotter_output.airline_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
                     GROUP BY spotter_output.airline_country
 					ORDER BY airline_country_count DESC
@@ -4335,7 +4335,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'];
@@ -4354,11 +4354,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";
@@ -4370,7 +4370,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'];
@@ -4389,11 +4389,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
@@ -4406,7 +4406,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'];
@@ -4423,11 +4423,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";
@@ -4438,7 +4438,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'];
@@ -4458,11 +4458,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
@@ -4475,7 +4475,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'];
@@ -4491,11 +4491,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);
@@ -4503,12 +4503,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";
@@ -4519,7 +4519,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'];
@@ -4539,11 +4539,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);
@@ -4551,13 +4551,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
@@ -4569,7 +4569,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'];
@@ -4586,11 +4586,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";
@@ -4607,11 +4607,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";
@@ -4628,47 +4628,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']);
 		else return $result[0]['duration'];
 	}
 
@@ -4678,14 +4678,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);
@@ -4698,14 +4698,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);
@@ -4718,47 +4718,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'];
 	}
 
@@ -4768,11 +4768,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";
@@ -4789,25 +4789,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'];
@@ -4825,13 +4825,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
@@ -4839,11 +4839,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'];
@@ -4861,11 +4861,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";
@@ -4876,7 +4876,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'];
@@ -4895,11 +4895,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
@@ -4911,7 +4911,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'];
@@ -4931,35 +4931,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
+		$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.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
@@ -4971,7 +4971,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'];
@@ -4987,11 +4987,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 
@@ -5006,7 +5006,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') {
@@ -5033,7 +5033,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'];
@@ -5051,11 +5051,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') {
@@ -5075,28 +5075,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));
 			}
 		}
 
@@ -5108,7 +5108,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'];
@@ -5125,11 +5125,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') {
@@ -5149,28 +5149,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));
 			}
 		}
 
@@ -5182,7 +5182,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'];
@@ -5200,11 +5200,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') {
@@ -5229,7 +5229,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'];
@@ -5248,13 +5248,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";
@@ -5265,14 +5265,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'];
@@ -5291,11 +5291,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";
@@ -5306,7 +5306,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'];
@@ -5324,13 +5324,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";
@@ -5340,14 +5340,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'];
@@ -5366,11 +5366,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";
@@ -5381,7 +5381,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'];
@@ -5398,12 +5398,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";
@@ -5413,7 +5413,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'];
@@ -5431,13 +5431,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";
@@ -5447,14 +5447,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'];
@@ -5472,11 +5472,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";
@@ -5487,7 +5487,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'];
@@ -5502,12 +5502,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";
@@ -5516,7 +5516,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'];
@@ -5535,11 +5535,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";
@@ -5549,14 +5549,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'];
@@ -5573,11 +5573,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);
@@ -5585,12 +5585,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";
@@ -5601,7 +5601,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'];
@@ -5619,12 +5619,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);
@@ -5632,12 +5632,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";
@@ -5648,14 +5648,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'];
@@ -5674,11 +5674,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);
@@ -5686,12 +5686,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";
@@ -5703,7 +5703,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'];
@@ -5720,11 +5720,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";
@@ -5735,7 +5735,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'];
@@ -5752,45 +5752,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);
@@ -5802,44 +5802,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);
@@ -5851,13 +5851,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";
@@ -5869,14 +5869,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'];
@@ -5894,44 +5894,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";
@@ -5943,7 +5943,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'];
@@ -5951,7 +5951,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'];
@@ -5969,44 +5969,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";
@@ -6018,7 +6018,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'];
@@ -6026,7 +6026,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'];
@@ -6045,11 +6045,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";
@@ -6059,7 +6059,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'];
@@ -6074,42 +6074,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";
@@ -6126,42 +6126,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";
@@ -6179,24 +6179,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'];
@@ -6212,33 +6212,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'];
@@ -6258,25 +6258,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'];
@@ -6296,11 +6296,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";
@@ -6312,7 +6312,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'];
@@ -6331,12 +6331,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";
@@ -6348,14 +6348,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'];
@@ -6375,11 +6375,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";
@@ -6391,7 +6391,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'];
@@ -6410,38 +6410,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
@@ -6455,7 +6455,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'];
@@ -6474,12 +6474,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') {
@@ -6499,28 +6499,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";
@@ -6532,7 +6532,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'];
@@ -6540,7 +6540,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'];
@@ -6559,12 +6559,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') {
@@ -6592,7 +6592,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'];
@@ -6601,7 +6601,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'];
@@ -6620,11 +6620,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 
+		$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 
 				FROM spotter_output".$filter_query." spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -6644,28 +6644,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
@@ -6677,7 +6677,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'];
@@ -6696,11 +6696,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') {
@@ -6729,7 +6729,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'];
@@ -6749,11 +6749,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
+		$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
 				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') {
@@ -6773,28 +6773,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
@@ -6807,7 +6807,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'];
@@ -6826,11 +6826,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') {
@@ -6859,7 +6859,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'];
@@ -6879,11 +6879,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";
@@ -6895,7 +6895,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'];
@@ -6917,11 +6917,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 
+		$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 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.airline_icao = :airline_icao 
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -6933,7 +6933,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'];
@@ -6952,11 +6952,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";
@@ -6968,7 +6968,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'];
@@ -6989,11 +6989,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 
+		$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 
 			FROM spotter_output".$filter_query." spotter_output.departure_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
                     GROUP BY spotter_output.departure_airport_country
 					ORDER BY airport_departure_country_count DESC";
@@ -7005,7 +7005,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'];
@@ -7023,11 +7023,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";
@@ -7039,7 +7039,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'];
@@ -7060,11 +7060,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";
@@ -7076,7 +7076,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'];
@@ -7094,11 +7094,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";
@@ -7110,7 +7110,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'];
@@ -7131,11 +7131,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";
@@ -7147,7 +7147,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'];
@@ -7166,11 +7166,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";
@@ -7182,7 +7182,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'];
@@ -7203,11 +7203,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";
@@ -7219,7 +7219,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'];
@@ -7237,11 +7237,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);
@@ -7249,12 +7249,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";
@@ -7266,7 +7266,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'];
@@ -7287,11 +7287,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);
@@ -7299,12 +7299,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";
@@ -7316,7 +7316,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'];
@@ -7334,11 +7334,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";
@@ -7350,7 +7350,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'];
@@ -7370,11 +7370,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";
@@ -7386,7 +7386,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'];
@@ -7406,11 +7406,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";
@@ -7421,7 +7421,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'];
@@ -7443,11 +7443,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";
@@ -7459,7 +7459,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'];
@@ -7476,11 +7476,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";
@@ -7496,11 +7496,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";
@@ -7518,12 +7518,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";
@@ -7535,7 +7535,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'];
@@ -7556,11 +7556,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";
@@ -7572,7 +7572,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'];
@@ -7595,11 +7595,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 
+		$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 
 				FROM spotter_output".$filter_query." spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
                 if ($olderthanmonths > 0) {
             		if ($globalDBdriver == 'mysql') {
@@ -7619,28 +7619,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
@@ -7654,7 +7654,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'];
@@ -7677,11 +7677,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 
+		$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 
 			FROM spotter_output".$filter_query." 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') {
@@ -7711,7 +7711,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'];
@@ -7736,11 +7736,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 
+		$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 
 			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') {
@@ -7760,28 +7760,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
@@ -7794,7 +7794,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'];
@@ -7817,11 +7817,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') {
@@ -7851,7 +7851,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'];
@@ -7877,9 +7877,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";
@@ -7890,7 +7890,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'];
@@ -7911,12 +7911,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 
+		$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.airline_icao = :airline_icao 
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -7928,7 +7928,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'];
@@ -7946,11 +7946,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";
@@ -7962,7 +7962,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'];
@@ -7984,11 +7984,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 
+		$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 
 			FROM spotter_output".$filter_query." spotter_output.arrival_airport_country <> '' AND spotter_output.aircraft_icao = :aircraft_icao
                     GROUP BY spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_country_count DESC";
@@ -8000,7 +8000,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'];
@@ -8018,12 +8018,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";
@@ -8035,7 +8035,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'];
@@ -8056,11 +8056,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";
@@ -8072,7 +8072,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'];
@@ -8091,11 +8091,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";
@@ -8107,7 +8107,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'];
@@ -8128,11 +8128,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";
@@ -8144,7 +8144,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'];
@@ -8162,11 +8162,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";
@@ -8178,7 +8178,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'];
@@ -8200,11 +8200,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";
@@ -8216,7 +8216,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'];
@@ -8235,11 +8235,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);
@@ -8247,12 +8247,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";
@@ -8264,7 +8264,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'];
@@ -8288,8 +8288,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);
@@ -8297,12 +8297,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";
@@ -8314,7 +8314,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'];
@@ -8332,11 +8332,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";
@@ -8348,7 +8348,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'];
@@ -8368,11 +8368,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";
@@ -8383,7 +8383,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'];
@@ -8403,11 +8403,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";
@@ -8418,7 +8418,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'];
@@ -8440,9 +8440,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";
@@ -8454,7 +8454,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'];
@@ -8473,9 +8473,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";
@@ -8493,9 +8493,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";
@@ -8513,11 +8513,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";
@@ -8529,7 +8529,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'];
@@ -8550,12 +8550,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";
@@ -8567,7 +8567,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'];
@@ -8586,38 +8586,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 
+		$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 
 				FROM spotter_output".$filter_query." 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
@@ -8631,7 +8631,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'];
@@ -8649,38 +8649,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 
+		$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 
 			FROM spotter_output".$filter_query." 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
@@ -8694,7 +8694,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'];
@@ -8717,8 +8717,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
@@ -8731,7 +8731,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'];
@@ -8758,11 +8758,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";
@@ -8773,7 +8773,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'];
@@ -8800,9 +8800,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";
@@ -8814,7 +8814,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'];
@@ -8842,9 +8842,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";
@@ -8856,7 +8856,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'];
@@ -8884,9 +8884,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";
@@ -8897,7 +8897,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'];
@@ -8925,9 +8925,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";
@@ -8938,7 +8938,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'];
@@ -8966,8 +8966,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);
@@ -8975,12 +8975,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";
@@ -8992,7 +8992,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'];
@@ -9019,9 +9019,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";
@@ -9033,7 +9033,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'];
@@ -9057,11 +9057,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";
@@ -9073,7 +9073,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'];
@@ -9097,11 +9097,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";
@@ -9113,7 +9113,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'];
@@ -9140,9 +9140,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";
@@ -9154,7 +9154,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'];
@@ -9182,8 +9182,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
@@ -9196,7 +9196,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'];
@@ -9221,11 +9221,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)';
@@ -9239,28 +9239,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";
@@ -9272,7 +9272,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'];
@@ -9294,8 +9294,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) ';
@@ -9314,7 +9314,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'];
@@ -9368,7 +9368,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'];
@@ -9393,15 +9393,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 
@@ -9416,7 +9416,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'];
@@ -9442,7 +9442,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)";
@@ -9463,7 +9463,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'];
@@ -9488,7 +9488,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)";
@@ -9509,7 +9509,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'];
@@ -9530,7 +9530,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();
@@ -9538,13 +9538,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";
@@ -9557,7 +9557,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'];
@@ -9604,7 +9604,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'];
@@ -9625,7 +9625,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();
@@ -9633,12 +9633,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 
@@ -9652,7 +9652,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'];
@@ -9679,14 +9679,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";
@@ -9698,7 +9698,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'];
@@ -9724,15 +9724,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";
@@ -9744,7 +9744,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'];
@@ -9765,7 +9765,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();
@@ -9773,12 +9773,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";
@@ -9790,7 +9790,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'];
@@ -9817,15 +9817,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";
@@ -9837,7 +9837,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'];
@@ -9858,7 +9858,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();
@@ -9866,12 +9866,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";
@@ -9883,7 +9883,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'];
@@ -9905,7 +9905,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();
@@ -9913,12 +9913,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";
@@ -9930,7 +9930,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'];
@@ -9956,15 +9956,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";
@@ -9976,7 +9976,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'];
@@ -9998,7 +9998,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();
@@ -10006,12 +10006,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";
@@ -10023,7 +10023,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'];
@@ -10050,15 +10050,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";
@@ -10070,7 +10070,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'];
@@ -10092,7 +10092,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();
@@ -10100,12 +10100,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";
@@ -10117,7 +10117,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'];
@@ -10145,7 +10145,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)";
@@ -10166,7 +10166,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'];
@@ -10186,7 +10186,7 @@ 
 	* @return Array the hour list
 	*
 	*/
-	public function countAllHours($orderby,$filters = array())
+	public function countAllHours($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
 		if ($globalTimezone != '') {
@@ -10234,7 +10234,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'];
@@ -10254,7 +10254,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();
@@ -10272,7 +10272,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;
@@ -10285,7 +10285,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;
@@ -10298,7 +10298,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'];
@@ -10321,34 +10321,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'];
@@ -10371,8 +10371,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();
@@ -10380,24 +10380,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'];
@@ -10418,8 +10418,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();
@@ -10427,24 +10427,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'];
@@ -10465,8 +10465,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();
@@ -10474,24 +10474,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'];
@@ -10510,11 +10510,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();
@@ -10522,24 +10522,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'];
@@ -10561,8 +10561,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);
@@ -10570,12 +10570,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";
@@ -10587,7 +10587,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'];
@@ -10609,8 +10609,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();
@@ -10618,12 +10618,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";
@@ -10631,12 +10631,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'];
@@ -10656,8 +10656,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();
@@ -10665,12 +10665,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";
@@ -10678,12 +10678,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'];
@@ -10703,8 +10703,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();
@@ -10712,12 +10712,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";
@@ -10725,12 +10725,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'];
@@ -10749,12 +10749,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();
@@ -10762,24 +10762,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'];
@@ -10800,8 +10800,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();
@@ -10809,24 +10809,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'];
@@ -10846,29 +10846,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));
 			}
 		}
 
@@ -10883,29 +10883,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));
 			}
 		}
 		
@@ -10920,29 +10920,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);
@@ -10956,29 +10956,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);
@@ -10993,32 +10993,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);
@@ -11031,29 +11031,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));
 			}
 		}
       
@@ -11070,10 +11070,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();
@@ -11081,23 +11081,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);
@@ -11115,7 +11115,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();
@@ -11123,12 +11123,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";
@@ -11140,7 +11140,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'];
@@ -11159,14 +11159,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];
@@ -11219,7 +11219,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));
@@ -11238,9 +11238,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."'";
         
@@ -11248,7 +11248,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'];
 		}
@@ -11273,23 +11273,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;	
 	}	
@@ -11315,63 +11315,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";
@@ -11424,9 +11424,9 @@ 
 	*/
 	public function getAircraftRegistrationBymodeS($aircraft_modes)
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
 	
-		$query  = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
+		$query = "SELECT aircraft_modes.Registration FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -11449,9 +11449,9 @@ 
 	*/
 	public function getAircraftTypeBymodeS($aircraft_modes)
 	{
-		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
+		$aircraft_modes = filter_var($aircraft_modes, FILTER_SANITIZE_STRING);
 	
-		$query  = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
+		$query = "SELECT aircraft_modes.type_flight FROM aircraft_modes WHERE aircraft_modes.ModeS = :aircraft_modes ORDER BY FirstCreated DESC LIMIT 1";
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':aircraft_modes' => $aircraft_modes));
@@ -11472,11 +11472,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 '';
@@ -11516,7 +11516,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 '';
@@ -11548,19 +11548,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'];
 		}
@@ -11568,11 +11568,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'];
 			}
@@ -11586,7 +11586,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 {
@@ -11605,17 +11605,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'];
@@ -11626,13 +11626,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'];
@@ -11641,12 +11641,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'];
@@ -11666,17 +11666,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'];
@@ -11686,13 +11686,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'];
@@ -11701,12 +11701,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'];
@@ -11727,13 +11727,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'];
 		}
@@ -11746,9 +11746,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));
 	}
@@ -11760,13 +11760,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);
@@ -11796,7 +11796,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;
 		}
 
@@ -11806,7 +11806,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;
 		
@@ -11940,14 +11940,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']));
 			}
 		}
 		
@@ -11960,7 +11960,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)))
 			{
@@ -11969,11 +11969,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']));
 				}
 			}
 		}
@@ -11993,18 +11993,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']));
 				}
@@ -12019,10 +12019,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']) {
@@ -12036,7 +12036,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 {
@@ -12047,28 +12047,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.SpotterArchive.php

Indentation +645 added lines, -645 removed lines

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

Spacing +112 added lines, -112 removed lines

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