Inspection of "Fix" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 50fd5f...ef9e9e )

by Yannick

created 2017-10-19 15:11 UTC

Status

Spacing +116 added lines, -116 removed lines patch added patch discarded remove patch

@@ -14,75 +14,75 @@  discard block
 block discarded – undo
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '' && $flt['airlines'][0] != 'all') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 					} else {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
+						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id";
 					}
 				}
 			}
 			if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if (isset($flt['registrations']) && !empty($flt['registrations'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 			if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
+					$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id";
 				}
 			}
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
 			if ($filter['airlines'][0] != '' && $filter['airlines'][0] != 'all') {
-				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
+				$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id";
 			}
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id ";
 		}
 		if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) {
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			if (count($filter['source']) == 1) {
 				$filter_query_where .= " AND format_source = '".$filter['source'][0]."'";
 			} else {
-				$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+				$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 			}
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
 			$filter_query_where .= " AND flightaware_id = '".$filter['id']."'";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
 			$filter_query_date = '';
@@ -117,41 +117,41 @@  discard block
 block discarded – undo
 					$filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
+			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
 
 	// Spotter_archive
-	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') {
+	public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Spotter.php');
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
-			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+		if ($airline_type === NULL) $airline_type = '';
 
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
 
 		// Route is not added in spotter_archive
-		$query  = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude)
+		$query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude)
 		          VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)";
 
-		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude);
+		$query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-		$query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+		$query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident));
 
 		return $spotter_array;
 	}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		//$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
 		//$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-		$query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
+		$query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 		/*
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
 		}
 		$spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
 		*/
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id));
 
 		return $spotter_array;
 	}
@@ -217,14 +217,14 @@  discard block
 block discarded – undo
 	public function getAllArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+		$query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -242,11 +242,11 @@  discard block
 block discarded – undo
 	public function getCoordArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC";
