Ysurac / FlightAirMap

ident-detailed.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Translation.php');
 $type = '';
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 if (isset($_GET['marine'])) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@ 
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
 }
 
-if (!isset($_GET['ident'])){
+if (!isset($_GET['ident'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -54,18 +54,18 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($type == 'aircraft') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@ 
 				$ident = $new_ident;
 				if ($sort != '') 
 				{
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					}
 				} else {
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					}
 				}
 			}
@@ -89,34 +89,34 @@ 
 	} elseif ($type == 'marine') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	} elseif ($type == 'tracker') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -135,7 +135,7 @@ 
 				$altitude_data = '';
 				$hour_data = '';
 				$speed_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$hour_data .= '"'.$data['date'].'",';
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -163,8 +163,8 @@ 
 					$speed_data .= $speed.',';
 				}
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -208,9 +208,9 @@ 
 	
 		if ($type == 'aircraft') include('ident-sub-menu.php');
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

require/class.SpotterArchive.php

Spacing +117 added lines, -117 removed lines

@@ -14,82 +14,82 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
 		$filters = array();
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				$filters = $globalStatsFilters[$globalFilterName];
 			} else {
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
 			}
 		}
 		if (isset($filter[0]['source'])) {
-			$filters = array_merge($filters,$filter);
+			$filters = array_merge($filters, $filter);
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
-		foreach($filters as $flt) {
+		foreach ($filters as $flt) {
 			if (isset($flt['airlines']) && !empty($flt['airlines'])) {
 				if ($flt['airlines'][0] != '') {
 					if (isset($flt['source'])) {
-						$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_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_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'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) {
 			$filter_query_date = '';
@@ -114,41 +114,41 @@ 
 					$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";
@@ -168,9 +168,9 @@ 
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
                 //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+                $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident));
 
                 return $spotter_array;
         }
@@ -189,7 +189,7 @@ 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
                 //$query  = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id";
                 //$query  = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
+                $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -202,7 +202,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id));
+                $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id));
 
                 return $spotter_array;
         }
@@ -217,14 +217,14 @@ 
 	{
                 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;
                 }
@@ -243,14 +243,14 @@ 
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
+                $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id";
 
 //              $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id));
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -272,12 +272,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -298,12 +298,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -322,11 +322,11 @@ 
 	{
 		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;
 		}
@@ -344,12 +344,12 @@ 
 	{
 		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;
 		}
@@ -365,12 +365,12 @@ 
         * @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;
 	}
 
@@ -385,7 +385,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -397,24 +397,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveSpotterData($begindate,$enddate,$filter = array())
+        public function getMinLiveSpotterData($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -433,14 +433,14 @@ 
 						GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id 
 				    AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 */
-			$query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM spotter_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
 				    WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY flightaware_id';
                 } else {
                         //$query  = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+                        $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM spotter_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao
                         	    WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".'
@@ -450,7 +450,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -465,24 +465,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array())
+        public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 // Should use spotter_output also ?
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -492,7 +492,7 @@ 
                     		    FROM spotter_archive 
                     		    INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk 
+			$query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk 
 				    FROM spotter_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao 
 				    WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -507,7 +507,7 @@ 
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
+                        $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow
                         	    FROM spotter_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao
                         	    WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".'
@@ -519,7 +519,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -534,23 +534,23 @@ 
         * @return Array the spotter information
         *
         */
-        public function getLiveSpotterCount($begindate,$enddate,$filter = array())
+        public function getLiveSpotterCount($begindate, $enddate, $filter = array())
         {
                 global $globalDBdriver, $globalLiveInterval;
                 date_default_timezone_set('UTC');
 
                 $filter_query = '';
                 if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+                        $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') ";
                 }
                 if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
+                        $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id ";
                 }
                 if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
                 }
 
                 //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
@@ -565,7 +565,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -585,7 +585,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+    public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
     {
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
@@ -607,7 +607,7 @@ 
 	        
 		$q_array = explode(" ", $q);
 		
-		foreach ($q_array as $q_item){
+		foreach ($q_array as $q_item) {
 		    $additional_query .= " AND (";
 		    $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR ";
 		    $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -639,7 +639,7 @@ 
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
 	    if (!is_string($registration))
 	    {
 		return false;
@@ -650,7 +650,7 @@ 
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_icao))
 	    {
 		return false;
@@ -661,7 +661,7 @@ 
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_manufacturer))
 	    {
 		return false;
@@ -682,7 +682,7 @@ 
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_icao))
 	    {
 		return false;
@@ -693,7 +693,7 @@ 
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_country))
 	    {
 		return false;
@@ -704,7 +704,7 @@ 
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_type))
 	    {
 		return false;
@@ -726,7 +726,7 @@ 
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport))
 	    {
 		return false;
@@ -737,7 +737,7 @@ 
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport_country))
 	    {
 		return false;
@@ -748,7 +748,7 @@ 
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 	    if (!is_string($callsign))
 	    {
 		return false;
@@ -756,7 +756,7 @@ 
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)";
-			$query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate));
+			$query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate));
 		} else {
 			$additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')";
 		}
