Ysurac / FlightAirMap

airport-statistics-departure-airport-country.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

airport-statistics-arrival-airport-country.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 require_once('require/class.Stats.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['airport'])) {
-        header('Location: '.$globalURL.'/airport');
-        die();
+		header('Location: '.$globalURL.'/airport');
+		die();
 }
 $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
 $Spotter = new Spotter();

require/class.Spotter.php

Indentation +1454 added lines, -1454 removed lines

@@ -55,10 +55,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();
@@ -166,14 +166,14 @@ 
 	}
 
 	/**
-	* Executes the SQL statements to get the spotter information
-	*
-	* @param String $query the SQL query
-	* @param Array $params parameter of the query
-	* @param String $limitQuery the limit query
-	* @return Array the spotter information
-	*
-	*/
+	 * Executes the SQL statements to get the spotter information
+	 *
+	 * @param String $query the SQL query
+	 * @param Array $params parameter of the query
+	 * @param String $limitQuery the limit query
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
 	{
 		global $globalSquawkCountry, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalAirlinesSource, $globalVAM;
@@ -342,11 +342,11 @@ 
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
 					} else $temp_array['aircraft_shadow'] = 'default.png';
-                                } else {
-                            		$temp_array['aircraft_shadow'] = 'default.png';
+								} else {
+									$temp_array['aircraft_shadow'] = 'default.png';
 					$temp_array['aircraft_name'] = 'N/A';
 					$temp_array['aircraft_manufacturer'] = 'N/A';
-                            	}
+								}
 			}
 			$fromsource = NULL;
 			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
@@ -543,11 +543,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -894,11 +894,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 getLatestSpotterData($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -937,12 +937,12 @@ 
 	}
     
     
