Ysurac / FlightAirMap

require/class.Spotter.php

Braces +731 added lines, -255 removed lines

@@ -69,7 +69,9 @@ 
 				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		foreach($filters as $flt) {
@@ -122,8 +124,11 @@ 
 				$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
 			}
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -143,10 +148,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))
@@ -193,21 +206,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']);
@@ -217,8 +244,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']);
@@ -234,13 +265,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'] = "";
@@ -248,7 +285,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']);
@@ -302,7 +341,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';
@@ -310,11 +351,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))) {
@@ -337,12 +384,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']);
@@ -369,7 +422,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'];
 			}
@@ -377,9 +432,14 @@ 
 			if($temp_array['registration'] != "" || ($globalIVAO && isset($temp_array['aircraft_type']) && $temp_array['aircraft_type'] != ''))
 			{
 				if ($globalIVAO) {
-					if (isset($temp_array['airline_icao']))	$image_array = $Image->getSpotterImage('',$temp_array['aircraft_type'],$temp_array['airline_icao']);
-					else $image_array = $Image->getSpotterImage('',$temp_array['aircraft_type']);
-				} 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']);
+					}
+				} 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'];
@@ -431,7 +491,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'];
@@ -439,7 +501,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'];
@@ -459,8 +523,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'];
@@ -476,27 +544,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;
 	}	
@@ -529,7 +615,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 ";
@@ -550,7 +638,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 .= ")";
 				}
@@ -777,7 +867,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] != "")
 			{
@@ -809,8 +901,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 != "")
@@ -878,8 +974,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 != "")
 		{
@@ -1203,7 +1303,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);
 
@@ -1940,7 +2042,9 @@ 
 		{
 			$highlight = $row['highlight'];
 		}
-		if (isset($highlight)) return $highlight;
+		if (isset($highlight)) {
+			return $highlight;
+		}
 	}
 
 	