@@ -765,7 +765,7 @@ 
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
 	    if (!is_string($owner))
 	    {
 		return false;
@@ -776,7 +776,7 @@ 
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 	    if (!is_string($pilot_name))
 	    {
 		return false;
@@ -787,7 +787,7 @@ 
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 	    if (!is_string($pilot_id))
 	    {
 		return false;
@@ -798,7 +798,7 @@ 
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($departure_airport_route))
 	    {
 		return false;
@@ -809,7 +809,7 @@ 
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($arrival_airport_route))
 	    {
 		return false;
@@ -822,8 +822,8 @@ 
 	{
 	    $altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
 	    if ($altitude_array[1] != "")
@@ -840,8 +840,8 @@ 
 	if ($date_posted != "")
 	{
 		$date_array = explode(",", $date_posted);
-		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+		$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+		$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 		if ($globalTimezone != '') {
 			date_default_timezone_set($globalTimezone);
 			$datetime = new DateTime();
@@ -868,8 +868,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
@@ -877,8 +877,8 @@ 
 			}
 		}
 		if ($origLat != "" && $origLon != "" && $dist != "") {
-			$dist = number_format($dist*0.621371,2,'.','');
-			$query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+			$dist = number_format($dist*0.621371, 2, '.', '');
+			$query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance 
 			      FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
 			      AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 		} else {
@@ -894,12 +894,12 @@ 
 				$additional_query .= " AND (spotter_archive_output.waypoints <> '')";
 			}
 
-			$query  = "SELECT spotter_archive_output.* FROM spotter_archive_output 
+			$query = "SELECT spotter_archive_output.* FROM spotter_archive_output 
 			    WHERE spotter_archive_output.ident <> '' 
 			    ".$additional_query."
 			    ".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query);
+		$spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query);
 		return $spotter_array;
 	}
 
@@ -914,7 +914,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 	}
@@ -951,8 +951,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -993,7 +993,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -1010,8 +1010,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1051,7 +1051,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1063,8 +1063,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1094,7 +1094,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1123,7 +1123,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1140,7 +1140,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1169,7 +1169,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1187,14 +1187,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveSpotterDataById($id,$date)
+    public function getDateArchiveSpotterDataById($id, $date)
     {
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1204,14 +1204,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveSpotterDataByIdent($ident,$date)
+    public function getDateArchiveSpotterDataByIdent($ident, $date)
     {
 	$Spotter = new Spotter($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1221,7 +1221,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
 	global $global_query;
 	$Spotter = new Spotter($this->db);
@@ -1229,7 +1229,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filters,true,true);
+	$filter_query = $this->getFilter($filters, true, true);
 	
 	if ($airport != "")
 	{
@@ -1246,8 +1246,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {

location-geojson.php

Spacing +15 added lines, -15 removed lines

@@ -12,52 +12,52 @@ 
 if (!isset($globalDemo)) {
 	if (isset($_GET['coord'])) 
 	{
-		$coords = explode(',',$_GET['coord']);
+		$coords = explode(',', $_GET['coord']);
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs', $coords));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx', $coords));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning', $coords));
 		}
 		
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', $coords, true));
 		}
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	} else {
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
 		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('gs'));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
 		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('wx'));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
 		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('lightning'));
 		}
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
 		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
-			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
+			$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType('fires', array(), true));
 		}
-		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
+		$spotter_array = array_merge($spotter_array, $Source->getLocationInfoByType(''));
 	}
 }
 
 $output = '{"type": "FeatureCollection","features": [';
 if (!empty($spotter_array) && count($spotter_array) > 0)
 {
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		$output .= '{"type": "Feature",';
@@ -76,8 +76,8 @@ 
 		$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
 		$output .= '"type": "'.$spotter_item['type'].'",';
 		if ($spotter_item['type'] == 'wx') {
-			$weather = json_decode($spotter_item['description'],true);
-			if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
+			$weather = json_decode($spotter_item['description'], true);
+			if (isset($weather['temp'])) $output .= '"temp": "'.$weather['temp'].'",';
 		}
 		$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
 		$output .= '},';
@@ -87,7 +87,7 @@ 
 		$output .= '}';
 		$output .= '},';
 	}
-	$output  = substr($output, 0, -1);
+	$output = substr($output, 0, -1);
 }
 $output .= ']}';
 print $output;

require/class.TrackerLive.php

Spacing +106 added lines, -106 removed lines

@@ -17,33 +17,33 @@ 
 	* @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['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_live.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -72,15 +72,15 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid";
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_live.famtrackid";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
@@ -103,8 +103,8 @@ 
 		if ($limit != '')
 		{
 			$limit_array = explode(',', $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0];
@@ -127,7 +127,7 @@ 
 		} else {
 			$query  = "SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate".$filter_query.$orderby_query;
 		}
-		$spotter_array = $Tracker->getDataFromDB($query.$limit_query,array(),'',true);
+		$spotter_array = $Tracker->getDataFromDB($query.$limit_query, array(), '', true);
 
 		return $spotter_array;
 	}