-    /**
-	* 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)
 	{
 		date_default_timezone_set('UTC');
@@ -970,7 +970,7 @@ 
 				return false;
 			}
 		}
-    		$additional_query = '';
+			$additional_query = '';
 		if ($interval != "")
 		{
 			if (!is_string($interval))
@@ -1010,12 +1010,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftType($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1056,11 +1056,11 @@ 
     
     
 	/**
-	* Gets all the spotter information sorted by the newest aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAircraftRegistration($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1100,11 +1100,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByAirline($limit = '', $sort = '',$filter = array())
 	{
 		global $global_query;
@@ -1143,12 +1143,12 @@ 
 	}
     
     
-    /**
-	* Gets all the spotter information sorted by the newest departure airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	/**
+	 * Gets all the spotter information sorted by the newest departure airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByDepartureAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1190,11 +1190,11 @@ 
 
 
 	/**
-	* Gets all the spotter information sorted by the newest arrival airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information sorted by the newest arrival airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getNewestSpotterDataSortedByArrivalAirport($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1233,11 +1233,11 @@ 
 	
 
 	/**
-	* Gets all the spotter information based on the spotter id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the spotter id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByID($id = '')
 	{
 		global $global_query;
@@ -1259,11 +1259,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1315,11 +1315,11 @@ 
 	}
 	
 	/**
-	* Gets all the spotter information based on the owner
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1372,11 +1372,11 @@ 
 	}
 	
 	/**
-	* Gets all the spotter information based on the pilot
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1425,11 +1425,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft type
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft type
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAircraft($aircraft_type = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1483,11 +1483,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the aircraft registration
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the aircraft registration
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRegistration($registration = '', $limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1544,11 +1544,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airline
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airline
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirline($airline = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1601,11 +1601,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1659,11 +1659,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the date
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the date
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByDate($date = '', $limit = '', $sort = '',$filter = array())
 	{
 		global $global_query, $globalTimezone, $globalDBdriver;
@@ -1727,11 +1727,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the country name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the country name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByCountry($country = '', $limit = '', $sort = '',$filters = array())
 	{
 		global $global_query;
@@ -1785,11 +1785,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the manufacturer name
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the manufacturer name
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByManufacturer($aircraft_manufacturer = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1845,13 +1845,13 @@ 
   
   
 	/**
-	* Gets a list of all aircraft that take a route
-	*
-	* @param String $departure_airport_icao ICAO code of departure airport
-	* @param String $arrival_airport_icao ICAO code of arrival airport
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets a list of all aircraft that take a route
+	 *
+	 * @param String $departure_airport_icao ICAO code of departure airport
+	 * @param String $arrival_airport_icao ICAO code of arrival airport
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByRoute($departure_airport_icao = '', $arrival_airport_icao = '', $limit = '', $sort = '', $filters = array())
 	{
 		global $global_query;
@@ -1920,11 +1920,11 @@ 
 	
 	
 	/**
-	* Gets all the spotter information based on the special column in the table
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the special column in the table
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByHighlight($limit = '', $sort = '', $filter = array())
 	{
 		global $global_query;
@@ -1963,11 +1963,11 @@ 
 	}
 
 	/**
-	* Gets all the highlight based on a aircraft registration
-	*
-	* @return String the highlight text
-	*
-	*/
+	 * Gets all the highlight based on a aircraft registration
+	 *
+	 * @return String the highlight text
+	 *
+	 */
 	public function getHighlightByRegistration($registration,$filter = array())
 	{
 		global $global_query;
@@ -1989,13 +1989,13 @@ 
 
 	
 	/**
-	* Gets the squawk usage from squawk code
-	*
-	* @param String $squawk squawk code
-	* @param String $country country
-	* @return String usage
-	*
-	*/
+	 * Gets the squawk usage from squawk code
+	 *
+	 * @param String $squawk squawk code
+	 * @param String $country country
+	 * @return String usage
+	 *
+	 */
 	public function getSquawkUsage($squawk = '',$country = 'FR')
 	{
 		
@@ -2016,12 +2016,12 @@ 
 	}
 
 	/**
-	* Gets the airport icao from the iata
-	*
-	* @param String $airport_iata the iata code of the airport
-	* @return String airport iata
-	*
-	*/
+	 * Gets the airport icao from the iata
+	 *
+	 * @param String $airport_iata the iata code of the airport
+	 * @return String airport iata
+	 *
+	 */
 	public function getAirportIcao($airport_iata = '')
 	{
 		
@@ -2041,14 +2041,14 @@ 
 	}
 
 	/**
-	* Gets the airport distance
-	*
-	* @param String $airport_icao the icao code of the airport
-	* @param Float $latitude the latitude
-	* @param Float $longitude the longitude
-	* @return Float distance to the airport
-	*
-	*/
+	 * Gets the airport distance
+	 *
+	 * @param String $airport_icao the icao code of the airport
+	 * @param Float $latitude the latitude
+	 * @param Float $longitude the longitude
+	 * @return Float distance to the airport
+	 *
+	 */
 	public function getAirportDistance($airport_icao,$latitude,$longitude)
 	{
 		
@@ -2069,12 +2069,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the icao
-	*
-	* @param String $airport the icao code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the icao
+	 *
+	 * @param String $airport the icao code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfo($airport = '')
 	{
 		
@@ -2120,12 +2120,12 @@ 
 	}
 	
 	/**
-	* Gets the airport info based on the country
-	*
-	* @param Array $countries Airports countries
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airport info based on the country
+	 *
+	 * @param Array $countries Airports countries
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCountry($countries)
 	{
 		$lst_countries = '';
@@ -2163,12 +2163,12 @@ 
 	}
 	
 	/**
-	* Gets airports info based on the coord
-	*
-	* @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
-	* @return Array airport information
-	*
-	*/
+	 * Gets airports info based on the coord
+	 *
+	 * @param Array $coord Airports longitude min,latitude min, longitude max, latitude max
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirportInfobyCoord($coord)
 	{
 		global $globalDBdriver;
@@ -2199,12 +2199,12 @@ 
 	}
 
 	/**
-	* Gets waypoints info based on the coord
-	*
-	* @param Array $coord waypoints coord
-	* @return Array airport information
-	*
-	*/
+	 * Gets waypoints info based on the coord
+	 *
+	 * @param Array $coord waypoints coord
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllWaypointsInfobyCoord($coord)
 	{
 		if (is_array($coord)) {
@@ -2238,12 +2238,12 @@ 
 	
 	
 	/**
-	* Gets the airline info based on the icao code or iata code
-	*
-	* @param String $airline_icao the iata code of the airport
-	* @return Array airport information
-	*
-	*/
+	 * Gets the airline info based on the icao code or iata code
+	 *
+	 * @param String $airline_icao the iata code of the airport
+	 * @return Array airport information
+	 *
+	 */
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2274,7 +2274,7 @@ 
 			} else {
 				$sth->execute(array(':airline_icao' => $airline_icao,':fromsource' => $fromsource));
 			}
-                        /*
+						/*
 			$airline_array = array();
 			$temp_array = array();
 		
@@ -2307,12 +2307,12 @@ 
 	}
 	
 	/**
-	* Gets the airline info based on the airline name
-	*
-	* @param String $airline_name the name of the airline
-	* @return Array airline information
-	*
-	*/
+	 * Gets the airline info based on the airline name
+	 *
+	 * @param String $airline_name the name of the airline
+	 * @return Array airline information
+	 *
+	 */
 	public function getAllAirlineInfoByName($airline_name, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
@@ -2340,12 +2340,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft info based on the aircraft type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAllAircraftInfo($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2377,12 +2377,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft icao based on the aircraft name/type
-	*
-	* @param String $aircraft_type the aircraft type
-	* @return String aircraft information
-	*
-	*/
+	 * Gets the aircraft icao based on the aircraft name/type
+	 *
+	 * @param String $aircraft_type the aircraft type
+	 * @return String aircraft information
+	 *
+	 */
 	public function getAircraftIcao($aircraft_type)
 	{
 		$aircraft_type = filter_var($aircraft_type,FILTER_SANITIZE_STRING);
@@ -2407,12 +2407,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft modes
-	*
-	* @param String $aircraft_modes the aircraft ident (hex)
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft modes
+	 *
+	 * @param String $aircraft_modes the aircraft ident (hex)
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftType($aircraft_modes,$source_type = '')
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -2439,12 +2439,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return String aircraft type
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String aircraft type
+	 *
+	 */
 	public function getAllAircraftTypeByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2462,12 +2462,12 @@ 
 	}
 
 	/**
-	* Gets the spotter_id and flightaware_id based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array spotter_id and flightaware_id
-	*
-	*/
+	 * Gets the spotter_id and flightaware_id based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array spotter_id and flightaware_id
+	 *
+	 */
 	public function getAllIDByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2486,12 +2486,12 @@ 
 	}
 
 	/**
-	* Gets correct aircraft operator code
-	*
-	* @param String $operator the aircraft operator code (callsign)
-	* @return String aircraft operator code
-	*
-	*/
+	 * Gets correct aircraft operator code
+	 *
+	 * @param String $operator the aircraft operator code (callsign)
+	 * @return String aircraft operator code
+	 *
+	 */
 	public function getOperator($operator)
 	{
 		$operator = filter_var($operator,FILTER_SANITIZE_STRING);
@@ -2508,16 +2508,16 @@ 
 	}
 
 	/**
-	* Gets the aircraft route based on the aircraft callsign
-	*
-	* @param String $callsign the aircraft callsign
-	* @return Array aircraft type
-	*
-	*/
+	 * Gets the aircraft route based on the aircraft callsign
+	 *
+	 * @param String $callsign the aircraft callsign
+	 * @return Array aircraft type
+	 *
+	 */
 	public function getRouteInfo($callsign)
 	{
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-                if ($callsign == '') return array();
+				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";
 		
 		$sth = $this->db->prepare($query);
@@ -2531,12 +2531,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft info based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft info based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftInfoByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2563,12 +2563,12 @@ 
 	}
 	
 	/**
-	* Gets the aircraft owner & base based on the aircraft registration
-	*
-	* @param String $registration the aircraft registration
-	* @return Array aircraft information
-	*
-	*/
+	 * Gets the aircraft owner & base based on the aircraft registration
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return Array aircraft information
+	 *
+	 */
 	public function getAircraftOwnerByRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -2585,11 +2585,11 @@ 
 	
   
   /**
-	* Gets all flights (but with only little info)
-	*
-	* @return Array basic flight information
-	*
-	*/
+   * Gets all flights (but with only little info)
+   *
+   * @return Array basic flight information
+   *
+   */
 	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 ";
@@ -2597,7 +2597,7 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
-                  /*
+				  /*
 		$flight_array = array();
 		$temp_array = array();
 		
@@ -2619,11 +2619,11 @@ 
 	}
   
 	/**
-	* Gets a list of all aircraft manufacturers
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+	 * Gets a list of all aircraft manufacturers
+	 *
+	 * @return Array list of aircraft types
+	 *
+	 */
 	public function getAllManufacturers()
 	{
 		/*
@@ -2652,11 +2652,11 @@ 
   
   
   /**
-	* Gets a list of all aircraft types
-	*
-	* @return Array list of aircraft types
-	*
-	*/
+   * Gets a list of all aircraft types
+   *
+   * @return Array list of aircraft types
+   *
+   */
 	public function getAllAircraftTypes($filters = array())
 	{
 		/*
@@ -2691,11 +2691,11 @@ 
 	
 	
 	/**
-	* Gets a list of all aircraft registrations
-	*
-	* @return Array list of aircraft registrations
-	*
-	*/
+	 * Gets a list of all aircraft registrations
+	 *
+	 * @return Array list of aircraft registrations
+	 *
+	 */
 	public function getAllAircraftRegistrations($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2720,12 +2720,12 @@ 
 	}
 
 	/**
-	* Gets all source name
-	*
-	* @param String type format of source
-	* @return Array list of source name
-	*
-	*/
+	 * Gets all source name
+	 *
+	 * @param String type format of source
+	 * @return Array list of source name
+	 *
+	 */
 	public function getAllSourceName($type = '',$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2756,11 +2756,11 @@ 
 
 
 	/**
-	* Gets a list of all airline names
-	*
-	* @return Array list of airline names
-	*
-	*/
+	 * Gets a list of all airline names
+	 *
+	 * @return Array list of airline names
+	 *
+	 */
 	public function getAllAirlineNames($airline_type = '',$forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2809,11 +2809,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all alliance names
-	*
-	* @return Array list of alliance names
-	*
-	*/
+	 * Gets a list of all alliance names
+	 *
+	 * @return Array list of alliance names
+	 *
+	 */
 	public function getAllAllianceNames($forsource = NULL,$filters = array())
 	{
 		global $globalAirlinesSource,$globalVATSIM, $globalIVAO;
@@ -2838,11 +2838,11 @@ 
 	}
 	
 	/**
-	* Gets a list of all airline countries
-	*
-	* @return Array list of airline countries
-	*
-	*/
+	 * Gets a list of all airline countries
+	 *
+	 * @return Array list of airline countries
+	 *
+	 */
 	public function getAllAirlineCountries($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2870,11 +2870,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival names
-	*
-	* @return Array list of airport names
-	*
-	*/
+	 * Gets a list of all departure & arrival names
+	 *
+	 * @return Array list of airport names
+	 *
+	 */
 	public function getAllAirportNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2922,11 +2922,11 @@ 
 	} 
 
 	/**
-	* Gets a list of all owner names
-	*
-	* @return Array list of owner names
-	*
-	*/
+	 * Gets a list of all owner names
+	 *
+	 * @return Array list of owner names
+	 *
+	 */
 	public function getAllOwnerNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2940,11 +2940,11 @@ 
 	} 
 
 	/**
-	* Gets a list of all pilot names and pilot ids
-	*
-	* @return Array list of pilot names and pilot ids
-	*
-	*/
+	 * Gets a list of all pilot names and pilot ids
+	 *
+	 * @return Array list of pilot names and pilot ids
+	 *
+	 */
 	public function getAllPilotNames($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -2959,11 +2959,11 @@ 
 	
 	
 	/**
-	* Gets a list of all departure & arrival airport countries
-	*
-	* @return Array list of airport countries
-	*
-	*/
+	 * Gets a list of all departure & arrival airport countries
+	 *
+	 * @return Array list of airport countries
+	 *
+	 */
 	public function getAllAirportCountries($filters = array())
 	{
 		$airport_array = array();
@@ -3011,11 +3011,11 @@ 
 	
 	
 	/**
-	* Gets a list of all countries (airline, departure airport & arrival airport)
-	*
-	* @return Array list of countries
-	*
-	*/
+	 * Gets a list of all countries (airline, departure airport & arrival airport)
+	 *
+	 * @return Array list of countries
+	 *
+	 */
 	public function getAllCountries($filters = array())
 	{
 		$Connection= new Connection($this->db);
@@ -3092,11 +3092,11 @@ 
 	
 	
 	/**
-	* Gets a list of all idents/callsigns
-	*
-	* @return Array list of ident/callsign names
-	*
-	*/
+	 * Gets a list of all idents/callsigns
+	 *
+	 * @return Array list of ident/callsign names
+	 *
+	 */
 	public function getAllIdents($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -3120,9 +3120,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDeparture($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3153,9 +3153,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3185,9 +3185,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDeparture($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3225,9 +3225,9 @@ 
 	}
 
 	/**
-	* Get a list of flights from detected airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights from detected airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsDepartureByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3269,9 +3269,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrival($airport_icao = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3304,9 +3304,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrival($airport_icao = '',$filters = array()) {
 		global $globalTimezone, $globalDBdriver;
@@ -3347,9 +3347,9 @@ 
 
 
 	/**
-	* Get a list of flights to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3381,9 +3381,9 @@ 
 
 
 	/**
-	* Get a list of flights detected to airport since 7 days
-	* @return Array number, icao, name and city of airports
-	*/
+	 * Get a list of flights detected to airport since 7 days
+	 * @return Array number, icao, name and city of airports
+	 */
 
 	public function getLast7DaysDetectedAirportsArrivalByAirlines($airport_icao = '') {
 		global $globalTimezone, $globalDBdriver;
@@ -3427,11 +3427,11 @@ 
 
 
 	/**
-	* Gets a list of all dates
-	*
-	* @return Array list of date names
-	*
-	*/
+	 * Gets a list of all dates
+	 *
+	 * @return Array list of date names
+	 *
+	 */
 	public function getAllDates()
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -3472,11 +3472,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	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 
@@ -3502,13 +3502,13 @@ 
 	}
 
 	/**
-	* Update ident spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @return String success or false
-	*
-	*/	
+	 * Update ident spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @return String success or false
+	 *
+	 */	
 	public function updateIdentSpotterData($flightaware_id = '', $ident = '',$fromsource = NULL)
 	{
 		if (!is_numeric(substr($ident, 0, 3)))
@@ -3529,14 +3529,14 @@ 
 		} else {
 			$airline_array = $this->getAllAirlineInfo("NA");
 		}
-                $airline_name = $airline_array[0]['name'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 
 
 		$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);
@@ -3549,19 +3549,19 @@ 
 
 	}
 	/**
-	* Update latest spotter data
-	*
-	* @param String $flightaware_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/	
+	 * Update latest spotter data
+	 *
+	 * @param String $flightaware_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @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 = '')
 	{
 		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);
@@ -3575,32 +3575,32 @@ 
 	}
 
 	/**
-	* 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
-	* @param String $latitude latitude of flight
-	* @param String $longitude latitude of flight
-	* @param String $waypoints waypoints of flight
-	* @param String $altitude altitude of flight
-	* @param String $heading heading of flight
-	* @param String $groundspeed speed of flight
-	* @param String $date date of flight
-	* @param String $departure_airport_time departure time of flight
-	* @param String $arrival_airport_time arrival time of flight
-	* @param String $squawk squawk code of flight
-	* @param String $route_stop route stop of flight
-	* @param String $highlight highlight or not
-	* @param String $ModeS ModesS code of flight
-	* @param String $registration registration code of flight
-	* @param String $pilot_id pilot id of flight (for virtual airlines)
-	* @param String $pilot_name pilot name of flight (for virtual airlines)
-	* @param String $verticalrate vertival rate of flight
-	* @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
+	 * @param String $latitude latitude of flight
+	 * @param String $longitude latitude of flight
+	 * @param String $waypoints waypoints of flight
+	 * @param String $altitude altitude of flight
+	 * @param String $heading heading of flight
+	 * @param String $groundspeed speed of flight
+	 * @param String $date date of flight
+	 * @param String $departure_airport_time departure time of flight
+	 * @param String $arrival_airport_time arrival time of flight
+	 * @param String $squawk squawk code of flight
+	 * @param String $route_stop route stop of flight
+	 * @param String $highlight highlight or not
+	 * @param String $ModeS ModesS code of flight
+	 * @param String $registration registration code of flight
+	 * @param String $pilot_id pilot id of flight (for virtual airlines)
+	 * @param String $pilot_name pilot name of flight (for virtual airlines)
+	 * @param String $verticalrate vertival rate of flight
+	 * @return String success or false
+	 */
 	public function addSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '',$squawk = '', $route_stop = '', $highlight = '', $ModeS = '', $registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $ground = false,$format_source = '', $source_name = '',$source_type = '')
 	{
 		global $globalURL, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalDebugTimeElapsed, $globalAirlinesSource, $globalVAM;
@@ -3815,8 +3815,8 @@ 
     
 		if (($globalIVAO || $globalVATSIM || $globalphpVMS || $globalVAM) && $aircraft_icao != '')
 		{
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
-            		else $airline_icao = '';
+					if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
+					else $airline_icao = '';
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
@@ -3847,53 +3847,53 @@ 
 	
 		if (count($airline_array) == 0) 
 		{
-                        $airline_array = $this->getAllAirlineInfo('NA');
-                }
-                if (count($aircraft_array) == 0) 
-                {
-                        $aircraft_array = $this->getAllAircraftInfo('NA');
-                }
-                if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
-                {
-                        $departure_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
-                {
-                        $arrival_airport_array = $this->getAllAirportInfo('NA');
-                }
-                if ($registration == '') $registration = 'NA';
-                if ($latitude == '' && $longitude == '') {
-            		$latitude = 0;
-            		$longitude = 0;
-            	}
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
-                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) 
+						$airline_array = $this->getAllAirlineInfo('NA');
+				}
+				if (count($aircraft_array) == 0) 
+				{
+						$aircraft_array = $this->getAllAircraftInfo('NA');
+				}
+				if (count($departure_airport_array) == 0 || $departure_airport_array[0]['icao'] == '' || $departure_airport_icao == '') 
+				{
+						$departure_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if (count($arrival_airport_array) == 0 || $arrival_airport_array[0]['icao'] == '' || $arrival_airport_icao == '') 
+				{
+						$arrival_airport_array = $this->getAllAirportInfo('NA');
+				}
+				if ($registration == '') $registration = 'NA';
+				if ($latitude == '' && $longitude == '') {
+					$latitude = 0;
+					$longitude = 0;
+				}
+				if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
+				if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
+				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) 
                 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'];
-                $airline_icao = $airline_array[0]['icao'];
-                $airline_country = $airline_array[0]['country'];
-                $airline_type = $airline_array[0]['type'];
+				$airline_name = $airline_array[0]['name'];
+				$airline_icao = $airline_array[0]['icao'];
+				$airline_country = $airline_array[0]['country'];
+				$airline_type = $airline_array[0]['type'];
 		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 ($airline_type == null) $airline_type = '';
-                $aircraft_type = $aircraft_array[0]['type'];
-                $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
-                $departure_airport_name = $departure_airport_array[0]['name'];
-	        $departure_airport_city = $departure_airport_array[0]['city'];
-            	$departure_airport_country = $departure_airport_array[0]['country'];
+				$aircraft_type = $aircraft_array[0]['type'];
+				$aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
+				$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'];
-                $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);
+				$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);
 
 		try {
 		        
@@ -3901,7 +3901,7 @@ 
 			$sth->execute($query_values);
 			$this->db = null;
 		} catch (PDOException $e) {
-		    return "error : ".$e->getMessage();
+			return "error : ".$e->getMessage();
 		}
 		
 		return "success";
@@ -3910,11 +3910,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;
@@ -3930,11 +3930,11 @@ 
 								AND spotter_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 								AND spotter_output.date < now() AT TIME ZONE 'UTC'";
 			$query_data = array(':ident' => $ident);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-    		$ident_result='';
+			$ident_result='';
 		while($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
@@ -3945,11 +3945,11 @@ 
 	
 	
 	/**
-	* Gets the aircraft data from the last 20 seconds
-	*
-	* @return Array the spotter data
-	*
-	*/
+	 * Gets the aircraft data from the last 20 seconds
+	 *
+	 * @return Array the spotter data
+	 *
+	 */
 	public function getRealTimeData($q = '')
 	{
 		global $globalDBdriver;
@@ -3993,11 +3993,11 @@ 
 	
 	
 	 /**
-	* Gets all airlines that have flown over
-	*
-	* @return Array the airline list
-	*
-	*/
+	  * Gets all airlines that have flown over
+	  *
+	  * @return Array the airline list
+	  *
+	  */
 	public function countAllAirlines($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -4011,7 +4011,7 @@ 
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
+				if ($sincedate != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
@@ -4065,26 +4065,26 @@ 
 	}
 
 	 /**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all pilots that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	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
 			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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4139,25 +4139,25 @@ 
 	}
 	
 	/**
-	* Gets all pilots that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	 * Gets all pilots that have flown over
+	 *
+	 * @return Array the pilots list
+	 *
+	 */
 	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
 		 			FROM spotter_output WHERE spotter_output.pilot_id <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4186,26 +4186,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	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
 					FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4256,26 +4256,26 @@ 
 	}
 	
 	 /**
-	* Gets all owner that have flown over
-	*
-	* @return Array the pilots list
-	*
-	*/
+	  * Gets all owner that have flown over
+	  *
+	  * @return Array the pilots list
+	  *
+	  */
 	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
 		 			FROM spotter_output".$filter_query." spotter_output.owner_name <> '' AND spotter_output.owner_name IS NOT NULL ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -4302,11 +4302,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by aircraft
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -4338,11 +4338,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
@@ -4375,11 +4375,11 @@ 
 	
 	
 	/**
-	* Gets all airlines that have flown over by airport
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by airport
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4410,11 +4410,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by airport icao
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by airport icao
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByAirport($airport_icao,$filters = array())
 	{
 		$airport_icao = filter_var($airport_icao,FILTER_SANITIZE_STRING);
@@ -4445,11 +4445,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4480,11 +4480,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by aircraft manufacturer
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
@@ -4513,11 +4513,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by date
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by date
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4561,11 +4561,11 @@ 
 	
 	
 	/**
-	* Gets all airline countries that have flown over by date
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by date
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -4608,11 +4608,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by ident/callsign
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by ident/callsign
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByIdent($ident,$filters = array())
 	{
 		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
@@ -4629,11 +4629,11 @@ 
 	}
 
 	/**
-	* Gets all airlines by owner
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines by owner
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByOwner($owner,$filters = array())
 	{
 		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
@@ -4650,11 +4650,11 @@ 
 	}
 
 	/**
-	* Gets flight duration by owner
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Gets flight duration by owner
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function getFlightDurationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -4701,11 +4701,11 @@ 
 	}
 
 	/**
-	* Count flights by owner
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Count flights by owner
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function countFlightsByOwner($owner,$filters = array())
 	{
 		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
@@ -4721,11 +4721,11 @@ 
 	}
 
 	/**
-	* Count flights by pilot
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Count flights by pilot
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function countFlightsByPilot($pilot,$filters = array())
 	{
 		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
@@ -4741,11 +4741,11 @@ 
 	}
 
 	/**
-	* Gets flight duration by pilot
-	*
-	* @return String Duration of all flights
-	*
-	*/
+	 * Gets flight duration by pilot
+	 *
+	 * @return String Duration of all flights
+	 *
+	 */
 	public function getFlightDurationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -4791,11 +4791,11 @@ 
 	}
 
 	/**
-	* Gets all airlines used by pilot
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines used by pilot
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByPilot($pilot,$filters = array())
 	{
 		$pilot = filter_var($pilot,FILTER_SANITIZE_STRING);
@@ -4812,11 +4812,11 @@ 
 	}
 
 	/**
-	* Gets all airlines that have flown over by route
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by route
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4848,11 +4848,11 @@ 
 	}
 
 	/**
-	* Gets all airline countries that have flown over by route
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by route
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByRoute($departure_airport_icao, $arrival_airport_icao,$filters= array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4884,11 +4884,11 @@ 
 
 
 	/**
-	* Gets all airlines that have flown over by country
-	*
-	* @return Array the airline list
-	*
-	*/
+	 * Gets all airlines that have flown over by country
+	 *
+	 * @return Array the airline list
+	 *
+	 */
 	public function countAllAirlinesByCountry($country,$filters = array())
 	{
 		$country = filter_var($country,FILTER_SANITIZE_STRING);
@@ -4918,11 +4918,11 @@ 
 
 
 	/**
-	* Gets all airline countries that have flown over by country
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airline countries that have flown over by country
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -4951,11 +4951,11 @@ 
 
 
 	/**
-	* Gets all airlines countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all airlines countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllAirlineCountries($limit = true, $filters = array(), $year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -5011,11 +5011,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5037,15 +5037,15 @@ 
 		$SpotterLive = new SpotterLive();
 		$filter_query = $SpotterLive->getFilter($filters,true,true);
 		$filter_query .= ' over_country IS NOT NULL';
-                if ($olderthanmonths > 0) {
+				if ($olderthanmonths > 0) {
 			if ($globalDBdriver == 'mysql') {
 				$filter_query .= ' AND spotter_live.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$filter_query .= " AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$filter_query .= " AND spotter_live.date > '".$sincedate."' ";
 			} else {
 				$filter_query .= " AND spotter_live.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -5075,11 +5075,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5149,11 +5149,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by airline
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -5224,11 +5224,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by months
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by months
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByMonths($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -5272,11 +5272,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAircraft($aircraft_icao,$filters = array())
 	{
 		$Image = new Image($this->db);
@@ -5315,11 +5315,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5348,11 +5348,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5390,11 +5390,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5422,11 +5422,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by airline icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by airline icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5455,11 +5455,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5496,11 +5496,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by airport icao
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by airport icao
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftManufacturerByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5526,11 +5526,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by aircraft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by aircraft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5557,11 +5557,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by aircaft manufacturer
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by aircaft manufacturer
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5597,11 +5597,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5643,11 +5643,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by date
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by date
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5698,11 +5698,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by date
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by date
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -5744,11 +5744,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5776,11 +5776,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by pilot
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by pilot
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5826,11 +5826,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft types that have flown over by owner
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by owner
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5875,11 +5875,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by ident/callsign
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -5918,11 +5918,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by owner
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by owner
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -5993,11 +5993,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by pilot
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by pilot
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6069,11 +6069,11 @@ 
 
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by ident/callsign
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by ident/callsign
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6098,11 +6098,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by owner
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by owner
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByOwner($owner,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6150,11 +6150,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft manufacturer that have flown over by pilot
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by pilot
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByPilot($pilot,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -6203,11 +6203,11 @@ 
 
 
 	/**
-	* Gets all aircraft types that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6236,11 +6236,11 @@ 
 	}
 
 	/**
-	* Gets all aircraft registration that have flown over by route
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by route
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6282,11 +6282,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by route
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by route
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByRoute($departure_airport_icao, $arrival_airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6320,11 +6320,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft types that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft types that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftTypesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6355,11 +6355,11 @@ 
 
 
 	/**
-	* Gets all aircraft registration that have flown over by country
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registration that have flown over by country
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6399,11 +6399,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturer that have flown over by country
-	*
-	* @return Array the aircraft manufacturer list
-	*
-	*/
+	 * Gets all aircraft manufacturer that have flown over by country
+	 *
+	 * @return Array the aircraft manufacturer list
+	 *
+	 */
 	public function countAllAircraftManufacturerByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6434,18 +6434,18 @@ 
 	
 	
 	/**
-	* Gets all aircraft manufacturers that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft manufacturers that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	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  
                     FROM spotter_output ".$filter_query." spotter_output.aircraft_manufacturer <> '' AND spotter_output.aircraft_manufacturer <> 'Not Available'";
-                $query_values = array();
+				$query_values = array();
 		if ($year != '') {
 			if ($globalDBdriver == 'mysql') {
 				$query .= " AND YEAR(spotter_output.date) = :year";
@@ -6498,11 +6498,11 @@ 
 	
 	
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrations($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -6510,15 +6510,15 @@ 
 		$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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6583,11 +6583,11 @@ 
 
 
 	/**
-	* Gets all aircraft registrations that have flown over
-	*
-	* @return Array the aircraft list
-	*
-	*/
+	 * Gets all aircraft registrations that have flown over
+	 *
+	 * @return Array the aircraft list
+	 *
+	 */
 	public function countAllAircraftRegistrationsByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
 	{
 		global $globalDBdriver;
@@ -6595,15 +6595,15 @@ 
 		$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    
                     FROM spotter_output".$filter_query." spotter_output.airline_icao <> '' AND spotter_output.registration <> '' AND spotter_output.registration <> 'NA' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6612,7 +6612,7 @@ 
 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 		
 		$sth = $this->db->prepare($query);
@@ -6644,26 +6644,26 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.departure_airport_icao, COUNT(spotter_output.departure_airport_icao) AS airport_departure_icao_count, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
 				FROM airport, spotter_output".$filter_query." airport.icao = spotter_output.departure_airport_icao AND spotter_output.departure_airport_name <> '' AND spotter_output.departure_airport_icao <> 'NA' AND spotter_output.departure_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6697,7 +6697,7 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
+				$query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
 
@@ -6721,35 +6721,35 @@ 
 	}
 
 	/**
-	* Gets all departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	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 
 			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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, 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";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -6774,26 +6774,26 @@ 
 	}
 
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedDepartureAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_departure_airport_icao AS departure_airport_icao, COUNT(spotter_output.real_departure_airport_icao) AS airport_departure_icao_count, airport.name as departure_airport_name, airport.city as departure_airport_city, airport.country as departure_airport_country, airport.latitude as departure_airport_latitude, airport.longitude as departure_airport.longitude
 				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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -6827,10 +6827,10 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
+				$query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
-    		//echo $query;
+			//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
       
@@ -6853,35 +6853,35 @@ 
 	}
 	
 	/**
-	* Gets all detected departure airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected departure airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	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
 				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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
-                }
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				}
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10 OFFSET 0";
       
@@ -6906,11 +6906,11 @@ 
 	}	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6944,11 +6944,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -6977,11 +6977,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7014,11 +7014,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7048,11 +7048,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7085,11 +7085,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7119,11 +7119,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an arrivl airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7156,11 +7156,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7189,11 +7189,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7226,11 +7226,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7260,11 +7260,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7310,11 +7310,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -7357,11 +7357,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7393,11 +7393,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7429,11 +7429,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7466,11 +7466,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7499,11 +7499,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7519,11 +7519,11 @@ 
 	}
 	
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7541,11 +7541,11 @@ 
 	
 	
 	/**
-	* Gets all departure airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7579,11 +7579,11 @@ 
 
 
 	/**
-	* Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all departure airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDepartureAirportCountriesByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7613,31 +7613,31 @@ 
 	
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @param Boolean $limit Limit result to 10 or not
-	* @param Integer $olderthanmonths Only show result older than x months
-	* @param String $sincedate Only show result since x date
-	* @param Boolean $icaoaskey Show result by ICAO
-	* @param Array $filters Filter used here
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @param Boolean $limit Limit result to 10 or not
+	 * @param Integer $olderthanmonths Only show result older than x months
+	 * @param String $sincedate Only show result since x date
+	 * @param Boolean $icaoaskey Show result by ICAO
+	 * @param Array $filters Filter used here
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude as arrival_airport_latitude, airport.longitude as arrival_airport_longitude 
 				FROM airport, spotter_output".$filter_query." airport.icao = spotter_output.arrival_airport_icao AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> ''";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -7671,7 +7671,7 @@ 
 				$query_values = array_merge($query_values,array(':day' => $day));
 			}
 		}
-                $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude, airport.longitude
+				$query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude, airport.longitude
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7702,35 +7702,35 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $icaoaskey = false,$filters = array())
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.airline_icao, spotter_output.arrival_airport_icao, COUNT(spotter_output.arrival_airport_icao) AS airport_arrival_icao_count, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, country.iso3 AS arrival_airport_country_iso3 
 			FROM countries,spotter_output".$filter_query." countries.name = spotter_output.arrival_airport_country AND spotter_output.airline_icao <> '' AND spotter_output.arrival_airport_name <> '' AND spotter_output.arrival_airport_icao <> 'NA' AND spotter_output.arrival_airport_icao <> '' ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, countries.iso3
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, countries.iso3
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7762,26 +7762,26 @@ 
 
 
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllDetectedArrivalAirports($limit = true, $olderthanmonths = 0, $sincedate = '',$icaoaskey = false,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
 		$filter_query = $this->getFilter($filters,true,true);
 		$query  = "SELECT DISTINCT spotter_output.real_arrival_airport_icao as arrival_airport_icao, COUNT(spotter_output.real_arrival_airport_icao) AS airport_arrival_icao_count, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, airport.latitude AS arrival_airport_latitude, airport.longitude AS arrival_airport_longitude 
 			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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= ' AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH)';
 			} else {
 				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= " AND spotter_output.date > '".$sincedate."'";
 			} else {
 				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
@@ -7843,35 +7843,35 @@ 
 	}
 	
 	/**
-	* Gets all detected arrival airports of the airplanes that have flown over
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all detected arrival airports of the airplanes that have flown over
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	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 
 			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') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND spotter_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
 			}
 		}
-                if ($sincedate != '') {
-            		if ($globalDBdriver == 'mysql') {
+				if ($sincedate != '') {
+					if ($globalDBdriver == 'mysql') {
 				$query .= "AND spotter_output.date > '".$sincedate."' ";
 			} else {
 				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
 			}
 		}
 
-            	//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
-                //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
-                $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
+				//if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+				//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				$query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
 		if ($limit) $query .= " LIMIT 10";
       
@@ -7901,11 +7901,11 @@ 
 	}	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7937,11 +7937,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airline icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirline($airline_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -7971,11 +7971,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8009,11 +8009,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8043,11 +8043,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8081,11 +8081,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an aircraft registration
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByRegistration($registration,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8116,11 +8116,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on an departure airport
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on an departure airport
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8153,11 +8153,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on an airport icao
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByAirport($airport_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8185,11 +8185,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8223,11 +8223,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a aircraft manufacturer
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByManufacturer($aircraft_manufacturer,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8258,11 +8258,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByDate($date,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8308,11 +8308,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a date
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a date
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -8355,11 +8355,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a ident/callsign
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByIdent($ident,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8391,11 +8391,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8426,11 +8426,11 @@ 
 	}
 
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8461,11 +8461,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a callsign/ident
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8494,11 +8494,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a owner
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a owner
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByOwner($owner, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8514,11 +8514,11 @@ 
 	}
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a pilot
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a pilot
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByPilot($pilot, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8536,11 +8536,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportsByCountry($country,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8573,11 +8573,11 @@ 
 	
 	
 	/**
-	* Gets all arrival airports by country of the airplanes that have flown over based on a country
-	*
-	* @return Array the airport list
-	*
-	*/
+	 * Gets all arrival airports by country of the airplanes that have flown over based on a country
+	 *
+	 * @return Array the airport list
+	 *
+	 */
 	public function countAllArrivalAirportCountriesByCountry($country,$filters = array())
 	{
 		global $globalDBdriver;
@@ -8609,11 +8609,11 @@ 
 
 
 	/**
-	* Counts all airport departure countries
-	*
-	* @return Array the airport departure list
-	*
-	*/
+	 * Counts all airport departure countries
+	 *
+	 * @return Array the airport departure list
+	 *
+	 */
 	public function countAllDepartureCountries($filters = array(),$year = '',$month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -8672,11 +8672,11 @@ 
 	
 	
 	/**
-	* Counts all airport arrival countries
-	*
-	* @return Array the airport arrival list
-	*
-	*/
+	 * Counts all airport arrival countries
+	 *
+	 * @return Array the airport arrival list
+	 *
+	 */
 	public function countAllArrivalCountries($limit = true,$filters = array(),$year = '',$month = '',$day = '')
 	{
 		global $globalDBdriver;
@@ -8739,11 +8739,11 @@ 
 
 
 	/**
-	* Gets all route combinations
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutes($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8782,11 +8782,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAircraft($aircraft_icao,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8822,11 +8822,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an aircraft registration
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an aircraft registration
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByRegistration($registration, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8864,11 +8864,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airline
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airline
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirline($airline_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8906,11 +8906,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an airport
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an airport
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByAirport($airport_icao, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8947,11 +8947,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an country
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an country
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByCountry($country, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -8987,11 +8987,11 @@ 
 
 
 	/**
-	* Gets all route combinations based on an date
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an date
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9041,11 +9041,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an ident/callsign
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an ident/callsign
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByIdent($ident, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9081,11 +9081,11 @@ 
 	}
 	
 	/**
-	* Gets all route combinations based on an owner
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an owner
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByOwner($owner,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9121,11 +9121,11 @@ 
 	}
 	
 	/**
-	* Gets all route combinations based on a pilot
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on a pilot
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByPilot($pilot,$filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9162,11 +9162,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations based on an manufacturer
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations based on an manufacturer
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesByManufacturer($aircraft_manufacturer, $filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9204,11 +9204,11 @@ 
 	
 	
 	/**
-	* Gets all route combinations with waypoints
-	*
-	* @return Array the route list
-	*
-	*/
+	 * Gets all route combinations with waypoints
+	 *
+	 * @return Array the route list
+	 *
+	 */
 	public function countAllRoutesWithWaypoints($filters = array())
 	{
 		$filter_query = $this->getFilter($filters,true,true);
@@ -9245,11 +9245,11 @@ 
 	}
 	
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
 	{
 		global $globalDBdriver;
@@ -9315,11 +9315,11 @@ 
 	}
 
 	/**
-	* Gets all callsigns that have flown over
-	*
-	* @return Array the callsign list
-	*
-	*/
+	 * Gets all callsigns that have flown over
+	 *
+	 * @return Array the callsign list
+	 *
+	 */
 	public function countAllCallsignsByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
 	{
 		global $globalDBdriver;
@@ -9360,11 +9360,11 @@ 
 
 
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDates($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9409,11 +9409,11 @@ 
 	}
 	
 	/**
-	* Counts all dates
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9458,11 +9458,11 @@ 
 	}	
 	
 	/**
-	* Counts all dates during the last 7 days
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last 7 days
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLast7Days($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9484,7 +9484,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9504,11 +9504,11 @@ 
 	}
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonth($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9530,7 +9530,7 @@ 
 			$query .= " GROUP BY date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9551,11 +9551,11 @@ 
 
 
 	/**
-	* Counts all dates during the last month
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last month
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllDatesLastMonthByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9578,7 +9578,7 @@ 
 								GROUP BY spotter_output.airline_icao, date_name 
 								ORDER BY date_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -9600,11 +9600,11 @@ 
 	
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9646,11 +9646,11 @@ 
 	}
 
 	/**
-	* Counts all month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9695,11 +9695,11 @@ 
 	}
 
 	/**
-	* Counts all military month
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all military month
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMilitaryMonths($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9740,11 +9740,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwners($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9786,11 +9786,11 @@ 
 	}
 	
 	/**
-	* Counts all month owners
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month owners
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsOwnersByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9833,11 +9833,11 @@ 
 	}
 
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilots($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9879,11 +9879,11 @@ 
 	}
 	
 	/**
-	* Counts all month pilot
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month pilot
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsPilotsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9926,11 +9926,11 @@ 
 	}
 
 	/**
-	* Counts all month airline
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month airline
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -9972,11 +9972,11 @@ 
 	}
 	
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircrafts($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10019,11 +10019,11 @@ 
 	
 
 	/**
-	* Counts all month aircraft
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month aircraft
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsAircraftsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10066,11 +10066,11 @@ 
 	}
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivals($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10113,11 +10113,11 @@ 
 	
 
 	/**
-	* Counts all month real arrival
-	*
-	* @return Array the month list
-	*
-	*/
+	 * Counts all month real arrival
+	 *
+	 * @return Array the month list
+	 *
+	 */
 	public function countAllMonthsRealArrivalsByAirlines($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10161,11 +10161,11 @@ 
 	
 
 	/**
-	* Counts all dates during the last year
-	*
-	* @return Array the date list
-	*
-	*/
+	 * Counts all dates during the last year
+	 *
+	 * @return Array the date list
+	 *
+	 */
 	public function countAllMonthsLastYear($filters)
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10187,7 +10187,7 @@ 
 			$query .= " GROUP BY year_name, month_name
 								ORDER BY year_name, month_name ASC";
 			$query_data = array(':offset' => $offset);
-    		}
+			}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
@@ -10210,11 +10210,11 @@ 
 	
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHours($orderby,$filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10275,11 +10275,11 @@ 
 	}
 	
 	/**
-	* Counts all hours
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirlines($orderby, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10342,11 +10342,11 @@ 
 
 
 	/**
-	* Counts all hours by airline
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airline
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirline($airline_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10392,11 +10392,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAircraft($aircraft_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10439,11 +10439,11 @@ 
 	
 	
 	/**
-	* Counts all hours by aircraft registration
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by aircraft registration
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRegistration($registration, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10486,11 +10486,11 @@ 
 	
 	
 	/**
-	* Counts all hours by airport
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by airport
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByAirport($airport_icao, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10534,11 +10534,11 @@ 
 	
 	
 	/**
-	* Counts all hours by manufacturer
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by manufacturer
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByManufacturer($aircraft_manufacturer,$filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10582,11 +10582,11 @@ 
 	
 	
 	/**
-	* Counts all hours by date
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by date
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByDate($date, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10630,11 +10630,11 @@ 
 	
 	
 	/**
-	* Counts all hours by a ident/callsign
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a ident/callsign
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByIdent($ident, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10677,11 +10677,11 @@ 
 	}
 	
 	/**
-	* Counts all hours by a owner
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a owner
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByOwner($owner, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10724,11 +10724,11 @@ 
 	}
 	
 	/**
-	* Counts all hours by a pilot
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by a pilot
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByPilot($pilot, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10773,11 +10773,11 @@ 
 	
 	
 	/**
-	* Counts all hours by route
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by route
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByRoute($departure_airport_icao, $arrival_airport_icao, $filters =array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10821,11 +10821,11 @@ 
 	
 	
 	/**
-	* Counts all hours by country
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours by country
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursByCountry($country, $filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -10870,11 +10870,11 @@ 
 
 
 	/**
-	* Counts all aircraft that have flown over
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all aircraft that have flown over
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallAircrafts($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10907,11 +10907,11 @@ 
 	}
 
 	/**
-	* Counts all flight that really arrival
-	*
-	* @return Integer the number of aircrafts
-	*
-	*/
+	 * Counts all flight that really arrival
+	 *
+	 * @return Integer the number of aircrafts
+	 *
+	 */
 	public function countOverallArrival($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10944,11 +10944,11 @@ 
 	}
 
 	/**
-	* Counts all pilots that have flown over
-	*
-	* @return Integer the number of pilots
-	*
-	*/
+	 * Counts all pilots that have flown over
+	 *
+	 * @return Integer the number of pilots
+	 *
+	 */
 	public function countOverallPilots($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -10980,11 +10980,11 @@ 
 	}
 
 	/**
-	* Counts all owners that have flown over
-	*
-	* @return Integer the number of owners
-	*
-	*/
+	 * Counts all owners that have flown over
+	 *
+	 * @return Integer the number of owners
+	 *
+	 */
 	public function countOverallOwners($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11017,11 +11017,11 @@ 
 	
 	
 	/**
-	* Counts all flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallFlights($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11055,11 +11055,11 @@ 
 	}
 	
 	/**
-	* Counts all military flights that have flown over
-	*
-	* @return Integer the number of flights
-	*
-	*/
+	 * Counts all military flights that have flown over
+	 *
+	 * @return Integer the number of flights
+	 *
+	 */
 	public function countOverallMilitaryFlights($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11094,11 +11094,11 @@ 
 	
 	
 	/**
-	* Counts all airlines that have flown over
-	*
-	* @return Integer the number of airlines
-	*
-	*/
+	 * Counts all airlines that have flown over
+	 *
+	 * @return Integer the number of airlines
+	 *
+	 */
 	public function countOverallAirlines($filters = array(),$year = '',$month = '')
 	{
 		global $globalDBdriver;
@@ -11125,8 +11125,8 @@ 
 				$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);
+				if ($query == '') $queryi .= $this->getFilter($filters);
+				else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
 
 
 		$sth = $this->db->prepare($queryi);
@@ -11136,11 +11136,11 @@ 
 
   
 	/**
-	* Counts all hours of today
-	*
-	* @return Array the hour list
-	*
-	*/
+	 * Counts all hours of today
+	 *
+	 * @return Array the hour list
+	 *
+	 */
 	public function countAllHoursFromToday($filters = array())
 	{
 		global $globalTimezone, $globalDBdriver;
@@ -11180,11 +11180,11 @@ 
 	}
     
 	/**
-	* Gets all the spotter information based on calculated upcoming flights
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on calculated upcoming flights
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getUpcomingFlights($limit = '', $sort = '', $filters = array())
 	{
 		global $global_query, $globalDBdriver, $globalTimezone;
@@ -11259,12 +11259,12 @@ 
 	}
     
     
-     /**
-	* Gets the Barrie Spotter ID based on the FlightAware ID
-	*
-	* @return Integer the Barrie Spotter ID
+	 /**
+	  * Gets the Barrie Spotter ID based on the FlightAware ID
+	  *
+	  * @return Integer the Barrie Spotter ID
 q	*
-	*/
+	  */
 	public function getSpotterIDBasedOnFlightAwareID($flightaware_id)
 	{
 		$flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING);
@@ -11285,13 +11285,13 @@ 
   
  
 	/**
-	* Parses a date string
-	*
-	* @param String $dateString the date string
-	* @param String $timezone the timezone of a user
-	* @return Array the time information
-	*
-	*/
+	 * Parses a date string
+	 *
+	 * @param String $dateString the date string
+	 * @param String $timezone the timezone of a user
+	 * @return Array the time information
+	 *
+	 */
 	public function parseDateString($dateString, $timezone = '')
 	{
 		$time_array = array();
@@ -11327,12 +11327,12 @@ 
 	
 	
 	/**
-	* Parses the direction degrees to working
-	*
-	* @param Float $direction the direction in degrees
-	* @return Array the direction information
-	*
-	*/
+	 * Parses the direction degrees to working
+	 *
+	 * @param Float $direction the direction in degrees
+	 * @return Array the direction information
+	 *
+	 */
 	public function parseDirection($direction = 0)
 	{
 		if ($direction == '') $direction = 0;
@@ -11411,12 +11411,12 @@ 
 	
 	
 	/**
-	* Gets the aircraft registration
-	*
-	* @param String $flightaware_id the flight aware id
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration
+	 *
+	 * @param String $flightaware_id the flight aware id
+	 * @return String the aircraft registration
+	 *
+	 */
 	
 	public function getAircraftRegistration($flightaware_id)
 	{
@@ -11445,12 +11445,12 @@ 
 
 
 	/**
-	* Gets the aircraft registration from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft registration
-	*
-	*/
+	 * Gets the aircraft registration from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function getAircraftRegistrationBymodeS($aircraft_modes, $source_type = '')
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -11466,8 +11466,8 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    //return $row['Registration'];
-		    return $row['registration'];
+			//return $row['Registration'];
+			return $row['registration'];
 		} elseif ($source_type == 'flarm') {
 			return $this->getAircraftRegistrationBymodeS($aircraft_modes);
 		} else return '';
@@ -11475,12 +11475,12 @@ 
 	}
 
 	/**
-	* Gets the aircraft type from ModeS
-	*
-	* @param String $aircraft_modes the flight ModeS in hex
-	* @return String the aircraft type
-	*
-	*/
+	 * Gets the aircraft type from ModeS
+	 *
+	 * @param String $aircraft_modes the flight ModeS in hex
+	 * @return String the aircraft type
+	 *
+	 */
 	public function getAircraftTypeBymodeS($aircraft_modes,$source_type = '')
 	{
 		$aircraft_modes = filter_var($aircraft_modes,FILTER_SANITIZE_STRING);
@@ -11506,12 +11506,12 @@ 
 	}
 
 	/**
-	* Gets Country from latitude/longitude
-	*
-	* @param Float $latitude latitute of the flight
-	* @param Float $longitude longitute of the flight
-	* @return String the countrie
-	*/
+	 * Gets Country from latitude/longitude
+	 *
+	 * @param Float $latitude latitute of the flight
+	 * @param Float $longitude longitute of the flight
+	 * @return String the countrie
+	 */
 	public function getCountryFromLatitudeLongitude($latitude,$longitude)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -11548,11 +11548,11 @@ 
 	}
 
 	/**
-	* Gets Country from iso2
-	*
-	* @param String $iso2 ISO2 country code
-	* @return String the countrie
-	*/
+	 * Gets Country from iso2
+	 *
+	 * @param String $iso2 ISO2 country code
+	 * @return String the countrie
+	 */
 	public function getCountryFromISO2($iso2)
 	{
 		global $globalDBdriver, $globalDebug;
@@ -11580,12 +11580,12 @@ 
 	}
 
 	/**
-	* converts the registration code using the country prefix
-	*
-	* @param String $registration the aircraft registration
-	* @return String the aircraft registration
-	*
-	*/
+	 * converts the registration code using the country prefix
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the aircraft registration
+	 *
+	 */
 	public function convertAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11637,12 +11637,12 @@ 
 	}
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11661,8 +11661,8 @@ 
 				$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$registration_1 = substr($registration, 0, 1);
+				$registration_2 = substr($registration, 0, 2);
 
 			$country = '';
 			//first get the prefix based on two characters
@@ -11698,12 +11698,12 @@ 
 	}
 
 	/**
-	* Registration prefix from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the registration prefix
-	*
-	*/
+	 * Registration prefix from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the registration prefix
+	 *
+	 */
 	public function registrationPrefixFromAircraftRegistration($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11722,8 +11722,8 @@ 
 				//$country = $row['country'];
 			}
 		} else {
-    			$registration_1 = substr($registration, 0, 1);
-		        $registration_2 = substr($registration, 0, 2);
+				$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, aircraft_registration.country FROM aircraft_registration WHERE registration_prefix = :registration_2 LIMIT 1";
@@ -11759,12 +11759,12 @@ 
 
 
 	/**
-	* Country from the registration code
-	*
-	* @param String $registration the aircraft registration
-	* @return String the country
-	*
-	*/
+	 * Country from the registration code
+	 *
+	 * @param String $registration the aircraft registration
+	 * @return String the country
+	 *
+	 */
 	public function countryFromAircraftRegistrationCode($registration)
 	{
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
@@ -11781,11 +11781,11 @@ 
 	}
 	
 	/**
-	* Set a new highlight value for a flight
-	*
-	* @param String $flightaware_id flightaware_id from spotter_output table
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight
+	 *
+	 * @param String $flightaware_id flightaware_id from spotter_output table
+	 * @param String $highlight New highlight value
+	 */
 	public function setHighlightFlight($flightaware_id,$highlight) {
 		
 		$query  = "UPDATE spotter_output SET highlight = :highlight WHERE flightaware_id = :flightaware_id";
@@ -11794,12 +11794,12 @@ 
 	}
 
 	/**
-	* Set a new highlight value for a flight by Registration
-	*
-	* @param String $registration Registration of the aircraft
-	* @param String $date Date of spotted aircraft
-	* @param String $highlight New highlight value
-	*/
+	 * Set a new highlight value for a flight by Registration
+	 *
+	 * @param String $registration Registration of the aircraft
+	 * @param String $date Date of spotted aircraft
+	 * @param String $highlight New highlight value
+	 */
 	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)";
@@ -11813,12 +11813,12 @@ 
 	}
 	
 	/**
-	* Gets the short url from bit.ly
-	*
-	* @param String $url the full url
-	* @return String the bit.ly url
-	*
-	*/
+	 * Gets the short url from bit.ly
+	 *
+	 * @param String $url the full url
+	 * @return String the bit.ly url
+	 *
+	 */
 	public function getBitlyURL($url)
 	{
 		global $globalBitlyAccessToken;
@@ -12107,11 +12107,11 @@ 
 			$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 {
+				} 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 
 	                      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;";
-    		}
+			}
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		return $sth->fetchAll(PDO::FETCH_ASSOC);

Braces +737 added lines, -258 removed lines

@@ -72,7 +72,9 @@ 
 		if (isset($filter[0]['source'])) {
 			$filters = array_merge($filters,$filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -156,8 +158,11 @@ 
 				$filter_query_where .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		if ($filter_query_where != '') {
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 		}
@@ -180,10 +185,18 @@ 
 		$Image = new Image($this->db);
 		$Schedule = new Schedule($this->db);
 		$ACARS = new ACARS($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
-		if (!isset($globalVAM)) $globalVAM = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
+		if (!isset($globalVATSIM)) {
+			$globalVATSIM = FALSE;
+		}
+		if (!isset($globalphpVMS)) {
+			$globalphpVMS = FALSE;
+		}
+		if (!isset($globalVAM)) {
+			$globalVAM = FALSE;
+		}
 		date_default_timezone_set('UTC');
 		
 		if (!is_string($query))
@@ -230,21 +243,35 @@ 
 			} else {
 				$temp_array['spotter_id'] = '';
 			}
-			if (isset($row['flightaware_id'])) $temp_array['flightaware_id'] = $row['flightaware_id'];
-			if (isset($row['modes'])) $temp_array['modes'] = $row['modes'];
+			if (isset($row['flightaware_id'])) {
+				$temp_array['flightaware_id'] = $row['flightaware_id'];
+			}
+			if (isset($row['modes'])) {
+				$temp_array['modes'] = $row['modes'];
+			}
 			$temp_array['ident'] = $row['ident'];
 			if (isset($row['registration']) && $row['registration'] != '') {
 				$temp_array['registration'] = $row['registration'];
 			} elseif (isset($temp_array['modes'])) {
 				$temp_array['registration'] = $this->getAircraftRegistrationBymodeS($temp_array['modes']);
-			} else $temp_array['registration'] = '';
-			if (isset($row['aircraft_icao'])) $temp_array['aircraft_type'] = $row['aircraft_icao'];
+			} else {
+				$temp_array['registration'] = '';
+			}
+			if (isset($row['aircraft_icao'])) {
+				$temp_array['aircraft_type'] = $row['aircraft_icao'];
+			}
 			
 			$temp_array['departure_airport'] = $row['departure_airport_icao'];
 			$temp_array['arrival_airport'] = $row['arrival_airport_icao'];
-			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) $temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
+			if (isset($row['real_arrival_airport_icao']) && $row['real_arrival_airport_icao'] != NULL) {
+				$temp_array['real_arrival_airport'] = $row['real_arrival_airport_icao'];
+			}
+			if (isset($row['latitude'])) {
+				$temp_array['latitude'] = $row['latitude'];
+			}
+			if (isset($row['longitude'])) {
+				$temp_array['longitude'] = $row['longitude'];
+			}
 			/*
 			if (Connection->tableExists('countries')) {
 				$country_info = $this->getCountryFromLatitudeLongitude($temp_array['latitude'],$temp_array['longitude']);
@@ -254,8 +281,12 @@ 
 				}
 			}
 			*/
-			if (isset($row['waypoints'])) $temp_array['waypoints'] = $row['waypoints'];
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
+			if (isset($row['waypoints'])) {
+				$temp_array['waypoints'] = $row['waypoints'];
+			}
+			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']);
@@ -271,13 +302,19 @@ 
 					}
 				}
 			}
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
+			if (isset($row['altitude'])) {
+				$temp_array['altitude'] = $row['altitude'];
+			}
 			if (isset($row['heading'])) {
 				$temp_array['heading'] = $row['heading'];
 				$heading_direction = $this->parseDirection($row['heading']);
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				if (isset($heading_direction[0]['direction_fullname'])) {
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
+				}
+			}
+			if (isset($row['ground_speed'])) {
+				$temp_array['ground_speed'] = $row['ground_speed'];
 			}
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
 			$temp_array['image'] = "";
 			$temp_array['image_thumbnail'] = "";
 			$temp_array['image_source'] = "";
@@ -285,7 +322,9 @@ 
  
 			if (isset($row['highlight'])) {
 				$temp_array['highlight'] = $row['highlight'];
-			} else $temp_array['highlight'] = '';
+			} else {
+				$temp_array['highlight'] = '';
+			}
 			
 			if (isset($row['date'])) {
 				$dateArray = $this->parseDateString($row['date']);
@@ -341,7 +380,9 @@ 
 				
 					if ($aircraft_array[0]['aircraft_shadow'] != NULL) {
 						$temp_array['aircraft_shadow'] = $aircraft_array[0]['aircraft_shadow'];
-					} else $temp_array['aircraft_shadow'] = 'default.png';
+					} else {
+						$temp_array['aircraft_shadow'] = 'default.png';
+					}
                                 } else {
                             		$temp_array['aircraft_shadow'] = 'default.png';
 					$temp_array['aircraft_name'] = 'N/A';
@@ -349,11 +390,17 @@ 
                             	}
 			}
 			$fromsource = NULL;
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-			elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-			elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
-			elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-			elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+				$fromsource = $globalAirlinesSource;
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
+				$fromsource = 'vatsim';
+			} elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') {
+				$fromsource = 'ivao';
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
+				$fromsource = 'vatsim';
+			} elseif (isset($globalIVAO) && $globalIVAO) {
+				$fromsource = 'ivao';
+			}
 			if (!isset($row['airline_name']) || $row['airline_name'] == '') {
 				if (!is_numeric(substr($row['ident'], 0, 3))) {
 					if (is_numeric(substr($row['ident'], 2, 1))) {
@@ -376,12 +423,18 @@ 
 				}
 			} else {
 				$temp_array['airline_icao'] = $row['airline_icao'];
-				if (isset($row['airline_iata'])) $temp_array['airline_iata'] = $row['airline_iata'];
-				else $temp_array['airline_iata'] = 'N/A';
+				if (isset($row['airline_iata'])) {
+					$temp_array['airline_iata'] = $row['airline_iata'];
+				} else {
+					$temp_array['airline_iata'] = 'N/A';
+				}
 				$temp_array['airline_name'] = $row['airline_name'];
 				$temp_array['airline_country'] = $row['airline_country'];
-				if (isset($row['airline_callsign'])) $temp_array['airline_callsign'] = $row['airline_callsign'];
-				else $temp_array['airline_callsign'] = 'N/A';
+				if (isset($row['airline_callsign'])) {
+					$temp_array['airline_callsign'] = $row['airline_callsign'];
+				} else {
+					$temp_array['airline_callsign'] = 'N/A';
+				}
 				$temp_array['airline_type'] = $row['airline_type'];
 				if ($temp_array['airline_icao'] != '' && $temp_array['airline_iata'] == 'N/A') {
 					$airline_array = $this->getAllAirlineInfo($temp_array['airline_icao']);
@@ -408,7 +461,9 @@ 
 			}
 			if ($temp_array['registration'] != "" && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && !isset($temp_array['aircraft_owner'])) {
 				$owner_info = $this->getAircraftOwnerByRegistration($temp_array['registration']);
-				if ($owner_info['owner'] != '') $temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
+				if ($owner_info['owner'] != '') {
+					$temp_array['aircraft_owner'] = ucwords(strtolower($owner_info['owner']));
+				}
 				$temp_array['aircraft_base'] = $owner_info['base'];
 				$temp_array['aircraft_date_first_reg'] = $owner_info['date_first_reg'];
 			}
@@ -416,10 +471,16 @@ 
 			if($temp_array['registration'] != "" || (($globalIVAO || $globalVATSIM || $globalphpVMS || $globalVAM) && 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']);
-				} elseif (isset($temp_array['aircraft_type'])) $image_array = $Image->getSpotterImage($temp_array['registration'],$temp_array['aircraft_type']);
-				else $image_array = $Image->getSpotterImage($temp_array['registration']);
+					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']);
+					}
+				} elseif (isset($temp_array['aircraft_type'])) {
+					$image_array = $Image->getSpotterImage($temp_array['registration'],$temp_array['aircraft_type']);
+				} else {
+					$image_array = $Image->getSpotterImage($temp_array['registration']);
+				}
 				if (count($image_array) > 0) {
 					$temp_array['image'] = $image_array[0]['image'];
 					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
@@ -471,7 +532,9 @@ 
 			//if ($row['departure_airport_icao'] != '' && $row['departure_airport_name'] == '') {
 			if ($row['departure_airport_icao'] != '') {
 				$departure_airport_array = $this->getAllAirportInfo($row['departure_airport_icao']);
-				if (!isset($departure_airport_array[0]['name'])) $departure_airport_array = $this->getAllAirportInfo('NA');
+				if (!isset($departure_airport_array[0]['name'])) {
+					$departure_airport_array = $this->getAllAirportInfo('NA');
+				}
 			/*
 			} elseif ($row['departure_airport_name'] != '') {
 				$temp_array['departure_airport_name'] = $row['departure_airport_name'];
@@ -479,7 +542,9 @@ 
 				$temp_array['departure_airport_country'] = $row['departure_airport_country'];
 				$temp_array['departure_airport_icao'] = $row['departure_airport_icao'];
 			*/
-			} else $departure_airport_array = $this->getAllAirportInfo('NA');
+			} else {
+				$departure_airport_array = $this->getAllAirportInfo('NA');
+			}
 			if (isset($departure_airport_array[0]['name'])) {
 				$temp_array['departure_airport_name'] = $departure_airport_array[0]['name'];
 				$temp_array['departure_airport_city'] = $departure_airport_array[0]['city'];
@@ -499,8 +564,12 @@ 
 			
 			if ($row['arrival_airport_icao'] != '') {
 				$arrival_airport_array = $this->getAllAirportInfo($row['arrival_airport_icao']);
-				if (count($arrival_airport_array) == 0) $arrival_airport_array = $this->getAllAirportInfo('NA');
-			} else $arrival_airport_array = $this->getAllAirportInfo('NA');
+				if (count($arrival_airport_array) == 0) {
+					$arrival_airport_array = $this->getAllAirportInfo('NA');
+				}
+			} else {
+				$arrival_airport_array = $this->getAllAirportInfo('NA');
+			}
 			if (isset($arrival_airport_array[0]['name'])) {
 				$temp_array['arrival_airport_name'] = $arrival_airport_array[0]['name'];
 				$temp_array['arrival_airport_city'] = $arrival_airport_array[0]['city'];
@@ -516,27 +585,45 @@ 
 				$temp_array['arrival_airport_time'] = $row['arrival_airport_time'];
 			}
 			*/
-			if (isset($row['pilot_id']) && $row['pilot_id'] != '') $temp_array['pilot_id'] = $row['pilot_id'];
-			if (isset($row['pilot_name']) && $row['pilot_name'] != '') $temp_array['pilot_name'] = $row['pilot_name'];
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
+			if (isset($row['pilot_id']) && $row['pilot_id'] != '') {
+				$temp_array['pilot_id'] = $row['pilot_id'];
+			}
+			if (isset($row['pilot_name']) && $row['pilot_name'] != '') {
+				$temp_array['pilot_name'] = $row['pilot_name'];
+			}
+			if (isset($row['source_name']) && $row['source_name'] != '') {
+				$temp_array['source_name'] = $row['source_name'];
+			}
+			if (isset($row['over_country']) && $row['over_country'] != '') {
+				$temp_array['over_country'] = $row['over_country'];
+			}
+			if (isset($row['distance']) && $row['distance'] != '') {
+				$temp_array['distance'] = $row['distance'];
+			}
 			if (isset($row['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);
+					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);
+					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;
 			
 			$spotter_array[] = $temp_array;
 		}
-		if ($num_rows == 0) return array();
+		if ($num_rows == 0) {
+			return array();
+		}
 		$spotter_array[0]['query_number_rows'] = $num_rows;
 		return $spotter_array;
 	}	
@@ -569,7 +656,9 @@ 
 				foreach ($q_array as $q_item){
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
 					$additional_query .= " AND (";
-					if (is_int($q_item)) $additional_query .= "(spotter_output.spotter_id like '%".$q_item."%') OR ";
+					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 ";
 					$additional_query .= "(spotter_output.aircraft_name like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_output.aircraft_manufacturer like '%".$q_item."%') OR ";
@@ -590,7 +679,9 @@ 
 					$additional_query .= "(spotter_output.pilot_name like '%".$q_item."%') OR ";
 					$additional_query .= "(spotter_output.ident like '%".$q_item."%') OR ";
 					$translate = $Translation->ident2icao($q_item);
-					if ($translate != $q_item) $additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
+					if ($translate != $q_item) {
+						$additional_query .= "(spotter_output.ident like '%".$translate."%') OR ";
+					}
 					$additional_query .= "(spotter_output.highlight like '%".$q_item."%')";
 					$additional_query .= ")";
 				}
@@ -817,7 +908,9 @@ 
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
 				$offset = $datetime->format('P');
-			} else $offset = '+00:00';
+			} else {
+				$offset = '+00:00';
+			}
 
 			if ($date_array[1] != "")
 			{
@@ -849,8 +942,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 
 
 		if ($sort != "")
@@ -918,8 +1015,12 @@ 
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-			} else $limit_query = "";
-		} else $limit_query = "";
+			} else {
+				$limit_query = "";
+			}
+		} else {
+			$limit_query = "";
+		}
 		
 		if ($sort != "")
 		{
@@ -1243,7 +1344,9 @@ 
 		global $global_query;
 		
 		date_default_timezone_set('UTC');
-		if ($id == '') return array();
+		if ($id == '') {
+			return array();
+		}
 		$additional_query = "spotter_output.spotter_id = :id";
 		$query_values = array(':id' => $id);
 
@@ -1358,8 +1461,11 @@ 
 		if ($sort != "")
 		{
 			$search_orderby_array = $this->getOrderBy();
-			if (isset($search_orderby_array[$sort]['sql'])) $orderby_query = $search_orderby_array[$sort]['sql'];
-			else $orderby_query = " ORDER BY spotter_output.date DESC";
+			if (isset($search_orderby_array[$sort]['sql'])) {
+				$orderby_query = $search_orderby_array[$sort]['sql'];
+			} else {
+				$orderby_query = " ORDER BY spotter_output.date DESC";
+			}
 		} else {
 			$orderby_query = " ORDER BY spotter_output.date DESC";
 		}
@@ -1984,7 +2090,9 @@ 
 		{
 			$highlight = $row['highlight'];
 		}
-		if (isset($highlight)) return $highlight;
+		if (isset($highlight)) {
+			return $highlight;
+		}
 	}
 
 	