@@ -1968,7 +2072,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['usage'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -1993,7 +2099,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row['icao'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2021,7 +2129,9 @@ 
 			$airport_longitude = $row['longitude'];
 			$Common = new Common();
 			return $Common->distance($latitude,$longitude,$airport_latitude,$airport_longitude);
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 	
 	/**
@@ -2133,7 +2243,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 {
@@ -2168,7 +2280,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";
@@ -2203,7 +2317,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();
@@ -2272,7 +2388,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);
@@ -2288,7 +2406,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;
 	}
@@ -2351,15 +2471,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 '';
+		}
 	}
 	
 	/**
@@ -2382,9 +2507,13 @@ 
 		$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;
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2407,7 +2536,9 @@ 
 		$sth->closeCursor();
 		if (isset($row['icaotypecode'])) {
 			return $row['icaotypecode'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -2453,7 +2584,9 @@ 
 		$sth->closeCursor();
 		if (isset($row['operator_correct'])) {
 			return $row['operator_correct'];
-		} else return $operator;
+		} else {
+			return $operator;
+		}
 	}
 
 	/**
@@ -2466,7 +2599,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);
@@ -2476,7 +2611,9 @@ 
 		$sth->closeCursor();
 		if (count($row) > 0) {
 			return $row;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	
 	/**
@@ -2529,7 +2666,9 @@ 
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 			$sth->closeCursor();
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 	
   
@@ -2688,8 +2827,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();
@@ -2722,9 +2864,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();
@@ -2767,9 +2913,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();
@@ -3080,7 +3230,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";
@@ -3112,7 +3264,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";
@@ -3145,7 +3299,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 
@@ -3184,7 +3340,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 
@@ -3229,7 +3387,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";
@@ -3264,7 +3424,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 
@@ -3306,7 +3468,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";
@@ -3340,7 +3504,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 
@@ -3388,7 +3554,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
@@ -3508,7 +3676,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);
 
@@ -3558,10 +3728,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
@@ -3574,23 +3752,33 @@ 
 				if ($ModeS != '') {
 					$timeelapsed = microtime(true);
 					$registration = $this->getAircraftRegistrationBymodeS($ModeS);
-					if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					if ($globalDebugTimeElapsed) {
+						echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					}
 				} else {
 					$myhex = explode('-',$flightaware_id);
 					if (count($myhex) > 0) {
 						$timeelapsed = microtime(true);
 						$registration = $this->getAircraftRegistrationBymodeS($myhex[0]);
-						if ($globalDebugTimeElapsed) echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						if ($globalDebugTimeElapsed) {
+							echo 'ADD SPOTTER DATA : Time elapsed for getAircraftRegistrationBymodes : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+						}
 					}
 				}
 			}
 		}
 		$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 != "")
 		{
@@ -3614,15 +3802,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();
@@ -3636,27 +3830,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);
-				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";
+					}
 				}
 			}
 		}
@@ -3672,7 +3876,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";
+				}
 			}
 		}
 		
@@ -3687,7 +3893,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";
+				}
 			}
 		}
 
@@ -3721,7 +3929,9 @@ 
 			{
 				return false;
 			}
-		} else $altitude = 0;
+		} else {
+			$altitude = 0;
+		}
 		
 		if ($heading != "")
 		{
@@ -3740,17 +3950,21 @@ 
 		}
 
     
-		if ($date == "" || strtotime($date) < time()-20*60))
+		if ($date == "" || strtotime($date) < time()-20*60) {
+			)
 		{
 			$date = date("Y-m-d H:i:s", time());
 		}
+		}
 
 		//getting the aircraft image
 		if (($registration != "" || $registration != 'NA') && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM)
 		{
 			$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";
@@ -3758,14 +3972,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 && $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']))
 			{
@@ -3810,16 +4031,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)";
 
@@ -3830,9 +4063,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'];
@@ -3996,7 +4233,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);
@@ -4069,7 +4308,9 @@ 
 		}
 		
 		$query .= " GROUP BY 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);
@@ -4113,7 +4354,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);
@@ -4189,7 +4432,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);
@@ -4231,7 +4476,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);
@@ -4474,7 +4721,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
@@ -4522,7 +4771,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
@@ -4611,8 +4862,11 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':owner' => $owner));
 		$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'];
+		}
 	}
 
 	/**
@@ -4630,8 +4884,11 @@ 
 		$sth = $this->db->prepare($query);
 		$sth->execute(array(':pilot' => $pilot));
 		$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'];
+		}
 	}
 
 	/**
@@ -4836,7 +5093,9 @@ 
 		}
 		$query .= " GROUP BY spotter_output.airline_country
 					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);
@@ -4864,7 +5123,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
@@ -4896,7 +5157,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);
@@ -4973,7 +5236,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);
@@ -5047,7 +5312,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);
@@ -5094,7 +5361,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();
@@ -5147,7 +5416,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'];
 
@@ -5222,7 +5493,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'];
 
@@ -5329,7 +5602,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;
@@ -5454,7 +5729,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  
@@ -5501,7 +5778,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 
@@ -5530,7 +5809,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'];
  
@@ -5555,7 +5836,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  
@@ -5692,8 +5975,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;
@@ -5736,8 +6022,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;
@@ -5780,8 +6069,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;
@@ -5930,7 +6222,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'];
           
@@ -6047,7 +6341,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'];
           
@@ -6213,7 +6509,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);
@@ -6232,7 +6530,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;
@@ -6273,7 +6573,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();
@@ -6293,7 +6595,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;
@@ -6359,7 +6663,9 @@ 
 		}
                 $query .= " GROUP BY spotter_output.departure_airport_icao, spotter_output.departure_airport_name, spotter_output.departure_airport_city, spotter_output.departure_airport_country
 				ORDER BY airport_departure_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
+		if ($limit) {
+			$query .= " LIMIT 10 OFFSET 0";
+		}
 
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -6410,7 +6716,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();
@@ -6488,7 +6796,9 @@ 
 		}
                 $query .= " GROUP BY 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";
+		}
     		//echo $query;
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_values);
@@ -6540,7 +6850,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();
@@ -6935,7 +7247,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 
@@ -6985,7 +7299,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 
@@ -7334,7 +7650,9 @@ 
 		}
                 $query .= " GROUP BY spotter_output.arrival_airport_icao, spotter_output.arrival_airport_name, spotter_output.arrival_airport_city, spotter_output.arrival_airport_country
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7354,7 +7672,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;
@@ -7391,7 +7711,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
 					ORDER BY airport_arrival_icao_count DESC";
-		if ($limit) $query .= " LIMIT 10";
+		if ($limit) {
+			$query .= " LIMIT 10";
+		}
       
 		
 		$sth = $this->db->prepare($query);
@@ -7412,7 +7734,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;
@@ -7475,7 +7799,9 @@ 
 		}
                 $query .= " GROUP BY 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);
@@ -7494,7 +7820,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;
@@ -7531,7 +7859,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);
@@ -7552,7 +7882,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;
@@ -7933,7 +8265,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 
@@ -7983,7 +8317,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 
@@ -8374,7 +8710,9 @@ 
 		}
 		$query .= " GROUP BY spotter_output.arrival_airport_country
 					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);
@@ -8661,7 +8999,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
@@ -8917,12 +9257,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 != '') {
@@ -8953,7 +9299,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);
@@ -8987,15 +9335,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();
@@ -9032,7 +9388,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
@@ -9081,7 +9439,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
@@ -9130,7 +9490,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
@@ -9176,7 +9538,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
@@ -9224,7 +9588,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
@@ -9272,7 +9638,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
@@ -9319,7 +9687,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
@@ -9367,7 +9737,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
@@ -9412,7 +9784,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') {
@@ -9459,7 +9833,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
@@ -9505,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') {
@@ -9552,7 +9930,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
@@ -9599,7 +9979,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
@@ -9644,7 +10026,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') {
@@ -9692,7 +10076,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
@@ -9738,7 +10124,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') {
@@ -9786,7 +10174,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
@@ -9833,7 +10223,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
@@ -9882,7 +10274,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")
@@ -9948,7 +10342,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")
@@ -10015,7 +10411,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);
 
@@ -10066,7 +10464,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
@@ -10113,7 +10513,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
@@ -10160,7 +10562,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
@@ -10208,7 +10612,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
@@ -10256,7 +10662,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
@@ -10304,7 +10712,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
@@ -10351,7 +10761,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
@@ -10398,7 +10810,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
@@ -10448,7 +10862,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
@@ -10495,7 +10911,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
@@ -10706,8 +11124,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);
+		}
 		
 		//echo $query;
 		$sth = $this->db->prepare($queryi);
@@ -10786,8 +11207,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);
@@ -10810,7 +11234,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
@@ -10996,7 +11422,9 @@ 
 	*/
 	public function parseDirection($direction = 0)
 	{
-		if ($direction == '') $direction = 0;
+		if ($direction == '') {
+			$direction = 0;
+		}
 		$direction_array = array();
 		$temp_array = array();
 
@@ -11097,7 +11525,9 @@ 
 		if (isset($result->AirlineFlightInfoResult))
 		{
 			$registration = $result->AirlineFlightInfoResult->tailnumber;
-		} else return '';
+		} else {
+			return '';
+		}
 		
 		$registration = $this->convertAircraftRegistration($registration);
 		
@@ -11126,7 +11556,9 @@ 
 		if (count($row) > 0) {
 		    //return $row['Registration'];
 		    return $row['registration'];
-		} else return '';
+		} else {
+			return '';
+		}
 	
 	}
 
@@ -11149,9 +11581,14 @@ 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (count($row) > 0) {
-		    if ($row['type_flight'] == null) return '';
-		    else return $row['type_flight'];
-		} else return '';
+		    if ($row['type_flight'] == null) {
+		    	return '';
+		    } else {
+		    	return $row['type_flight'];
+		    }
+		} else {
+			return '';
+		}
 	
 	}
 
@@ -11169,7 +11606,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 {
 			/*
@@ -11189,9 +11628,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 '';
 		}
 	
@@ -11209,7 +11652,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";
@@ -11221,9 +11666,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 '';
 		}
 	
@@ -11473,7 +11922,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;
 		
@@ -11622,7 +12073,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 {
@@ -11641,7 +12094,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)";
@@ -11655,10 +12110,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";
@@ -11668,13 +12128,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)";
@@ -11717,26 +12181,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']));