@@ -143,7 +143,7 @@ 
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
 
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -161,7 +161,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -176,25 +176,25 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getMinLastLiveTrackerData($coord,$filter = array(),$limit = false)
+	public function getMinLastLiveTrackerData($coord, $filter = array(), $limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DTrackersLimit;
 		date_default_timezone_set('UTC');
 		$usecoord = false;
 		if (is_array($coord) && !empty($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 			$usecoord = true;
 		}
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if (!isset($globalMap3DTrackersLimit) || $globalMap3DTrackersLimit == '') $globalMap3DTrackersLimit = '300';
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive) {
-				$query  = "SELECT * FROM (
+				$query = "SELECT * FROM (
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
 				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
@@ -216,7 +216,7 @@ 
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive) {
-				$query  = "SELECT * FROM (
+				$query = "SELECT * FROM (
 					SELECT tracker_archive.ident, tracker_archive.famtrackid,tracker_archive.type,tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.date, tracker_archive.format_source 
 					FROM tracker_archive INNER JOIN (SELECT famtrackid FROM tracker_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date) l ON l.famtrackid = tracker_archive.famtrackid ";
 				if ($usecoord) $query .= "AND tracker_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND tracker_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." ";
@@ -240,7 +240,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -257,7 +257,7 @@ 
 	public function getLiveTrackerCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
 		if ($globalDBdriver == 'mysql') {
@@ -268,7 +268,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -291,10 +291,10 @@ 
 		$filter_query = $this->getFilter($filter);
 
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		if ($globalDBdriver == 'mysql') {
 			$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY tracker_live.famtrackid'.$filter_query;
@@ -316,13 +316,13 @@ 
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
 		$Tracker = new Tracker($this->db);
 		if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-		$filter_query = $this->getFilter($filter,true,true);
+		$filter_query = $this->getFilter($filter, true, true);
 
 		if (is_array($coord)) {
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 		} else return array();
 		/*
 		if ($globalDBdriver == 'mysql') {
@@ -336,13 +336,13 @@ 
 		*/
 		if ($globalDBdriver == 'mysql') {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
-				$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
+				$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live 
 				    '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= tracker_live.date 
 				    AND tracker_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND tracker_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.'
 				    AND tracker_live.latitude <> 0 AND tracker_live.longitude <> 0';
 			} else {
-				$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
+				$query = 'SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live 
 				    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate 
 					FROM tracker_live l 
@@ -354,14 +354,14 @@ 
 			}
 		} else {
 			if (isset($globalArchive) && $globalArchive === TRUE) {
-				$query  = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
+				$query = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live 
 				    ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= tracker_live.date 
 				    AND tracker_live.latitude BETWEEN ".$minlat." AND ".$maxlat." 
 				    AND tracker_live.longitude BETWEEN ".$minlong." AND ".$maxlong." 
 				    AND tracker_live.latitude <> '0' AND tracker_live.longitude <> '0'";
 			} else {
-				$query  = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
+				$query = "SELECT tracker_live.ident, tracker_live.famtrackid,tracker_live.type, tracker_live.latitude, tracker_live.longitude, tracker_live.altitude, tracker_live.heading, tracker_live.ground_speed, tracker_live.date, tracker_live.format_source 
 				    FROM tracker_live 
 				    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate 
 					FROM tracker_live l 
@@ -418,7 +418,7 @@ 
                 if ($interval == '1m')
                 {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
-                } else if ($interval == '15m'){
+                } else if ($interval == '15m') {
                     $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date ';
                 } 
             }
@@ -426,14 +426,14 @@ 
          $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';   
         }
 
-                $query  = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
+                $query = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
                    WHERE tracker_live.latitude <> '' 
                                    AND tracker_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius));
 
                 return $spotter_array;
         }
@@ -451,9 +451,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
-		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident),'',true);
+		$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident), '', true);
 
 		return $spotter_array;
 	}
@@ -464,16 +464,16 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveTrackerDataByIdent($ident,$date)
+	public function getDateLiveTrackerDataByIdent($ident, $date)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
-                $date = date('c',$date);
-		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+                $date = date('c', $date);
+		$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 
 		return $spotter_array;
 	}
@@ -490,9 +490,9 @@ 
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
-		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id),'',true);
+		$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id), '', true);
 
 		return $spotter_array;
 	}
@@ -503,15 +503,15 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getDateLiveTrackerDataById($id,$date)
+	public function getDateLiveTrackerDataById($id, $date)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
-                $date = date('c',$date);
-		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
+                $query = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+                $date = date('c', $date);
+		$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true);
 
 		return $spotter_array;
 	}
@@ -528,13 +528,13 @@ 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
+                $query = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
 
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -549,7 +549,7 @@ 
 	* @return Array the spotter information
 	*
 	*/