@@ -2012,7 +2120,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['usage'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2037,7 +2147,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['icao'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2065,7 +2177,9 @@ 
 			$airport_longitude = $row['longitude'];
 			$Common = new Common();
 			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 	
 	/**
@@ -2177,7 +2291,9 @@ 
 			$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();
+		} 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'";
 		} else {
@@ -2212,7 +2328,9 @@ 
 			$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();
+		} 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";
@@ -2247,7 +2365,9 @@ 
 	public function getAllAirlineInfo($airline_icao, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
-		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
+		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) {
+			$fromsource = NULL;
+		}
 		$airline_icao = strtoupper(filter_var($airline_icao,FILTER_SANITIZE_STRING));
 		if ($airline_icao == 'NA') {
 			$airline_array = array();
@@ -2316,7 +2436,9 @@ 
 	public function getAllAirlineInfoByName($airline_name, $fromsource = NULL)
 	{
 		global $globalUseRealAirlines;
-		if (isset($globalUseRealAirlines) && $globalUseRealAirlines) $fromsource = NULL;
+		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";
 		$sth = $this->db->prepare($query);
@@ -2332,7 +2454,9 @@ 
 			$sth->execute(array(':fromsource' => $fromsource));
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
-			if ($row['nb'] == 0) $result = $this->getAllAirlineInfoByName($airline_name);
+			if ($row['nb'] == 0) {
+				$result = $this->getAllAirlineInfoByName($airline_name);
+			}
 		}
 		return $result;
 	}
@@ -2395,15 +2519,20 @@ 
 				'A320-211' => 'A320',
 				'747-8i' => 'B748',
 				'A380' => 'A388');
-		if (isset($all_aircraft[$aircraft_type])) return $all_aircraft[$aircraft_type];
+		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";
 		$aircraft_type = strtoupper($aircraft_type);
 		$sth = $this->db->prepare($query);
 		$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 '';
+		if (isset($result[0]['icao'])) {
+			return $result[0]['icao'];
+		} else {
+			return '';
+		}
 	}
 	
 	/**
@@ -2431,11 +2560,15 @@ 
 		$sth->closeCursor();
 		if (isset($row['icaotypecode'])) {
 			$icao = $row['icaotypecode'];
-			if (isset($this->aircraft_correct_icaotype[$icao])) $icao = $this->aircraft_correct_icaotype[$icao];
+			if (isset($this->aircraft_correct_icaotype[$icao])) {
+				$icao = $this->aircraft_correct_icaotype[$icao];
+			}
 			return $icao;
 		} elseif ($source_type == 'flarm') {
 			return $this->getAllAircraftType($aircraft_modes);
-		} else  return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2458,7 +2591,9 @@ 
 		$sth->closeCursor();
 		if (isset($row['icaotypecode'])) {
 			return $row['icaotypecode'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2504,7 +2639,9 @@ 
 		$sth->closeCursor();
 		if (isset($row['operator_correct'])) {
 			return $row['operator_correct'];
-		} else return $operator;
+		} else {
+			return $operator;
+		}
 	}
 
 	/**
@@ -2517,7 +2654,9 @@ 
 	public function getRouteInfo($callsign)
 	{
 		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-                if ($callsign == '') return array();
+                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";
 		
 		$sth = $this->db->prepare($query);
@@ -2527,7 +2666,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	
 	/**
@@ -2580,7 +2721,9 @@ 
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	
   
@@ -2739,8 +2882,11 @@ 
 		$query .= " ORDER BY spotter_output.source_name ASC";
 
 		$sth = $this->db->prepare($query);
-		if (!empty($query_values)) $sth->execute($query_values);
-		else $sth->execute();
+		if (!empty($query_values)) {
+			$sth->execute($query_values);
+		} else {
+			$sth->execute();
+		}
 
 		$source_array = array();
 		$temp_array = array();
@@ -2773,9 +2919,13 @@ 
 								WHERE spotter_output.airline_icao <> '' 
 								ORDER BY spotter_output.airline_name ASC";
 			*/
-			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $forsource = $globalAirlinesSource;
-			elseif (isset($globalVATSIM) && $globalVATSIM) $forsource = 'vatsim';
-			elseif (isset($globalIVAO) && $globalIVAO) $forsource = 'ivao';
+			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+				$forsource = $globalAirlinesSource;
+			} elseif (isset($globalVATSIM) && $globalVATSIM) {
+				$forsource = 'vatsim';
+			} elseif (isset($globalIVAO) && $globalIVAO) {
+				$forsource = 'ivao';
+			}
 			if ($forsource === NULL) {
 				$query = "SELECT DISTINCT icao AS airline_icao, name AS airline_name, type AS airline_type FROM airlines WHERE forsource IS NULL ORDER BY name ASC";
 				$query_data = array();
@@ -2818,9 +2968,13 @@ 
 	{
 		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';
+		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+			$forsource = $globalAirlinesSource;
+		} elseif (isset($globalVATSIM) && $globalVATSIM) {
+			$forsource = 'vatsim';
+		} elseif (isset($globalIVAO) && $globalIVAO) {
+			$forsource = 'ivao';
+		}
 		if ($forsource === NULL) {
 			$query = "SELECT DISTINCT alliance FROM airlines WHERE alliance IS NOT NULL AND forsource IS NULL ORDER BY alliance ASC";
 			$query_data = array();
@@ -3131,7 +3285,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' AND departure_airport_icao <> '' GROUP BY departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC";
@@ -3163,7 +3319,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT spotter_output.airline_icao, COUNT(departure_airport_icao) AS departure_airport_count, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND departure_airport_icao <> 'NA' AND departure_airport_icao <> '' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, departure_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), departure_airport_name, departure_airport_city, departure_airport_country ORDER BY departure_airport_count DESC";
@@ -3196,7 +3354,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -3235,7 +3395,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT spotter_output.airline_icao, COUNT(real_departure_airport_icao) AS departure_airport_count, real_departure_airport_icao AS departure_airport_icao, airport.name AS departure_airport_name, airport.city AS departure_airport_city, airport.country AS departure_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -3280,7 +3442,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output`".$filter_query." spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' AND arrival_airport_icao <> '' GROUP BY arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC";
@@ -3315,7 +3479,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -3357,7 +3523,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT spotter_output.airline_icao, COUNT(arrival_airport_icao) AS arrival_airport_count, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date FROM `spotter_output` WHERE spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 7 DAY) AND arrival_airport_icao <> 'NA' AND arrival_airport_icao <> '' AND spotter_output.airline_icao <> '' GROUP BY spotter_output.airline_icao, arrival_airport_icao, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d'), arrival_airport_name, arrival_airport_city, arrival_airport_country ORDER BY arrival_airport_count DESC";
@@ -3391,7 +3559,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		if ($airport_icao == '') {
 			if ($globalDBdriver == 'mysql') {
 				$query = "SELECT spotter_output.airline_icao, COUNT(real_arrival_airport_icao) AS arrival_airport_count, real_arrival_airport_icao AS arrival_airport_icao, airport.name AS arrival_airport_name, airport.city AS arrival_airport_city, airport.country AS arrival_airport_country, DATE_FORMAT(DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)),'%Y-%m-%d') as date 
@@ -3439,7 +3609,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) as date
@@ -3559,7 +3731,9 @@ 
 	*/	
 	public function updateLatestSpotterData($flightaware_id = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $ground = false, $groundspeed = NULL, $date = '', $arrival_airport_icao = '',$arrival_airport_time = '')
 	{
-		if ($groundspeed == '') $groundspeed = NULL;
+		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);
 
@@ -3609,10 +3783,18 @@ 
 		$Image = new Image($this->db);
 		$Common = new Common();
 		
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
-		if (!isset($globalVATSIM)) $globalVATSIM = FALSE;
-		if (!isset($globalphpVMS)) $globalphpVMS = FALSE;
-		if (!isset($globalVAM)) $globalVAM = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
+		if (!isset($globalVATSIM)) {
+			$globalVATSIM = FALSE;
+		}
+		if (!isset($globalphpVMS)) {
+			$globalphpVMS = FALSE;
+		}
+		if (!isset($globalVAM)) {
+			$globalVAM = FALSE;
+		}
 		date_default_timezone_set('UTC');
 		
 		//getting the registration
@@ -3625,23 +3807,33 @@ 
 				if ($ModeS != '') {
 					$timeelapsed = microtime(true);
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS,$source_type);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				} else {
 					$myhex = explode('-',$flightaware_id);
 					if (count($myhex) > 0) {
 						$timeelapsed = microtime(true);
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0],$source_type);
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						if ($globalDebugTimeElapsed) {
+							echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						}
 					}
 				}
 			}
 		}
 		$fromsource = NULL;
-		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
-		elseif ($format_source == 'vatsimtxt') $fromsource = 'vatsim';
-		elseif ($format_source == 'whazzup') $fromsource = 'ivao';
-		elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-		elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+		if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
+			$fromsource = $globalAirlinesSource;
+		} elseif ($format_source == 'vatsimtxt') {
+			$fromsource = 'vatsim';
+		} elseif ($format_source == 'whazzup') {
+			$fromsource = 'ivao';
+		} elseif (isset($globalVATSIM) && $globalVATSIM) {
+			$fromsource = 'vatsim';
+		} elseif (isset($globalIVAO) && $globalIVAO) {
+			$fromsource = 'ivao';
+		}
 		//getting the airline information
 		if ($ident != "")
 		{
@@ -3665,15 +3857,21 @@ 
 					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();
+		} else {
+			$airline_array = array();
+		}
 		
 		//getting the aircraft information
 		$aircraft_array = array();
@@ -3687,27 +3885,37 @@ 
 				{
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo("NA");
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo(NA) : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				} else {
 					$timeelapsed = microtime(true);
 					$aircraft_array = $this->getAllAircraftInfo($aircraft_icao);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftInfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				}
 			}
 		} else {
 			if ($ModeS != '') {
 				$timeelapsed = microtime(true);
 				$aircraft_icao = $this->getAllAircraftType($ModeS,$source_type);
-				if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAllAircraftType : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				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";
+					}
 				}
 			}
 		}
@@ -3723,7 +3931,9 @@ 
 			} 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";
+				}
 			}
 		}
 		
@@ -3738,7 +3948,9 @@ 
 			} 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";
+				}
 			}
 		}
 
@@ -3772,7 +3984,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		
 		if ($heading != "")
 		{
@@ -3801,7 +4015,9 @@ 
 		{
 			$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";
@@ -3809,14 +4025,21 @@ 
 			}
 			$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 ($owner_info['owner'] != '') $aircraft_owner = ucwords(strtolower($owner_info['owner']));
+			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']));
+			}
 		}
     
 		if (($globalIVAO || $globalVATSIM || $globalphpVMS || $globalVAM) && $aircraft_icao != '')
 		{
-            		if (isset($airline_array[0]['icao'])) $airline_icao = $airline_array[0]['icao'];
-            		else $airline_icao = '';
+            		if (isset($airline_array[0]['icao'])) {
+            			$airline_icao = $airline_array[0]['icao'];
+            		} else {
+            			$airline_icao = '';
+            		}
 			$image_array = $Image->getSpotterImage('',$aircraft_icao,$airline_icao);
 			if (!isset($image_array[0]['registration']))
 			{
@@ -3861,16 +4084,28 @@ 
                 {
                         $arrival_airport_array = $this->getAllAirportInfo('NA');
                 }
-                if ($registration == '') $registration = 'NA';
+                if ($registration == '') {
+                	$registration = 'NA';
+                }
                 if ($latitude == '' && $longitude == '') {
             		$latitude = 0;
             		$longitude = 0;
             	}
-                if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL;
-                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL;
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
-                if (!isset($aircraft_owner)) $aircraft_owner = NULL;
+                if ($squawk == '' || $Common->isInteger($squawk) === false) {
+                	$squawk = NULL;
+                }
+                if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) {
+                	$verticalrate = NULL;
+                }
+                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) 
                 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)";
 
@@ -3881,9 +4116,13 @@ 
 		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 = '';
 		}
-		if ($airline_type == null) $airline_type = '';
                 $aircraft_type = $aircraft_array[0]['type'];
                 $aircraft_manufacturer = $aircraft_array[0]['manufacturer'];
                 $departure_airport_name = $departure_airport_array[0]['name'];
@@ -4047,7 +4286,9 @@ 
 			}
 		}
 		$query .= " GROUP BY spotter_output.airline_name,spotter_output.airline_icao, spotter_output.airline_country ORDER BY airline_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -4120,7 +4361,9 @@ 
 		}
 		
 		$query .= " GROUP BY spotter_output.pilot_id,s.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -4164,7 +4407,9 @@ 
 			}
 		}
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.pilot_id,spotter_output.pilot_name,spotter_output.format_source ORDER BY pilot_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -4240,7 +4485,9 @@ 
 			}
 		}
 		$query .= " GROUP BY spotter_output.owner_name ORDER BY owner_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -4282,7 +4529,9 @@ 
 			}
 		}
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.owner_name ORDER BY owner_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -4527,7 +4776,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.airline_name, spotter_output.airline_icao, spotter_output.airline_country, COUNT(spotter_output.airline_name) AS airline_count
@@ -4575,7 +4826,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.airline_country, COUNT(spotter_output.airline_country) AS airline_country_count
@@ -4695,9 +4948,13 @@ 
 		$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']);
-		elseif ($result[0]['duration'] == '') return 0;
-		else return $result[0]['duration'];
+		if (is_numeric($result[0]['duration'])) {
+			return gmdate('H:i:s',$result[0]['duration']);
+		} elseif ($result[0]['duration'] == '') {
+			return 0;
+		} else {
+			return $result[0]['duration'];
+		}
 	}
 
 	/**
@@ -4786,8 +5043,11 @@ 
 		$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']);
-		else return $result[0]['duration'];
+		if (is_int($result[0]['duration'])) {
+			return gmdate('H:i:s',$result[0]['duration']);
+		} else {
+			return $result[0]['duration'];
+		}
 	}
 
 	/**
@@ -4992,7 +5252,9 @@ 
 		}
 		$query .= " GROUP BY spotter_output.airline_country, countries.iso3
 					ORDER BY airline_country_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -5021,7 +5283,9 @@ 
 		global $globalDBdriver;
 		//$filter_query = $this->getFilter($filters,true,true);
 		$Connection= new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return array();
+		if (!$Connection->tableExists('countries')) {
+			return array();
+		}
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
 					FROM countries c, spotter_output s
@@ -5053,7 +5317,9 @@ 
 		}
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT flightaware_id,over_country FROM spotter_live".$filter_query.") l ON c.iso2 = l.over_country ";
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -5130,7 +5396,9 @@ 
 		}
 
 		$query .= " GROUP BY spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
  
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -5204,7 +5472,9 @@ 
 		}
 
 		$query .= " GROUP BY spotter_output.airline_icao, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
  
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -5251,7 +5521,9 @@ 
 		}
 
 		$query .= "GROUP BY EXTRACT(month from spotter_output.date), EXTRACT(year from spotter_output.date), spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.aircraft_manufacturer ORDER BY aircraft_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
  
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -5304,7 +5576,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 
@@ -5379,7 +5653,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 
@@ -5486,7 +5762,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -5611,7 +5889,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.aircraft_icao) AS aircraft_icao_count, spotter_output.aircraft_name  
@@ -5658,7 +5938,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.aircraft_icao, COUNT(spotter_output.registration) AS registration_count, spotter_output.aircraft_name, spotter_output.registration, spotter_output.airline_name 
@@ -5687,7 +5969,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
  
@@ -5712,7 +5996,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.aircraft_manufacturer, COUNT(spotter_output.aircraft_manufacturer) AS aircraft_manufacturer_count  
@@ -5908,8 +6194,11 @@ 
 			if($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
-				else $temp_array['image_thumbnail'] = '';
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				} else {
+					$temp_array['image_thumbnail'] = '';
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -5983,8 +6272,11 @@ 
 			if($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
-				else $temp_array['image_thumbnail'] = '';
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				} else {
+					$temp_array['image_thumbnail'] = '';
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -6058,8 +6350,11 @@ 
 			if($row['registration'] != "")
 			{
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (isset($image_array[0]['image_thumbnail'])) $temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
-				else $temp_array['image_thumbnail'] = '';
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				} else {
+					$temp_array['image_thumbnail'] = '';
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
 			$aircraft_array[] = $temp_array;
@@ -6270,7 +6565,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
           
@@ -6387,7 +6684,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
 			$temp_array['registration_count'] = $row['registration_count'];
           
@@ -6553,7 +6852,9 @@ 
 			}
 		}
 		$query .= " GROUP BY spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -6572,7 +6873,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
           
 			$aircraft_array[] = $temp_array;
@@ -6613,7 +6916,9 @@ 
 		// if ($olderthanmonths > 0) $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 		//if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.registration, spotter_output.aircraft_icao, spotter_output.aircraft_name, spotter_output.airline_name ORDER BY aircraft_registration_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -6633,7 +6938,9 @@ 
 			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'];
+				if (isset($image_array[0]['image_thumbnail'])) {
+					$temp_array['image_thumbnail'] = $image_array[0]['image_thumbnail'];
+				}
 			}
           
 			$aircraft_array[] = $temp_array;
@@ -6699,7 +7006,9 @@ 
 		}
                 $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country, airport.latitude, airport.longitude
 				ORDER BY airport_departure_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -6751,7 +7060,9 @@ 
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
                 $query .= "GROUP BY spotter_output.airline_icao, 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";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -6829,7 +7140,9 @@ 
 		}
                 $query .= " GROUP BY spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
 				ORDER BY airport_departure_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
     		//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -6883,7 +7196,9 @@ 
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_departure_airport_icao, airport.name, airport.city, airport.country
 				ORDER BY airport_departure_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -7274,7 +7589,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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 
@@ -7324,7 +7641,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.departure_airport_country, COUNT(spotter_output.departure_airport_country) AS airport_departure_country_count 
@@ -7673,7 +7992,9 @@ 
 		}
                 $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, airport.latitude, airport.longitude
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7695,7 +8016,9 @@ 
 			if ($icaoaskey) {
 				$icao = $row['arrival_airport_icao'];
 				$airport_array[$icao] = $temp_array;
-			} else $airport_array[] = $temp_array;
+			} else {
+				$airport_array[] = $temp_array;
+			}
 		}
 
 		return $airport_array;
@@ -7732,7 +8055,9 @@ 
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
                 $query .= "GROUP BY spotter_output.airline_icao,spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country, countries.iso3
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7754,7 +8079,9 @@ 
 			if ($icaoaskey) {
 				$icao = $row['arrival_airport_icao'];
 				$airport_array[$icao] = $temp_array;
-			} else $airport_array[] = $temp_array;
+			} else {
+				$airport_array[] = $temp_array;
+			}
 		}
 
 		return $airport_array;
@@ -7817,7 +8144,9 @@ 
 		}
 		$query .= " GROUP BY spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country, airport.latitude, airport.longitude
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7836,7 +8165,9 @@ 
 			if ($icaoaskey) {
 				$icao = $row['arrival_airport_icao'];
 				$airport_array[$icao] = $temp_array;
-			} else $airport_array[] = $temp_array;
+			} else {
+				$airport_array[] = $temp_array;
+			}
 		}
 
 		return $airport_array;
@@ -7873,7 +8204,9 @@ 
                 //if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
                 $query .= "GROUP BY spotter_output.airline_icao, spotter_output.real_arrival_airport_icao, airport.name, airport.city, airport.country
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7894,7 +8227,9 @@ 
 			if ($icaoaskey) {
 				$icao = $row['arrival_airport_icao'];
 				$airport_array[$icao] = $temp_array;
-			} else $airport_array[] = $temp_array;
+			} else {
+				$airport_array[] = $temp_array;
+			}
 		}
 
 		return $airport_array;
@@ -8272,7 +8607,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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 
@@ -8322,7 +8659,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DISTINCT spotter_output.arrival_airport_country, COUNT(spotter_output.arrival_airport_country) AS airport_arrival_country_count 
@@ -8713,7 +9052,9 @@ 
 		}
 		$query .= " GROUP BY spotter_output.arrival_airport_country, countries.iso3
 					ORDER BY airport_arrival_country_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -9001,7 +9342,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -9257,12 +9600,18 @@ 
 		$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)';
-			else $query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			if ($globalDBdriver == 'mysql') {
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
+			} else {
+				$query .= " AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= " AND spotter_output.date > '".$sincedate."'";
-			else $query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			if ($globalDBdriver == 'mysql') {
+				$query .= " AND spotter_output.date > '".$sincedate."'";
+			} else {
+				$query .= " AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
+			}
 		}
 		$query_values = array();
 		if ($year != '') {
@@ -9293,7 +9642,9 @@ 
 			}
 		}
 		$query .= " GROUP BY spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -9327,15 +9678,23 @@ 
 		$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) ';
-			else $query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
+			if ($globalDBdriver == 'mysql') {
+				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
+			} else {
+				$query .= "AND spotter_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS' ";
+			}
 		}
 		if ($sincedate != '') {
-			if ($globalDBdriver == 'mysql') $query .= "AND spotter_output.date > '".$sincedate."' ";
-			else $query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
+			if ($globalDBdriver == 'mysql') {
+				$query .= "AND spotter_output.date > '".$sincedate."' ";
+			} else {
+				$query .= "AND spotter_output.date > CAST('".$sincedate."' AS TIMESTAMP) ";
+			}
 		}
 		$query .= "GROUP BY spotter_output.airline_icao, spotter_output.ident, spotter_output.airline_name, spotter_output.airline_icao ORDER BY callsign_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
       		
 		$sth = $this->db->prepare($query);
 		$sth->execute();
@@ -9372,7 +9731,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -9421,7 +9782,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -9470,7 +9833,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -9516,7 +9881,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -9564,7 +9931,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT spotter_output.airline_icao, DATE(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
@@ -9612,7 +9981,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(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
@@ -9659,7 +10030,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -9707,7 +10080,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -9752,7 +10127,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 
 		if ($globalDBdriver == 'mysql') {
@@ -9799,7 +10176,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -9845,7 +10224,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 
 		if ($globalDBdriver == 'mysql') {
@@ -9892,7 +10273,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -9939,7 +10322,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT YEAR(CONVERT_TZ(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
@@ -9984,7 +10369,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 
 		if ($globalDBdriver == 'mysql') {
@@ -10032,7 +10419,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -10078,7 +10467,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 
 		if ($globalDBdriver == 'mysql') {
@@ -10126,7 +10517,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT 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
@@ -10173,7 +10566,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 		$filter_query = $this->getFilter($filters,true,true);
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT MONTH(CONVERT_TZ(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
@@ -10222,7 +10617,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -10288,7 +10685,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$orderby_sql = '';
 		if ($orderby == "hour")
@@ -10355,7 +10754,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
 
@@ -10406,7 +10807,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10453,7 +10856,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10500,7 +10905,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10548,7 +10955,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10596,7 +11005,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime($date);
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10644,7 +11055,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10691,7 +11104,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10738,7 +11153,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10788,7 +11205,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -10835,7 +11254,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -11046,8 +11467,11 @@ 
 				$query_values = array_merge($query_values,array(':month' => $month));
 			}
 		}
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		if (empty($query_values)) {
+			$queryi .= $this->getFilter($filters);
+		} else {
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+		}
 		
 		$sth = $this->db->prepare($queryi);
 		$sth->execute($query_values);
@@ -11125,8 +11549,11 @@ 
 				$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);
+                if ($query == '') {
+                	$queryi .= $this->getFilter($filters);
+                } else {
+                	$queryi .= $this->getFilter($filters,true,true).substr($query,4);
+                }
 
 
 		$sth = $this->db->prepare($queryi);
@@ -11149,7 +11576,9 @@ 
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
 			$offset = $datetime->format('P');
-		} else $offset = '+00:00';
+		} else {
+			$offset = '+00:00';
+		}
 
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT HOUR(CONVERT_TZ(spotter_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
@@ -11335,7 +11764,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -11436,7 +11867,9 @@ 
 		if (isset($result->AirlineFlightInfoResult))
 		{
 			$registration = $result->AirlineFlightInfoResult->tailnumber;
-		} else return '';
+		} else {
+			return '';
+		}
 		
 		$registration = $this->convertAircraftRegistration($registration);
 		
@@ -11470,7 +11903,9 @@ 
 		    return $row['registration'];
 		} elseif ($source_type == 'flarm') {
 			return $this->getAircraftRegistrationBymodeS($aircraft_modes);
-		} else return '';
+		} else {
+			return '';
+		}
 	
 	}
 
@@ -11497,11 +11932,16 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-			if ($row['type_flight'] == null) return '';
-			else return $row['type_flight'];
+			if ($row['type_flight'] == null) {
+				return '';
+			} else {
+				return $row['type_flight'];
+			}
 		} elseif ($source_type == 'flarm') {
 			return $this->getAircraftTypeBymodeS($aircraft_modes);
-		} else return '';
+		} else {
+			return '';
+		}
 	
 	}
 
@@ -11519,7 +11959,9 @@ 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			/*
@@ -11539,9 +11981,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -11559,7 +12005,9 @@ 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
 	
 		$Connection = new Connection($this->db);
-		if (!$Connection->tableExists('countries')) return '';
+		if (!$Connection->tableExists('countries')) {
+			return '';
+		}
 	
 		try {
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
@@ -11571,9 +12019,13 @@ 
 			$sth->closeCursor();
 			if (count($row) > 0) {
 				return $row;
-			} else return '';
+			} else {
+				return '';
+			}
 		} catch (PDOException $e) {
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
+			if (isset($globalDebug) && $globalDebug) {
+				echo 'Error : '.$e->getMessage()."\n";
+			}
 			return '';
 		}
 	
@@ -11823,7 +12275,9 @@ 
 	{
 		global $globalBitlyAccessToken;
 		
-		if ($globalBitlyAccessToken == '') return $url;
+		if ($globalBitlyAccessToken == '') {
+			return $url;
+		}
         
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
 		
@@ -11972,7 +12426,9 @@ 
 		
 
 		// routes
-		if ($globalDebug) print "Routes...\n";
+		if ($globalDebug) {
+			print "Routes...\n";
+		}
 		if ($globalDBdriver == 'mysql') {
 			$query = "SELECT spotter_output.spotter_id, routes.FromAirport_ICAO, routes.ToAirport_ICAO FROM spotter_output, routes WHERE spotter_output.ident = routes.CallSign AND ( spotter_output.departure_airport_icao != routes.FromAirport_ICAO OR spotter_output.arrival_airport_icao != routes.ToAirport_ICAO) AND routes.FromAirport_ICAO != '' AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)";
 		} else {
@@ -11991,7 +12447,9 @@ 
 			}
 		}
 		
-		if ($globalDebug) print "Airlines...\n";
+		if ($globalDebug) {
+			print "Airlines...\n";
+		}
 		//airlines
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT spotter_output.spotter_id, spotter_output.ident FROM spotter_output WHERE (spotter_output.airline_name = '' OR spotter_output.airline_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 DAY)";
@@ -12005,10 +12463,15 @@ 
 			if (is_numeric(substr($row['ident'], -1, 1)))
 			{
 				$fromsource = NULL;
-				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
-				elseif (isset($row['format_source']) && $row['format_source'] == 'whazzup') $fromsource = 'ivao';
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
+				if (isset($row['format_source']) && $row['format_source'] == 'vatsimtxt') {
+					$fromsource = 'vatsim';
+				} 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);
 				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";
@@ -12018,13 +12481,17 @@ 
 			}
 		}
 
-		if ($globalDebug) print "Remove Duplicate in aircraft_modes...\n";
+		if ($globalDebug) {
+			print "Remove Duplicate in aircraft_modes...\n";
+		}
 		//duplicate modes
 		$query = "DELETE aircraft_modes FROM aircraft_modes LEFT OUTER JOIN (SELECT max(`AircraftID`) as `AircraftID`,`ModeS` FROM `aircraft_modes` group by ModeS) as KeepRows ON aircraft_modes.AircraftID = KeepRows.AircraftID WHERE KeepRows.AircraftID IS NULL";
 		$sth = $this->db->prepare($query);
 		$sth->execute();
 		
-		if ($globalDebug) print "Aircraft...\n";
+		if ($globalDebug) {
+			print "Aircraft...\n";
+		}
 		//aircraft
 		if ($globalDBdriver == 'mysql') {
 			$query  = "SELECT spotter_output.spotter_id, spotter_output.aircraft_icao, spotter_output.registration FROM spotter_output WHERE (spotter_output.aircraft_name = '' OR spotter_output.aircraft_name = 'Not Available') AND spotter_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
@@ -12067,26 +12534,38 @@ 
 				 if (isset($closestAirports[0])) {
 					if ($row['arrival_airport_icao'] == $closestAirports[0]['icao']) {
 						$airport_icao = $closestAirports[0]['icao'];
-						if ($globalDebug) echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+						if ($globalDebug) {
+							echo "\o/ 1st ---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+						}
 					} elseif (count($closestAirports > 1) && $row['arrival_airport_icao'] != '' && $row['arrival_airport_icao'] != 'NA') {
 						foreach ($closestAirports as $airport) {
 							if ($row['arrival_airport_icao'] == $airport['icao']) {
 								$airport_icao = $airport['icao'];
-								if ($globalDebug) echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+								if ($globalDebug) {
+									echo "\o/ try --++ Find arrival airport. airport_icao : ".$airport_icao."\n";
+								}
 								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))) {
 						$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";
+						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 {
-						if ($globalDebug) echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
+						if ($globalDebug) {
+							echo "----- Can't find arrival airport. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist." - Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.($row['last_altitude']*100)."\n";
+						}
 					}
 				} else {
-					if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+					if ($globalDebug) {
+						echo "----- No Airport near last coord. Latitude : ".$row['last_latitude'].' - Longitude : '.$row['last_longitude'].' - MinDist : '.$globalClosestMinDist."\n";
+					}
 				}
 				if ($row['real_arrival_airport_icao'] != $airport_icao) {
-					if ($globalDebug) echo "Updating airport to ".$airport_icao."...\n";
+					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";
 					$sthu = $this->db->prepare($update_query);
 					$sthu->execute(array(':airport_icao' => $airport_icao,':spotter_id' => $row['spotter_id']));

require/class.APRS.php

Indentation +140 added lines, -140 removed lines

@@ -2,10 +2,10 @@ 
 require_once(dirname(__FILE__).'/settings.php');
 require_once(dirname(__FILE__).'/class.Common.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('!' => 'Police',
+	protected $symbols = array('!' => 'Police',
 	'#' => 'DIGI',
 	'$' => 'Phone',
 	'%' => 'DX Cluster',
@@ -89,13 +89,13 @@ 
 	'y' => 'Yagi At QTH');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -107,8 +107,8 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -122,31 +122,31 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else return false;
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			//if ($element == 'TCPIP*') return false;
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -171,49 +171,49 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,10);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime($matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
-	    $find = true;
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-	    $body_parse = substr($body_parse,8);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$body_parse = substr($body_parse,8);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	//if (strlen($body_parse) > 19) {
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
-	    $find = true;
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		$find = true;
 		// 4658.70N/00707.78Ez
 		//print_r(str_split($body_parse));
 		
@@ -230,7 +230,7 @@ 
 		$lon = intval($lon_deg);
 		if ($lat > 89 || $lon > 179) return false;
 	    
-	    /*
+		/*
 	    $tmp_5b = str_replace('.','',$lat_min);
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
 	        print_r($matches);
@@ -244,9 +244,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -276,89 +276,89 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$body_parse_len = strlen($body_parse);
+			if ($body_parse_len >= 7) {
 			
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-		    	    $course = substr($body_parse,0,3);
-		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
+					$course = substr($body_parse,0,3);
+					$tmp_s = intval($course);
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+					$speed = substr($body_parse,4,3);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            //$result['altitude'] = round($altitude*0.3048);
-		            $result['altitude'] = $altitude;
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					//$result['altitude'] = round($altitude*0.3048);
+					$result['altitude'] = $altitude;
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
+			// DAO
 		    
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
 			    
-			    $dao = $matches[1];
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+				$dao = $matches[1];
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
 				$dao_split = str_split($dao);
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 				else $result['latitude'] += $lat_off;
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 				else $result['longitude'] += $lon_off;
-			    }
+				}
 			    
-		            $body_parse = substr($body_parse,6);
-		    }
+					$body_parse = substr($body_parse,6);
+			}
 		    
-		    if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) {
+			if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) {
 			$result['ident'] = $matches[1];
-		    }
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
 			$result['squawk'] = $matches[1];
-		    }
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
 			$result['aircraft_icao'] = $matches[1];
-		    }
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
 			$result['typeid'] = $matches[1];
-		    }
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+			}
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
 			$result['imo'] = $matches[1];
-		    }
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
 			$result['arrival_date'] = $matches[1];
-		    }
-		    if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) {
+			}
+			if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) {
 			$result['arrival_code'] = $matches[1];
-		    }
-		    // OGN comment
+			}
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
 			$id = $matches[1];
 			//$mode = substr($id,0,2);
 			$address = substr($id,2);
@@ -388,53 +388,53 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
+			// parse weather
+			//$body_parse = substr($body_parse,1);
+			//$body_parse_len = strlen($body_parse);
 
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
-			    $result['wind_dir'] = intval($matches[1]);
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$result['wind_dir'] = intval($matches[1]);
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
 			$result['wind_dir'] = intval($matches[1]);
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
-		    }
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
-		    }
+			}
 		}
 		} else $result['comment'] = trim($body_parse);
 
-	    }
+		}
 	//}
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
 	if ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    public function connect() {
+	public function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -457,32 +457,32 @@ 
 		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
-			    echo 'APRS user verified !'."\n";
-			    $this->connected = true;
-			    return true;
-			    break;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE);
 	}
-    }
+	}
 
-    public function disconnect() {
+	public function disconnect() {
 	socket_close($this->socket);
-    }
+	}
     
-    public function send($data) {
+	public function send($data) {
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) {
 		socket_close($this->socket);
 		$this->connect();
 	}
-    }
+	}
 }
 
 class APRSSpotter extends APRS {

Braces +149 added lines, -57 removed lines

@@ -107,17 +107,23 @@ 
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+	    if ($globalDebug) {
+	    	echo '!!! APRS invalid : '.$input."\n";
+	    }
 	    return false;
 	}
 	
-	if ($debug) echo 'input : '.$input."\n";
+	if ($debug) {
+		echo 'input : '.$input."\n";
+	}
 	/* Save header and body. */
 	$body = substr($input,$splitpos+1,$input_len);
 	$body_len = strlen($body);
 	$header = substr($input,0,$splitpos);
 	//$header_len = strlen($header);
-	if ($debug) echo 'header : '.$header."\n";
+	if ($debug) {
+		echo 'header : '.$header."\n";
+	}
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -131,10 +137,14 @@ 
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
 	    } else {
-		if ($debug) echo 'ident : '.$ident."\n";
+		if ($debug) {
+			echo 'ident : '.$ident."\n";
+		}
 		$result['ident'] = $ident;
 	    }
-	} else return false;
+	} else {
+		return false;
+	}
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
@@ -143,7 +153,9 @@ 
 	        //echo "ok";
 	        //if ($element == 'TCPIP*') return false;
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
-		if ($debug) echo 'element : '.$element."\n";
+		if ($debug) {
+			echo 'element : '.$element."\n";
+		}
 		return false;
 	    }
 	    /*
@@ -156,11 +168,15 @@ 
 	}
 	
 	$type = substr($body,0,1);
-	if ($debug) echo 'type : '.$type."\n";
+	if ($debug) {
+		echo 'type : '.$type."\n";
+	}
 	if ($type == ';') {
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
 			$result['address'] = trim(substr($body,1,9));
-		} else $result['ident'] = trim(substr($body,1,9));
+		} else {
+			$result['ident'] = trim(substr($body,1,9));
+		}
 	} elseif ($type == ',') {
 		// Invalid data or test data
 		return false;
@@ -228,7 +244,9 @@ 
 		//$symbol_table = $matches[4];
 		$lat = intval($lat_deg);
 		$lon = intval($lon_deg);
-		if ($lat > 89 || $lon > 179) return false;
+		if ($lat > 89 || $lon > 179) {
+			return false;
+		}
 	    
 	    /*
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -238,8 +256,12 @@ 
 	    */
 		$latitude = $lat + floatval($lat_min)/60;
 		$longitude = $lon + floatval($lon_min)/60;
-		if ($sind == 'S') $latitude = 0-$latitude;
-		if ($wind == 'W') $longitude = 0-$longitude;
+		if ($sind == 'S') {
+			$latitude = 0-$latitude;
+		}
+		if ($wind == 'W') {
+			$longitude = 0-$longitude;
+		}
 		$result['latitude'] = $latitude;
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
@@ -273,7 +295,9 @@ 
 			$body_parse = substr($body_parse,1);
 			$body_parse_len = strlen($body_parse);
 			$result['symbol_code'] = $symbol_code;
-			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
+			if (isset($this->symbols[$symbol_code])) {
+				$result['symbol'] = $this->symbols[$symbol_code];
+			}
 			if ($symbol_code != '_') {
 			}
 		    //$body_parse = substr($body_parse,1);
@@ -284,7 +308,9 @@ 
 		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
 		    	    $course = substr($body_parse,0,3);
 		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
+		    	    	$result['heading'] = intval($course);
+		    	    }
 		    	    $speed = substr($body_parse,4,3);
 		    	    if ($speed != '...') {
 		    		//$result['speed'] = round($speed*1.852);
@@ -325,10 +351,16 @@ 
 			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
 			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
-				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-				else $result['latitude'] += $lat_off;
-				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-				else $result['longitude'] += $lon_off;
+				if ($result['latitude'] < 0) {
+					$result['latitude'] -= $lat_off;
+				} else {
+					$result['latitude'] += $lat_off;
+				}
+				if ($result['longitude'] < 0) {
+					$result['longitude'] -= $lon_off;
+				} else {
+					$result['longitude'] += $lon_off;
+				}
 			    }
 			    
 		            $body_parse = substr($body_parse,6);
@@ -364,27 +396,48 @@ 
 			$address = substr($id,2);
 			//print_r($matches);
 			$addressType = (intval(substr($id,0,2),16))&3;
-			if ($addressType == 0) $result['addresstype'] = "RANDOM";
-			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
-			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
-			elseif ($addressType == 3) $result['addresstype'] = "OGN";
+			if ($addressType == 0) {
+				$result['addresstype'] = "RANDOM";
+			} elseif ($addressType == 1) {
+				$result['addresstype'] = "ICAO";
+			} elseif ($addressType == 2) {
+				$result['addresstype'] = "FLARM";
+			} elseif ($addressType == 3) {
+				$result['addresstype'] = "OGN";
+			}
 			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
 			$result['aircrafttype_code'] = $aircraftType;
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+			if ($aircraftType == 0) {
+				$result['aircrafttype'] = "UNKNOWN";
+			} elseif ($aircraftType == 1) {
+				$result['aircrafttype'] = "GLIDER";
+			} elseif ($aircraftType == 2) {
+				$result['aircrafttype'] = "TOW_PLANE";
+			} elseif ($aircraftType == 3) {
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+			} elseif ($aircraftType == 4) {
+				$result['aircrafttype'] = "PARACHUTE";
+			} elseif ($aircraftType == 5) {
+				$result['aircrafttype'] = "DROP_PLANE";
+			} elseif ($aircraftType == 6) {
+				$result['aircrafttype'] = "HANG_GLIDER";
+			} elseif ($aircraftType == 7) {
+				$result['aircrafttype'] = "PARA_GLIDER";
+			} elseif ($aircraftType == 8) {
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
+			} elseif ($aircraftType == 9) {
+				$result['aircrafttype'] = "JET_AIRCRAFT";
+			} elseif ($aircraftType == 10) {
+				$result['aircrafttype'] = "UFO";
+			} elseif ($aircraftType == 11) {
+				$result['aircrafttype'] = "BALLOON";
+			} elseif ($aircraftType == 12) {
+				$result['aircrafttype'] = "AIRSHIP";
+			} elseif ($aircraftType == 13) {
+				$result['aircrafttype'] = "UAV";
+			} elseif ($aircraftType == 15) {
+				$result['aircrafttype'] = "STATIC_OBJECT";
+			}
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
@@ -424,13 +477,21 @@ 
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
 		    }
 		}
-		} else $result['comment'] = trim($body_parse);
+		} else {
+			$result['comment'] = trim($body_parse);
+		}
 
 	    }
 	//}
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
-	if ($debug) print_r($result);
+	if (isset($result['latitude'])) {
+		$result['latitude'] = round($result['latitude'],4);
+	}
+	if (isset($result['longitude'])) {
+		$result['longitude'] = round($result['longitude'],4);
+	}
+	if ($debug) {
+		print_r($result);
+	}
 	return $result;
     }
     
@@ -439,12 +500,21 @@ 
 	$aprs_connect = 0;
 	$aprs_keep = 120;
 	$aprs_last_tx = time();
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
-	else $aprs_pass = '-1';
+	if (isset($globalAPRSversion)) {
+		$aprs_version = $globalAPRSversion;
+	} else {
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+	}
+	if (isset($globalServerAPRSssid)) {
+		$aprs_ssid = $globalServerAPRSssid;
+	} else {
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+	}
+	if (isset($globalServerAPRSpass)) {
+		$aprs_pass = $globalServerAPRSpass;
+	} else {
+		$aprs_pass = '-1';
+	}
 	
 	$aprs_filter  = '';
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
@@ -476,7 +546,9 @@ 
     }
     
     public function send($data) {
-	if ($this->connected === false) $this->connect();
+	if ($this->connected === false) {
+		$this->connect();
+	}
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
 	if ($send === FALSE) {
 		socket_close($this->socket);
@@ -498,18 +570,26 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($squawk != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SQ='.$squawk;
 			}
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AI='.$aircraft_icao;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
@@ -527,26 +607,38 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($typeid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'TI='.$typeid;
 			}
 			if ($imo != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'IMO='.$imo;
 			}
 			if ($arrival_date != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AD='.strtotime($arrival_date);
 			}
 			if ($arrival_code != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AC='.$arrival_code;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$altitude = 0;
 			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}