+		$query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER by spotter_archive.date ASC";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -266,12 +266,12 @@  discard block
 block discarded – undo
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -291,12 +291,12 @@  discard block
 block discarded – undo
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
 	public function getAltitudeSpeedArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.real_altitude,spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -335,12 +335,12 @@  discard block
 block discarded – undo
 	public function getLastAltitudeArchiveSpotterDataByIdent($ident) {
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
+		$query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident";
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -356,11 +356,11 @@  discard block
 block discarded – undo
 	 * @return Array the spotter information
 	 *
 	 */
-	public function getSpotterArchiveData($ident,$flightaware_id,$date) {
+	public function getSpotterArchiveData($ident, $flightaware_id, $date) {
 		$Spotter = new Spotter($this->db);
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%'));
+		$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate";
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%'));
 		return $spotter_array;
 	}
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -386,34 +386,34 @@  discard block
 block discarded – undo
 	    * @return Array the spotter information
 	    *
 	    */
-	public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) {
+	public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		// Use spotter_output also ?
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 		//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
+			$query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
 			          FROM spotter_archive
 			          INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".'
 			          '.$filter_query.' ORDER BY flightaware_id';
 		} else {
-			$query  = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
+			$query = 'SELECT spotter_archive.flightaware_id, spotter_archive.date, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category
 			          FROM spotter_archive
 			          INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 			          WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".'
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -438,23 +438,23 @@  discard block
 block discarded – undo
 	    * @return Array the spotter information
 	    *
 	    */
-	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
+	public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		// Should use spotter_output also ?
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 		//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
 				    FROM spotter_archive
 				    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk
+			$query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk
 			          FROM spotter_archive_output
 			          LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao
 			          WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".')
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
 			 	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
 			 	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
 			 */
-			$query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
+			$query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
 			          FROM spotter_archive_output
 			          INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
 			          WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -506,22 +506,22 @@  discard block
 block discarded – undo
 	   * @return Array the spotter information
 	   *
 	   */
-	public function getLiveSpotterCount($begindate,$enddate,$filter = array()) {
+	public function getLiveSpotterCount($begindate, $enddate, $filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
 		$filter_query = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+			$filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
 		}
 		if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
 			$filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 
 		//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
 	* @return Array the spotter information
 	*
 	*/
-	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) {
+	public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) {
 		global $globalTimezone, $globalDBdriver;
 		require_once(dirname(__FILE__).'/class.Translation.php');
 		$Translation = new Translation($this->db);
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($registration != "") {
-			$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+			$registration = filter_var($registration, FILTER_SANITIZE_STRING);
 			if (!is_string($registration)) {
 				return array();
 			} else {
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($aircraft_icao != "") {
-			$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+			$aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_icao)) {
 				return array();
 			} else {
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($aircraft_manufacturer != "") {
-			$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+			$aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 			if (!is_string($aircraft_manufacturer)) {
 				return array();
 			} else {
@@ -641,7 +641,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($airline_icao != "") {
-			$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+			$airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_icao)) {
 				return array();
 			} else {
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($airline_country != "") {
-			$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+			$airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_country)) {
 				return array();
 			} else {
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($airline_type != "") {
-			$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+			$airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 			if (!is_string($airline_type)) {
 				return array();
 			} else {
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($airport != "") {
-			$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+			$airport = filter_var($airport, FILTER_SANITIZE_STRING);
 			if (!is_string($airport)) {
 				return array();
 			} else {
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($airport_country != "") {
-			$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+			$airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 			if (!is_string($airport_country)) {
 				return array();
 			} else {
@@ -694,14 +694,14 @@  discard block
 block discarded – undo
 		}
 
 		if ($callsign != "") {
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 			if (!is_string($callsign)) {
 				return array();
 			} else {
 				$translate = $Translation->ident2icao($callsign);
 				if ($translate != $callsign) {
 					$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
-					$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+					$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 				} else {
 					$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
 				}
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($owner != "") {
-			$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+			$owner = filter_var($owner, FILTER_SANITIZE_STRING);
 			if (!is_string($owner)) {
 				return array();
 			} else {
@@ -718,7 +718,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($pilot_name != "") {
-			$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+			$pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 			if (!is_string($pilot_name)) {
 				return array();
 			} else {
@@ -727,7 +727,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($pilot_id != "") {
-			$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+			$pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 			if (!is_string($pilot_id)) {
 				return array();
 			} else {
@@ -736,7 +736,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($departure_airport_route != "") {
-			$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+			$departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($departure_airport_route)) {
 				return array();
 			} else {
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($arrival_airport_route != "") {
-			$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+			$arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 			if (!is_string($arrival_airport_route)) {
 				return array();
 			} else {
@@ -756,8 +756,8 @@  discard block
 block discarded – undo
 		if ($altitude != "") {
 			$altitude_array = explode(",", $altitude);
 
-			$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 
 
 			if ($altitude_array[1] != "") {
@@ -772,8 +772,8 @@  discard block
 block discarded – undo
 
 		if ($date_posted != "") {
 			$date_array = explode(",", $date_posted);
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 			if ($globalTimezone != '') {
 				date_default_timezone_set($globalTimezone);
 				$datetime = new DateTime();
@@ -798,16 +798,16 @@  discard block
 block discarded – undo
 		}
 		if ($limit != "") {
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0) {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.','');
-			$query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
+			$dist = number_format($dist*0.621371, 2, '.', '');
+			$query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance
 			       FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
 			       AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 		} else {
@@ -821,12 +821,12 @@  discard block
 block discarded – undo
 				$additional_query .= " AND (spotter_archive_output.waypoints <> '')";
 			}
 
-			$query  = "SELECT spotter_archive_output.* FROM spotter_archive_output
+			$query = "SELECT spotter_archive_output.* FROM spotter_archive_output
 			          WHERE spotter_archive_output.ident <> ''
 			          ".$additional_query."
 			          ".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
+		$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 		return $spotter_array;
 	}
 
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 	}
@@ -874,8 +874,8 @@  discard block
 block discarded – undo
 		if ($limit != "") {
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0) {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -913,7 +913,7 @@  discard block
 block discarded – undo
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if ($owner != "") {
 			if (!is_string($owner)) {
@@ -927,8 +927,8 @@  discard block
 block discarded – undo
 		if ($limit != "") {
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0) {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if ($pilot != "") {
 			$additional_query = " AND (spotter_archive_output.pilot_id = :pilot OR spotter_archive_output.pilot_name = :pilot)";
@@ -975,8 +975,8 @@  discard block
 block discarded – undo
 		if ($limit != "") {
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0) {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -1004,7 +1004,7 @@  discard block
 block discarded – undo
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1032,7 +1032,7 @@  discard block
 block discarded – undo
 		$flight_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$temp_array['flight_count'] = $row['nb'];
 			$temp_array['flight_country'] = $row['name'];
 			$temp_array['flight_country_iso3'] = $row['iso3'];
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
 	* @return Array the airline country list
 	*
 	*/
-	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') {
+	public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') {
 		global $globalDBdriver;
 		/*
 		$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
 		$flight_array = array();
 		$temp_array = array();
 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$temp_array['airline_icao'] = $row['airline_icao'];
 			$temp_array['flight_count'] = $row['nb'];
 			$temp_array['flight_country'] = $row['name'];
@@ -1093,13 +1093,13 @@  discard block
 block discarded – undo
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateArchiveSpotterDataById($id,$date) {
+	public function getDateArchiveSpotterDataById($id, $date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-		$date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
+		$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+		$date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 		return $spotter_array;
 	}
 
@@ -1109,13 +1109,13 @@  discard block
 block discarded – undo
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateArchiveSpotterDataByIdent($ident,$date) {
+	public function getDateArchiveSpotterDataByIdent($ident, $date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-		$date = date('c',$date);
-		$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+		$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+		$date = date('c', $date);
+		$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 		return $spotter_array;
 	}
 
@@ -1125,14 +1125,14 @@  discard block
 block discarded – undo
 	* @return Array the spotter information
 	*
 	*/
-	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) {
+	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) {
 		global $global_query;
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
 		$query_values = array();
 		$limit_query = '';
 		$additional_query = '';
-		$filter_query = $this->getFilter($filters,true,true);
+		$filter_query = $this->getFilter($filters, true, true);
 
 		if ($airport != "") {
 			if (!is_string($airport)) {
@@ -1146,8 +1146,8 @@  discard block
 block discarded – undo
 		if ($limit != "") {
 			$limit_array = explode(",", $limit);
 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0) {
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];

Please login to merge, or discard this patch.

live-czml.php 1 patch

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch

@@ -59,11 +59,11 @@  discard block
 block discarded – undo
     $s3 = sin($bank/2);
     $c1c2 = $c1*$c2;
     $s1s2 = $s1*$s2;
-    $w =$c1c2*$c3 - $s1s2*$s3;
-    $x =$c1c2*$s3 + $s1s2*$c3;
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
+    $w = $c1c2*$c3 - $s1s2*$s3;
+    $x = $c1c2*$s3 + $s1s2*$c3;
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
 
 }
@@ -84,17 +84,17 @@  discard block
 block discarded – undo
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
 /*
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -141,12 +141,12 @@  discard block
 block discarded – undo
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
 	$from_archive = true;
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
@@ -156,55 +156,55 @@  discard block
 block discarded – undo
 	$begindate = $_COOKIE['archive_begin'];
 	$enddate = $_COOKIE['archive_end'];
 
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
-	$begindate = date('Y-m-d H:i:s',$begindate);
-	$enddate = date('Y-m-d H:i:s',$enddate);
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
+	$begindate = date('Y-m-d H:i:s', $begindate);
+	$enddate = date('Y-m-d H:i:s', $enddate);
 	//echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
 } elseif ($tracker) {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
-	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true);
+	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, true);
 } elseif ($marine) {
 	$coord = array();
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
-	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,true);
+	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, true);
 } else {
 	$coord = array();
 	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
-		$coord = explode(',',$_GET['coord']);
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT) 
+		$coord = explode(',', $_GET['coord']);
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT) 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
 			$coord = array();
 		}
 	}
 	$previous_filter = $filter;
 	if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) {
-		$filter = array_merge($filter,array('id' => $_COOKIE['MapTrack']));
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
+		$filter = array_merge($filter, array('id' => $_COOKIE['MapTrack']));
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
 	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && !empty($coord)) {
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true,$_COOKIE['MapTrack']);
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true, $_COOKIE['MapTrack']);
 	} else {
-		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
+		$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
 	}
 	$filter = $previous_filter;
 }
 //print_r($spotter_array);
 if (!empty($spotter_array) && isset($coord)) {
 	if (isset($_GET['archive'])) {
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
 	} elseif ($tracker) {
 		$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
 	} elseif ($marine) {
@@ -215,17 +215,17 @@  discard block
 block discarded – undo
 	if ($flightcnt == '') $flightcnt = 0;
 } else $flightcnt = 0;
 
-$sqltime = round(microtime(true)-$begintime,2);
+$sqltime = round(microtime(true) - $begintime, 2);
 $minitime = time();
 $minitracktime_begin = time();
 $minitracktime = $minitracktime_begin;
 $maxitime = 0;
-$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT);
+$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT);
 $modelsdb = array();
 if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$modelsdb[$model] = $row[1];
 			}
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
 }
 $modelsdb2 = array();
 if (file_exists(dirname(__FILE__).'/models/gltf2/modelsdb')) {
-	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb','r')) !== FALSE) {
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
-			if (isset($row[1]) ){
+	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb', 'r')) !== FALSE) {
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
+			if (isset($row[1])) {
 				$model = $row[0];
 				$glb = $row[1];
 				if (isset($row[2])) {
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
 if (!empty($spotter_array) && is_array($spotter_array))
 {
 	$nblatlong = 0;
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		$j++;
 		//if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
@@ -323,9 +323,9 @@  discard block
 block discarded – undo
 			$output .= '"lastupdate": "'.$lastupdate.'",';
 			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
 			if ($tracker) {
-				$output.= '"type": "tracker"';
+				$output .= '"type": "tracker"';
 			} elseif ($marine) {
-				$output.= '"type": "marine"';
+				$output .= '"type": "marine"';
 			} else {
 				if ($one3dmodel === false && isset($globalMap3DLiveries) && $globalMap3DLiveries) {
 					$aircraft_icao = $spotter_item['aircraft_icao'];
@@ -339,14 +339,14 @@  discard block
 block discarded – undo
 						if (isset($airline_icao)) {
 							$imagefile = $aircraft_icao.'-'.$airline_icao.'.png';
 							if (file_exists(dirname(__FILE__).'/models/gltf2/liveries/'.$imagefile)) {
-								$output.= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
+								$output .= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
 							}
 						}
 					}
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
+					if ($ident != '') $output .= '"ident": "'.$ident.'",';
 				}
-				$output.= '"gltf2": %gltf2%,';
-				$output.= '"type": "flight"';
+				$output .= '"gltf2": %gltf2%,';
+				$output .= '"type": "flight"';
 			}
 			$output .= '},';
 
@@ -717,8 +717,8 @@  discard block
 block discarded – undo
 					$output .= '},';
 				}
 			}
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
-			else $output = str_replace('%onground%','false',$output);
+			if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output);
+			else $output = str_replace('%onground%', 'false', $output);
 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
 			//$output .= '"heightReference": "'.$heightrelative.'",';
@@ -734,7 +734,7 @@  discard block
 block discarded – undo
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
 			if (isset($_COOKIE['MapTrack']) && $id == $_COOKIE['MapTrack'] && $minitracktime > strtotime($spotter_item['date'])) $minitracktime = strtotime($spotter_item['date']);
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
 			$output .= $spotter_item['longitude'].', ';
 			$output .= $spotter_item['latitude'];
 			$prevlong = $spotter_item['longitude'];
@@ -762,8 +762,8 @@  discard block
 block discarded – undo
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 		} else {
-			$nblatlong = $nblatlong+1;
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
+			$nblatlong = $nblatlong + 1;
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
 			if ($spotter_item['ground_speed'] == 0) {
 				$output .= $prevlong.', ';
@@ -803,21 +803,21 @@  discard block
 block discarded – undo
 }
 $output .= ']';
 if (isset($globalArchive) && $globalArchive === TRUE) {
-	if ((time()-$globalLiveInterval) > $minitime) {
-		if (time()-$globalLiveInterval > $maxitime) {
-			$output = str_replace('%minitime%',date("c",$maxitime),$output);
+	if ((time() - $globalLiveInterval) > $minitime) {
+		if (time() - $globalLiveInterval > $maxitime) {
+			$output = str_replace('%minitime%', date("c", $maxitime), $output);
 		} else {
-			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
+			$output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
 		}
 	}
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
+	else $output = str_replace('%minitime%', date("c", $minitime), $output);
 } elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && $minitracktime != $minitracktime_begin) {
-	$output = str_replace('%minitime%',date("c",$minitracktime),$output);
+	$output = str_replace('%minitime%', date("c", $minitracktime), $output);
 } else {
-	$output = str_replace('%minitime%',date("c",$minitime),$output);
+	$output = str_replace('%minitime%', date("c", $minitime), $output);
 }
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
-else $output = str_replace('%gltf2%','false',$output);
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
+if ($gltf2) $output = str_replace('%gltf2%', 'true', $output);
+else $output = str_replace('%gltf2%', 'false', $output);
 print $output;
 ?>

Please login to merge, or discard this patch.

		@@ -59,11 +59,11 @@ discard block
		block discarded – undo
59	59	$s3 = sin($bank/2);
60	60	$c1c2 = $c1*$c2;
61	61	$s1s2 = $s1*$s2;
62		- $w =$c1c2$c3 - $s1s2$s3;
63		- $x =$c1c2$s3 + $s1s2$c3;
64		- $y =$s1$c2$c3 + $c1$s2$s3;
65		- $z =$c1$s2$c3 - $s1$c2$s3;
66		- return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
	62	+ $w = $c1c2$c3 - $s1s2$s3;
	63	+ $x = $c1c2$s3 + $s1s2$c3;
	64	+ $y = $s1$c2$c3 + $c1$s2$s3;
	65	+ $z = $c1$s2$c3 - $s1$c2$s3;
	66	+ return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
67	67	// return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
68	68
69	69	}
		@@ -84,17 +84,17 @@ discard block
		block discarded – undo
84	84	$min = false;
85	85	$allhistory = false;
86	86	$filter['source'] = array();
87		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
88		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
89		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
90		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
91		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
92		-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
93		-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
94		-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
95		-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
96		-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
97		-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
	87	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
	88	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
	89	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
	90	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
	91	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
	92	+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
	93	+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
	94	+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
	95	+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
	96	+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
	97	+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
98	98	/*
99	99	if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
100	100	$min = true;
		@@ -141,12 +141,12 @@ discard block
		block discarded – undo
141	141	$from_archive = true;
142	142	// $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
143	143	// $enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
144		- $begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
145		- $enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
146		- $archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
147		- $begindate = date('Y-m-d H:i:s',$begindate);
148		- $enddate = date('Y-m-d H:i:s',$enddate);
149		- $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
	144	+ $begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
	145	+ $enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
	146	+ $archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
	147	+ $begindate = date('Y-m-d H:i:s', $begindate);
	148	+ $enddate = date('Y-m-d H:i:s', $enddate);
	149	+ $spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
150	150	} elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
151	151	$from_archive = true;
152	152	// $begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
		@@ -156,55 +156,55 @@ discard block
		block discarded – undo
156	156	$begindate = $_COOKIE['archive_begin'];
157	157	$enddate = $_COOKIE['archive_end'];
158	158
159		- $archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
160		- $begindate = date('Y-m-d H:i:s',$begindate);
161		- $enddate = date('Y-m-d H:i:s',$enddate);
	159	+ $archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
	160	+ $begindate = date('Y-m-d H:i:s', $begindate);
	161	+ $enddate = date('Y-m-d H:i:s', $enddate);
162	162	//echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
163		- $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
	163	+ $spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
164	164	} elseif ($tracker) {
165	165	$coord = array();
166	166	if (isset($_GET['coord']) && $_GET['coord'] != '') {
167		- $coord = explode(',',$_GET['coord']);
168		- if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
	167	+ $coord = explode(',', $_GET['coord']);
	168	+ if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
169	169	&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
170	170	$coord = array();
171	171	}
172	172	}
173		- $spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true);
	173	+ $spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, true);
174	174	} elseif ($marine) {
175	175	$coord = array();
176	176	if (isset($_GET['coord']) && $_GET['coord'] != '') {
177		- $coord = explode(',',$_GET['coord']);
178		- if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
	177	+ $coord = explode(',', $_GET['coord']);
	178	+ if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
179	179	&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
180	180	$coord = array();
181	181	}
182	182	}
183		- $spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,true);
	183	+ $spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, true);
184	184	} else {
185	185	$coord = array();
186	186	if (!((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) && isset($_GET['coord']) && $_GET['coord'] != '') {
187		- $coord = explode(',',$_GET['coord']);
188		- if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
	187	+ $coord = explode(',', $_GET['coord']);
	188	+ if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
189	189	&& $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
190	190	$coord = array();
191	191	}
192	192	}
193	193	$previous_filter = $filter;
194	194	if ((isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') && (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '')) {
195		- $filter = array_merge($filter,array('id' => $_COOKIE['MapTrack']));
196		- $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
	195	+ $filter = array_merge($filter, array('id' => $_COOKIE['MapTrack']));
	196	+ $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
197	197	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && !empty($coord)) {
198		- $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true,$_COOKIE['MapTrack']);
	198	+ $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true, $_COOKIE['MapTrack']);
199	199	} else {
200		- $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
	200	+ $spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
201	201	}
202	202	$filter = $previous_filter;
203	203	}
204	204	//print_r($spotter_array);
205	205	if (!empty($spotter_array) && isset($coord)) {
206	206	if (isset($_GET['archive'])) {
207		- $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
	207	+ $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
208	208	} elseif ($tracker) {
209	209	$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
210	210	} elseif ($marine) {
		@@ -215,17 +215,17 @@ discard block
		block discarded – undo
215	215	if ($flightcnt == '') $flightcnt = 0;
216	216	} else $flightcnt = 0;
217	217
218		-$sqltime = round(microtime(true)-$begintime,2);
	218	+$sqltime = round(microtime(true) - $begintime, 2);
219	219	$minitime = time();
220	220	$minitracktime_begin = time();
221	221	$minitracktime = $minitracktime_begin;
222	222	$maxitime = 0;
223		-$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT);
	223	+$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT);
224	224	$modelsdb = array();
225	225	if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
226		- if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
227		- while (($row = fgetcsv($handle,1000)) !== FALSE) {
228		- if (isset($row[1]) ){
	226	+ if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
	227	+ while (($row = fgetcsv($handle, 1000)) !== FALSE) {
	228	+ if (isset($row[1])) {
229	229	$model = $row[0];
230	230	$modelsdb[$model] = $row[1];
231	231	}
		@@ -235,9 +235,9 @@ discard block
		block discarded – undo
235	235	}
236	236	$modelsdb2 = array();
237	237	if (file_exists(dirname(__FILE__).'/models/gltf2/modelsdb')) {
238		- if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb','r')) !== FALSE) {
239		- while (($row = fgetcsv($handle,1000)) !== FALSE) {
240		- if (isset($row[1]) ){
	238	+ if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb', 'r')) !== FALSE) {
	239	+ while (($row = fgetcsv($handle, 1000)) !== FALSE) {
	240	+ if (isset($row[1])) {
241	241	$model = $row[0];
242	242	$glb = $row[1];
243	243	if (isset($row[2])) {
		@@ -281,7 +281,7 @@ discard block
		block discarded – undo
281	281	if (!empty($spotter_array) && is_array($spotter_array))
282	282	{
283	283	$nblatlong = 0;
284		- foreach($spotter_array as $spotter_item)
	284	+ foreach ($spotter_array as $spotter_item)
285	285	{
286	286	$j++;
287	287	//if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
		@@ -323,9 +323,9 @@ discard block
		block discarded – undo
323	323	$output .= '"lastupdate": "'.$lastupdate.'",';
324	324	if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
325	325	if ($tracker) {
326		- $output.= '"type": "tracker"';
	326	+ $output .= '"type": "tracker"';
327	327	} elseif ($marine) {
328		- $output.= '"type": "marine"';
	328	+ $output .= '"type": "marine"';
329	329	} else {
330	330	if ($one3dmodel === false && isset($globalMap3DLiveries) && $globalMap3DLiveries) {
331	331	$aircraft_icao = $spotter_item['aircraft_icao'];
		@@ -339,14 +339,14 @@ discard block
		block discarded – undo
339	339	if (isset($airline_icao)) {
340	340	$imagefile = $aircraft_icao.'-'.$airline_icao.'.png';
341	341	if (file_exists(dirname(__FILE__).'/models/gltf2/liveries/'.$imagefile)) {
342		- $output.= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
	342	+ $output .= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
343	343	}
344	344	}
345	345	}
346		- if ($ident != '') $output.= '"ident": "'.$ident.'",';
	346	+ if ($ident != '') $output .= '"ident": "'.$ident.'",';
347	347	}
348		- $output.= '"gltf2": %gltf2%,';
349		- $output.= '"type": "flight"';
	348	+ $output .= '"gltf2": %gltf2%,';
	349	+ $output .= '"type": "flight"';
350	350	}
351	351	$output .= '},';
352	352
		@@ -717,8 +717,8 @@ discard block
		block discarded – undo
717	717	$output .= '},';
718	718	}
719	719	}
720		- if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
721		- else $output = str_replace('%onground%','false',$output);
	720	+ if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output);
	721	+ else $output = str_replace('%onground%', 'false', $output);
722	722
723	723	// $output .= '"heightReference": "CLAMP_TO_GROUND",';
724	724	//$output .= '"heightReference": "'.$heightrelative.'",';
		@@ -734,7 +734,7 @@ discard block
		block discarded – undo
734	734	if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
735	735	if (isset($_COOKIE['MapTrack']) && $id == $_COOKIE['MapTrack'] && $minitracktime > strtotime($spotter_item['date'])) $minitracktime = strtotime($spotter_item['date']);
736	736	if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
737		- $output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
	737	+ $output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
738	738	$output .= $spotter_item['longitude'].', ';
739	739	$output .= $spotter_item['latitude'];
740	740	$prevlong = $spotter_item['longitude'];
		@@ -762,8 +762,8 @@ discard block
		block discarded – undo
762	762	//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
763	763	//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
764	764	} else {
765		- $nblatlong = $nblatlong+1;
766		- $output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
	765	+ $nblatlong = $nblatlong + 1;
	766	+ $output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
767	767	if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
768	768	if ($spotter_item['ground_speed'] == 0) {
769	769	$output .= $prevlong.', ';
		@@ -803,21 +803,21 @@ discard block
		block discarded – undo
803	803	}
804	804	$output .= ']';
805	805	if (isset($globalArchive) && $globalArchive === TRUE) {
806		- if ((time()-$globalLiveInterval) > $minitime) {
807		- if (time()-$globalLiveInterval > $maxitime) {
808		- $output = str_replace('%minitime%',date("c",$maxitime),$output);
	806	+ if ((time() - $globalLiveInterval) > $minitime) {
	807	+ if (time() - $globalLiveInterval > $maxitime) {
	808	+ $output = str_replace('%minitime%', date("c", $maxitime), $output);
809	809	} else {
810		- $output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
	810	+ $output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
811	811	}
812	812	}
813		- else $output = str_replace('%minitime%',date("c",$minitime),$output);
	813	+ else $output = str_replace('%minitime%', date("c", $minitime), $output);
814	814	} elseif (isset($_COOKIE['MapTrack']) && $_COOKIE['MapTrack'] != '' && $minitracktime != $minitracktime_begin) {
815		- $output = str_replace('%minitime%',date("c",$minitracktime),$output);
	815	+ $output = str_replace('%minitime%', date("c", $minitracktime), $output);
816	816	} else {
817		- $output = str_replace('%minitime%',date("c",$minitime),$output);
	817	+ $output = str_replace('%minitime%', date("c", $minitime), $output);
818	818	}
819		-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
820		-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
821		-else $output = str_replace('%gltf2%','false',$output);
	819	+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
	820	+if ($gltf2) $output = str_replace('%gltf2%', 'true', $output);
	821	+else $output = str_replace('%gltf2%', 'false', $output);
822	822	print $output;
823	823	?>

Ysurac / FlightAirMap

Push — master ( 50fd5f...ef9e9e )

Status

Category

Spacing +116 added lines, -116 removed lines patch added patch discarded remove patch

Spacing +69 added lines, -69 removed lines patch added patch discarded remove patch