-	public function getAllLiveTrackerDataById($id,$liveinterval = false)
+	public function getAllLiveTrackerDataById($id, $liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -568,7 +568,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -586,12 +586,12 @@ 
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = self::$global_query.' WHERE tracker_live.ident = :ident';
+		$query = self::$global_query.' WHERE tracker_live.ident = :ident';
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -621,7 +621,7 @@ 
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -644,14 +644,14 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 			$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
                         $i = 0;
-                        $j =0;
+                        $j = 0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
-			foreach($all as $row)
+			foreach ($all as $row)
 			{
 				$i++;
 				$j++;
@@ -659,9 +659,9 @@ 
 					if ($globalDebug) echo ".";
 				    	try {
 						
-						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+						$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 						$sth->execute();
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						return "error";
 					}
                                 	$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
@@ -672,9 +672,9 @@ 
 			if ($i > 0) {
     				try {
 					
-					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
+					$sth = $this->db->prepare(substr($query_delete, 0, -1).")");
 					$sth->execute();
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error";
 				}
 			}
@@ -687,7 +687,7 @@ 
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error";
 			}
 /*			$query_delete = "DELETE FROM tracker_live WHERE famtrackid IN (";
@@ -735,13 +735,13 @@ 
 	public function deleteLiveTrackerDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM tracker_live WHERE ident = :ident';
+		$query = 'DELETE FROM tracker_live WHERE ident = :ident';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -757,13 +757,13 @@ 
 	public function deleteLiveTrackerDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-		$query  = 'DELETE FROM tracker_live WHERE famtrackid = :id';
+		$query = 'DELETE FROM tracker_live WHERE famtrackid = :id';
         
     		try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 
@@ -781,13 +781,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT tracker_live.ident FROM tracker_live 
+			$query = 'SELECT tracker_live.ident FROM tracker_live 
 				WHERE tracker_live.ident = :ident 
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) 
 				AND tracker_live.date < UTC_TIMESTAMP()';
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT tracker_live.ident FROM tracker_live 
+			$query = "SELECT tracker_live.ident FROM tracker_live 
 				WHERE tracker_live.ident = :ident 
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
 				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -796,8 +796,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['ident'];
 		}
@@ -814,13 +814,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
+			$query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
 				WHERE tracker_live.ident = :ident 
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; 
 //				AND tracker_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':ident' => $ident);
 		} else {
-			$query  = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
+			$query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
 				WHERE tracker_live.ident = :ident 
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'";
 //				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -829,8 +829,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['famtrackid'];
 		}
@@ -847,13 +847,13 @@ 
 	{
 		global $globalDBdriver, $globalTimezone;
 		if ($globalDBdriver == 'mysql') {
-			$query  = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
+			$query = 'SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
 				WHERE tracker_live.famtrackid = :id 
 				AND tracker_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; 
 //				AND tracker_live.date < UTC_TIMESTAMP()";
 			$query_data = array(':id' => $id);
 		} else {
-			$query  = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
+			$query = "SELECT tracker_live.ident, tracker_live.famtrackid FROM tracker_live 
 				WHERE tracker_live.famtrackid = :id 
 				AND tracker_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'";
 //				AND tracker_live.date < now() AT TIME ZONE 'UTC'";
@@ -862,8 +862,8 @@ 
 		
 		$sth = $this->db->prepare($query);
 		$sth->execute($query_data);
-		$ident_result='';
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
+		$ident_result = '';
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 		{
 			$ident_result = $row['famtrackid'];
 		}
@@ -881,7 +881,7 @@ 
 	* @return String success or false
 	*
 	*/
-	public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
+	public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
 		$Common = new Common();
@@ -940,21 +940,21 @@ 
 		if ($date == '') $date = date("Y-m-d H:i:s", time());
 
         
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
-		$source_name = filter_var($source_name,FILTER_SANITIZE_STRING);
-		$over_country = filter_var($over_country,FILTER_SANITIZE_STRING);
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
-
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
+		$source_name = filter_var($source_name, FILTER_SANITIZE_STRING);
+		$over_country = filter_var($over_country, FILTER_SANITIZE_STRING);
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
+
+            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
+            	if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
             	
 		$query = '';
 		if ($globalArchive) {
@@ -964,12 +964,12 @@ 
 		$query  .= 'INSERT INTO tracker_live (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
 
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':comment' => $comment,':type' => $type);
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':comment' => $comment, ':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
                 /*
@@ -979,7 +979,7 @@ 
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
 		    if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
 		    $TrackerArchive = new TrackerArchive($this->db);
-		    $result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
+		    $result = $TrackerArchive->addTrackerArchiveData($famtrackid, $ident, $latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type, $noarchive, $format_source, $source_name, $over_country);
 		    if ($globalDebug) echo $result.')';
 		}
 
@@ -989,7 +989,7 @@ 
 
 	public function getOrderBy()
 	{
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC"));
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_live.date DESC"));
 		return $orderby;
 	}
 

marine-data.php

Spacing +9 added lines, -9 removed lines

@@ -9,15 +9,15 @@ 
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataByIdent($ident, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident,$currenttime);
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataByIdent($ident, $currenttime);
 		}
 		
 	} else {
@@ -31,16 +31,16 @@ 
 	}
 }
 if (isset($_GET['fammarine_id'])) {
-	$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
+	$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id,$currenttime);
+		$spotter_array = $MarineLive->getDateLiveMarineDataById($fammarine_id, $currenttime);
 		
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($flightaware_id,$currenttime);
+			$spotter_array = $MarineArchive->getDateArchiveMarineDataById($flightaware_id, $currenttime);
 		}
 		
 	} else {
@@ -62,7 +62,7 @@ 
 if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
-		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
+		$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 	} else $image = $spotter_item['image_thumbnail'];
 
 }

sitemap.php

Spacing +28 added lines, -28 removed lines

@@ -18,7 +18,7 @@ 
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$spotter_array = $Spotter->getAllFlightsforSitemap();
-		foreach($spotter_array as $spotter_item)
+		foreach ($spotter_array as $spotter_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>';
@@ -29,13 +29,13 @@ 
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "aircraft"){
+} else if (isset($_GET['type']) && $_GET['type'] == "aircraft") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 		$aircraft_types = $Stats->getAllAircraftTypes();
 		if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes();
-		foreach($aircraft_types as $aircraft_item)
+		foreach ($aircraft_types as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>';
@@ -46,13 +46,13 @@ 
 	$output .= '</urlset>';
 	
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "registration"){
+} else if (isset($_GET['type']) && $_GET['type'] == "registration") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$aircraft_registrations = $Spotter->getAllAircraftRegistrations();
-		foreach($aircraft_registrations as $aircraft_item)
+		foreach ($aircraft_registrations as $aircraft_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>';
@@ -62,13 +62,13 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airline"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airline") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airline_names = $Stats->getAllAirlineNames();
-		foreach($airline_names as $airline_item)
+		foreach ($airline_names as $airline_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>';
@@ -78,14 +78,14 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "airport"){
+} else if (isset($_GET['type']) && $_GET['type'] == "airport") {
 
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 
 		$airport_names = $Stats->getAllAirportNames();
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
-		foreach($airport_names as $airport_item)
+		foreach ($airport_names as $airport_item)
 		{
 			$output .= '<url>';
 			    $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>';
@@ -95,12 +95,12 @@ 
 		}
 	$output .= '</urlset>';
 	
-} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer"){
+} else if (isset($_GET['type']) && $_GET['type'] == "manufacturer") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$manufacturer_names = $Stats->getAllManufacturers();
 	if (empty($manufacturer_names)) $manufacturer_names = $Spotter->getAllManufacturers();
-	foreach($manufacturer_names as $manufacturer_item)
+	foreach ($manufacturer_names as $manufacturer_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>';
@@ -109,11 +109,11 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "country"){
+} else if (isset($_GET['type']) && $_GET['type'] == "country") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$country_names = $Spotter->getAllCountries();
-	foreach($country_names as $country_item)
+	foreach ($country_names as $country_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>';
@@ -122,11 +122,11 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "ident"){
+} else if (isset($_GET['type']) && $_GET['type'] == "ident") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$ident_names = $Spotter->getAllIdents();
-	foreach($ident_names as $ident_item)
+	foreach ($ident_names as $ident_item)
 	{
 		if (ctype_alnum($ident_item['ident'])) {
 			$output .= '<url>';
@@ -137,11 +137,11 @@ 
 		}
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-ident") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$ident_names = $Marine->getAllIdents();
-	foreach($ident_names as $ident_item)
+	foreach ($ident_names as $ident_item)
 	{
 		if (ctype_alnum($ident_item['ident'])) {
 			$output .= '<url>';
@@ -152,11 +152,11 @@ 
 		}
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Spotter->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -165,11 +165,11 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Marine->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/marine/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -178,11 +178,11 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date"){
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-date") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$date_names = $Tracker->getAllDates();
-	foreach($date_names as $date_item)
+	foreach ($date_names as $date_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/tracker/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>';
@@ -191,11 +191,11 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "route"){
+} else if (isset($_GET['type']) && $_GET['type'] == "route") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	$route_names = $Spotter->getAllRoutes();
-	foreach($route_names as $route_item)
+	foreach ($route_names as $route_item)
 	{
 		$output .= '<url>';
 		$output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>';
@@ -204,7 +204,7 @@ 
 		$output .= '</url>';
 	}
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */
@@ -322,7 +322,7 @@ 
 	$output .= '<changefreq>daily</changefreq>';
 	$output .= '</url>';
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "marine-static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "marine-static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */
@@ -348,7 +348,7 @@ 
 	$output .= '<changefreq>daily</changefreq>';
 	$output .= '</url>';
 	$output .= '</urlset>';
-} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static"){
+} else if (isset($_GET['type']) && $_GET['type'] == "tracker-static") {
 	$output .= '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">';
 	/* STATIC PAGES */

require/class.TrackerArchive.php

Spacing +107 added lines, -107 removed lines

@@ -14,33 +14,33 @@ 
 	* @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['idents']) && !empty($flt['idents'])) {
 				if (isset($flt['source'])) {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				} else {
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.famtrackid = tracker_archive.famtrackid";
 				}
 			}
 		}
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
@@ -68,38 +68,38 @@ 
 					$filter_query_date .= " AND EXTRACT(DAY FROM tracker_archive_output.date) = '".$filter['day']."'";
 				}
 			}
-			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
+			$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.famtrackid = tracker_archive.famtrackid";
 		}
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 		if ($filter_query_where != '') {
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
 		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
 
 	// tracker_archive
-	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') {
+	public function addTrackerArchiveData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') {
 		require_once(dirname(__FILE__).'/class.Tracker.php');
 		if ($over_country == '') {
 			$Tracker = new Tracker($this->db);
-			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
+			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude, $longitude);
 			if (!empty($data_country)) $country = $data_country['iso2'];
 			else $country = '';
 		} else $country = $over_country;
 		// Route is not added in tracker_archive
-		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
+		$query = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
-		$query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country,':comment' => $comment,':type' => $type);
+		$query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $country, ':comment' => $comment, ':type' => $type);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 			$sth->closeCursor();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		return "success";
@@ -119,9 +119,9 @@ 
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+                $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident));
 
                 return $spotter_array;
         }
@@ -140,7 +140,7 @@ 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
                 //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
                 //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
+                $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
                   /*
@@ -153,7 +153,7 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id));
 
                 return $spotter_array;
         }
@@ -168,14 +168,14 @@ 
 	{
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
+                $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
 
 //              $spotter_array = Tracker->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;
                 }
@@ -194,14 +194,14 @@ 
         {
                 date_default_timezone_set('UTC');
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
+                $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
 
 //              $spotter_array = Tracker->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;
                 }
@@ -223,12 +223,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_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;
                 }
@@ -249,12 +249,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_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;
                 }
@@ -275,12 +275,12 @@ 
                 date_default_timezone_set('UTC');
 
                 $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :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;
                 }
@@ -302,13 +302,13 @@ 
                 date_default_timezone_set('UTC');
 
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+                $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -325,13 +325,13 @@ 
         * @return Array the spotter information
         *
         */
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
+        public function getTrackerArchiveData($ident, $famtrackid, $date)
         {
     		$Tracker = new Tracker($this->db);
                 $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
+                $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
+                $spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':famtrackid' => $famtrackid, ':date' => $date.'%'));
 
                 return $spotter_array;
         }
@@ -347,7 +347,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo $e->getMessage();
 			die;
 		}
@@ -359,24 +359,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
+        public function getMinLiveTrackerData($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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 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';
@@ -395,14 +395,14 @@ 
 						GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid 
 				    AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 */
-			$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+			$query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
 				    FROM tracker_archive 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY famtrackid';
                 } else {
                         //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+                        $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM tracker_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
@@ -412,7 +412,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -427,24 +427,24 @@ 
         * @return Array the spotter information
         *
         */
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
+        public function getMinLiveTrackerDataPlayback($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 famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 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';
@@ -454,7 +454,7 @@ 
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
 			*/
-			$query  = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
+			$query = 'SELECT a.aircraft_shadow, tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk 
 				    FROM tracker_archive_output 
 				    LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive_output.aircraft_icao = a.icao 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
@@ -469,7 +469,7 @@ 
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
+                        $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
@@ -481,7 +481,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -496,23 +496,23 @@ 
         * @return Array the spotter information
         *
         */
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
+        public function getLiveTrackerCount($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 famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
                 }
                 if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
                         $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
                 }
                 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';
@@ -527,7 +527,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         echo $e->getMessage();
                         die;
                 }
@@ -547,7 +547,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function searchTrackerData($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 searchTrackerData($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');
@@ -569,7 +569,7 @@ 
 	        
 		$q_array = explode(" ", $q);
 		
-		foreach ($q_array as $q_item){
+		foreach ($q_array as $q_item) {
 		    $additional_query .= " AND (";
 		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
 		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
@@ -601,7 +601,7 @@ 
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
+	    $registration = filter_var($registration, FILTER_SANITIZE_STRING);
 	    if (!is_string($registration))
 	    {
 		return false;
@@ -612,7 +612,7 @@ 
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+	    $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_icao))
 	    {
 		return false;
@@ -623,7 +623,7 @@ 
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+	    $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING);
 	    if (!is_string($aircraft_manufacturer))
 	    {
 		return false;
@@ -644,7 +644,7 @@ 
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+	    $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_icao))
 	    {
 		return false;
@@ -655,7 +655,7 @@ 
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+	    $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_country))
 	    {
 		return false;
@@ -666,7 +666,7 @@ 
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+	    $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING);
 	    if (!is_string($airline_type))
 	    {
 		return false;
@@ -688,7 +688,7 @@ 
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
+	    $airport = filter_var($airport, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport))
 	    {
 		return false;
@@ -699,7 +699,7 @@ 
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+	    $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING);
 	    if (!is_string($airport_country))
 	    {
 		return false;
@@ -710,7 +710,7 @@ 
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+	    $callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
 	    if (!is_string($callsign))
 	    {
 		return false;
@@ -718,7 +718,7 @@ 
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_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 (tracker_archive_output.ident = '".$callsign."')";
 		}
@@ -727,7 +727,7 @@ 
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
+	    $owner = filter_var($owner, FILTER_SANITIZE_STRING);
 	    if (!is_string($owner))
 	    {
 		return false;
@@ -738,7 +738,7 @@ 
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+	    $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING);
 	    if (!is_string($pilot_name))
 	    {
 		return false;
@@ -749,7 +749,7 @@ 
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+	    $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT);
 	    if (!is_string($pilot_id))
 	    {
 		return false;
@@ -760,7 +760,7 @@ 
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+	    $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($departure_airport_route))
 	    {
 		return false;
@@ -771,7 +771,7 @@ 
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+	    $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING);
 	    if (!is_string($arrival_airport_route))
 	    {
 		return false;
@@ -784,8 +784,8 @@ 
 	{
 	    $altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+	    $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 	    
 
 	    if ($altitude_array[1] != "")
@@ -803,8 +803,8 @@ 
 	{
 	    $date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+	    $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
+	    $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
 	    
 	    if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
@@ -836,8 +836,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -848,8 +848,8 @@ 
 	
 
 	if ($origLat != "" && $origLon != "" && $dist != "") {
-		$dist = number_format($dist*0.621371,2,'.','');
-		$query="SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
+		$dist = number_format($dist*0.621371, 2, '.', '');
+		$query = "SELECT tracker_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance 
                           FROM tracker_archive_output, tracker_archive WHERE spotter_output_archive.famtrackid = tracker_archive.famtrackid AND spotter_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) 
                           AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(tracker_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(tracker_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance";
 	} else {
@@ -866,12 +866,12 @@ 
 			$additional_query .= " AND (tracker_archive_output.waypoints <> '')";
 		}
 
-		$query  = "SELECT tracker_archive_output.* FROM tracker_archive_output 
+		$query = "SELECT tracker_archive_output.* FROM tracker_archive_output 
 		    WHERE tracker_archive_output.ident <> '' 
 		    ".$additional_query."
 		    ".$filter_query.$orderby_query;
 	}
-	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
+	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
     }
@@ -888,7 +888,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
 	}
@@ -925,8 +925,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -967,7 +967,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($owner != "")
 	{
@@ -984,8 +984,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1025,7 +1025,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filter,true,true);
+	$filter_query = $this->getFilter($filter, true, true);
 	
 	if ($pilot != "")
 	{
@@ -1037,8 +1037,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {
@@ -1068,7 +1068,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1097,7 +1097,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['flight_count'] = $row['nb'];
 	    $temp_array['flight_country'] = $row['name'];
@@ -1114,7 +1114,7 @@ 
     * @return Array the airline country list
     *
     */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+    public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '')
     {
 	global $globalDBdriver;
 	/*
@@ -1143,7 +1143,7 @@ 
 	$flight_array = array();
 	$temp_array = array();
         
-	while($row = $sth->fetch(PDO::FETCH_ASSOC))
+	while ($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
 	    $temp_array['airline_icao'] = $row['airline_icao'];
 	    $temp_array['flight_count'] = $row['nb'];
@@ -1161,14 +1161,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveTrackerDataById($id,$date)
+    public function getDateArchiveTrackerDataById($id, $date)
     {
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Tracker->getDataFromDB($query, array(':id' => $id, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1178,14 +1178,14 @@ 
     * @return Array the spotter information
     *
     */
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
+    public function getDateArchiveTrackerDataByIdent($ident, $date)
     {
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-	$query  = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
-	$date = date('c',$date);
-	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
+	$query = 'SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate ORDER BY tracker_archive.date DESC';
+	$date = date('c', $date);
+	$spotter_array = $Tracker->getDataFromDB($query, array(':ident' => $ident, ':date' => $date));
 	return $spotter_array;
     }
 
@@ -1195,7 +1195,7 @@ 
     * @return Array the spotter information
     *
     */
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '', $filters = array())
     {
 	global $global_query;
 	$Tracker = new Tracker($this->db);
@@ -1203,7 +1203,7 @@ 
 	$query_values = array();
 	$limit_query = '';
 	$additional_query = '';
-	$filter_query = $this->getFilter($filters,true,true);
+	$filter_query = $this->getFilter($filters, true, true);
 	
 	if ($airport != "")
 	{
@@ -1220,8 +1220,8 @@ 
 	{
 	    $limit_array = explode(",", $limit);
 	    
-	    $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-	    $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+	    $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 	    
 	    if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 	    {

statistics-country.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 } else {
 	$title = _("Statistics").' - '._("Most common Country a flight was over");
 }
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
     if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
 }
@@ -48,7 +48,7 @@ 
 }
 
 if ($type == 'aircraft') {
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name);
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name);
 } elseif ($type == 'marine') {
 	$flightover_array = $Marine->countAllMarineOverCountries();
 } elseif ($type == 'tracker') {
@@ -62,7 +62,7 @@ 
 print '<div id="chart" class="chart" width="100%"></div><script>';
 print 'var series = [';
 $flightover_data = '';
-foreach($flightover_array as $flightover_item)
+foreach ($flightover_array as $flightover_item)
 {
 	if ($type == 'aircraft') $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
 	elseif ($type == 'marine') $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
@@ -113,8 +113,8 @@ 
 	print '</thead>';
 	print '<tbody>';
 	$i = 1;
-	array_splice($flightover_array,10);
-	foreach($flightover_array as $flightover_item)
+	array_splice($flightover_array, 10);
+	foreach ($flightover_array as $flightover_item)
 	{
 		print '<tr>';
 		print '<td><strong>'.$i.'</strong></td>';

search.php

Spacing +102 added lines, -102 removed lines

@@ -26,24 +26,24 @@ 
 $sql_date = '';
 if (isset($_GET['start_date'])) {
 	//for the date manipulation into the query
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			//$end_date = $_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $start_date.",".$end_date;
 		}
-	} else if($_GET['start_date'] != ""){
+	} else if ($_GET['start_date'] != "") {
 		if (strtotime($_GET['start_date']) !== false) {
 			//$start_date = $_GET['start_date']." 00:00:00";
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
 			$sql_date = $start_date;
 		}
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
 		if (strtotime($_GET['end_date']) !== false) {
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
 			$sql_date = $end_date;
 		}
 	} else $sql_date = '';
@@ -51,21 +51,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
 	//for altitude manipulation
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $start_altitude.",".$end_altitude;
-	} else if($_GET['highest_altitude'] != ""){
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
+	} else if ($_GET['highest_altitude'] != "") {
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
 		$sql_altitude = $end_altitude;
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
 		$sql_altitude = $start_altitude;
 	} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	if (!isset($_GET['number_results']))
 	{
@@ -73,17 +73,17 @@ 
 		$limit_end = 25;
 		$absolute_difference = 25;
 	} else {
-		if ($_GET['number_results'] > 1000){
+		if ($_GET['number_results'] > 1000) {
 			$_GET['number_results'] = 1000;
 		}
 		$limit_start = 0;
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	}
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -112,31 +112,31 @@ 
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
     (isset($_GET['dist']) && $_GET['dist'] != ''))
-    ){  
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
+    ) {  
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
 	if ($dist != '') {
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
@@ -145,15 +145,15 @@ 
 	if ($archive == 1) {
 		if ($type == 'aircraft') {
 			$SpotterArchive = new SpotterArchive();
-			$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	} else {
 		if ($type == 'aircraft') {
-			$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'tracker') {
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		} elseif ($type == 'marine') {
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
 		}
 	}
 	 
@@ -189,12 +189,12 @@ 
 	//remove 3D=true parameter
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
-	if (!isset($_GET['3D'])){
+	if (!isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
 	} else {
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
 	}
-	if (isset($_GET['3D'])){
+	if (isset($_GET['3D'])) {
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
 	} else {
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
@@ -215,32 +215,32 @@ 
 		print '<div class="column">';
 		print '<div class="info">';
 		print '<h1>'._("Search Results for").' ';
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
 		print '</h1>';
 		print '</div>';
 
@@ -374,7 +374,7 @@ 
 					    </select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
 						<div class="col-sm-10">
@@ -383,7 +383,7 @@ 
 							</select>
 						</div>
 				</div>
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label> 
 					<div class="col-sm-10">
@@ -406,7 +406,7 @@ 
 					</div>
 				</div>
 <?php
-	}else {
+	} else {
 ?>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -419,8 +419,8 @@ 
 ?>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -434,7 +434,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -443,7 +443,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label> 
 					<div class="col-sm-10">
@@ -452,10 +452,10 @@ 
 				</div>
 				<div class="form-group">
 					<div class="col-sm-offset-2 col-sm-10">
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
 					</div>
 				</div>
 			</fieldset>
@@ -469,7 +469,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label> 
 					<div class="col-sm-10">
@@ -478,7 +478,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend><?php echo _("Route"); ?></legend>
@@ -490,7 +490,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
 				<div class="form-group">
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label> 
 					<div class="col-sm-10">
@@ -499,7 +499,7 @@ 
 						</select>
 					</div>
 				</div>
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
 			</fieldset>
 			<fieldset>
 				<legend>Altitude</legend>
@@ -510,9 +510,9 @@ 
 							<option></option>
 <?php
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-foreach($altitude_array as $altitude)
+foreach ($altitude_array as $altitude)
 {
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
 	{
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 	} else {
@@ -530,9 +530,9 @@ 
 							<option></option>
 <?php
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
-	foreach($altitude_array as $altitude)
+	foreach ($altitude_array as $altitude)
 	{
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
 		{
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
 		} else {
@@ -655,10 +655,10 @@ 
 				<div class="col-sm-10">
 					<select class="form-control" name="number_results">
 <?php
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
-foreach($number_results_array as $number)
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
+foreach ($number_results_array as $number)
 {
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
 	{
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
 	} else {
@@ -677,7 +677,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 					<p class="help-block">Disabled in demo</p>
 				</div>
 			</div>
@@ -688,7 +688,7 @@ 
 		<fieldset>
 			<div class="form-group">
 				<div class="col-sm-offset-2 col-sm-10">
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
 				</div>
 			</div>
 		</fieldset>