Ysurac / FlightAirMap

flightid-overview.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
                       function drawChart6() {
                         var data = google.visualization.arrayToDataTable([
                             ["Hour","Altitude","Speed"], ';
-                            $altitude_data = '';
+							$altitude_data = '';
 			foreach($all_data as $data)
 			{
 				$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';

Braces +10 added lines, -4 removed lines

@@ -51,7 +51,9 @@ 
 		
 		if (isset($globalTimezone)) {
 			date_default_timezone_set($globalTimezone);
-		} else date_default_timezone_set('UTC');
+		} else {
+			date_default_timezone_set('UTC');
+		}
 		
 		//date_default_timezone_set('UTC');
 		if (is_array($all_data) && count($all_data) > 0) {
@@ -300,9 +302,13 @@ 
 			print '<div>';
 			if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "")
 			{
-				if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				if ($spotter_item['format_source'] == 'whazzup') {
+					print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} elseif ($spotter_item['format_source'] == 'vatsimtxt') {
+					print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} else {
+					print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				}
 			} else {
 				if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "")
 				{

Spacing +31 added lines, -31 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
+$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING);
 if ($id == "")
 {
 	header('Location: /');
@@ -16,30 +16,30 @@ 
 
 if (!empty($spotter_array))
 {
-	if(isset($spotter_array[0]['flightaware_id'])) {
+	if (isset($spotter_array[0]['flightaware_id'])) {
 		$flightaware_id = $spotter_array[0]['flightaware_id'];
 	}
-	if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
+	if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
 		$latitude = $spotter_array[0]['last_latitude'];
-	} elseif(isset($spotter_array[0]['latitude'])) {
+	} elseif (isset($spotter_array[0]['latitude'])) {
 		$latitude = $spotter_array[0]['latitude'];
 	}
-	if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
+	if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
 		$longitude = $spotter_array[0]['last_longitude'];
-	} elseif(isset($spotter_array[0]['longitude'])) {
+	} elseif (isset($spotter_array[0]['longitude'])) {
 		$longitude = $spotter_array[0]['longitude'];
 	}
 	$title = '';
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		$title .= $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		$title .= ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		$title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
 		$title .= ' - '.$spotter_array[0]['registration'];
 	}
 	//$facebook_meta_image = $spotter_array[0]['image'];
@@ -64,9 +64,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["Hour","Altitude","Speed"], ';
                             $altitude_data = '';
-			foreach($all_data as $data)
+			foreach ($all_data as $data)
 			{
-				$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
+				$altitude_data .= '[ "'.date("G:i", strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
 			}
 			$altitude_data = substr($altitude_data, 0, -1);
 			print $altitude_data.']);
@@ -108,16 +108,16 @@ 
 			print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> ';
 		}
 	}
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		print $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		print ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
 		print ' - '.$spotter_array[0]['registration'];
 	}
 	print '</h1>';
@@ -271,7 +271,7 @@ 
 	 print '</div>';
 */
 
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		print '<div class="details">';
 		print '<h3>'._("Flight Information").'</h3>';
@@ -371,7 +371,7 @@ 
 			if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
 					print '<div class="time">';
-					print 'at '.date('H:m',$spotter_item['departure_airport_time']);
+					print 'at '.date('H:m', $spotter_item['departure_airport_time']);
 					print '</div>';
 				} else {
 					print '<div class="time">';
@@ -520,19 +520,19 @@ 
 			$departure_airport_info = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 				}
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 				}
 			}
 			print '</div>';
@@ -546,19 +546,19 @@ 
 			$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 				}
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 				}
 			}
 			print '</div>';
@@ -577,7 +577,7 @@ 
 		print '<div class="last-flights">';
 		print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$spotter_array[0]['registration'].')</h3>';
 		$hide_th_links = true;
-		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'],"0,5", "");
+		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'], "0,5", "");
 		include('table-output.php'); 
 		print '<div class="more">';
 		print '<a href="'.$globalURL.'/registration/'.$spotter_array[0]['registration'].'" class="btn btn-default btn" role="button">See all Flights&raquo;</a>';

acars-latest.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 $page_url = $globalURL.'/acars-latest';
 
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 25;

Braces +6 added lines, -2 removed lines

@@ -38,8 +38,12 @@
 if (!empty($spotter_array) && $spotter_array[0]['query_number_rows'] != 0) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

registration-statistics-arrival-airport-country.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else {
+	$spotter_array=array();
+}
 
 
 if (!empty($spotter_array))

Spacing +7 added lines, -7 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
 if ($registration != '') {
 	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
 	$aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
-} else $spotter_array=array();
+} else $spotter_array = array();
 
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"),$registration);
+	$title = sprintf(_("Most Common Arrival Airports by Country of aircraft with registration %s"), $registration);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$_GET['registration'].' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -25,7 +25,7 @@ 
 	include('registration-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Arrival Airports by Country").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."),$registration).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows all arrival airports by Country of origin of flights with aircraft registration <strong>%s</strong>."), $registration).'</p>';
 	$airport_country_array = $Spotter->countAllArrivalAirportCountriesByRegistration($registration);
 	print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
 	print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>';
@@ -33,7 +33,7 @@ 
 	print '<div id="chartCountry" class="chart" width="100%"></div><script>';
 	print 'var series = [';
 	$country_data = '';
-	foreach($airport_country_array as $airport_item)
+	foreach ($airport_country_array as $airport_item)
 	{
 		$country_data .= '[ "'.$airport_item['arrival_airport_country_iso3'].'",'.$airport_item['airport_arrival_country_count'].'],';
 	}
@@ -81,7 +81,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($airport_country_array as $airport_item)
+		foreach ($airport_country_array as $airport_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

ident-detailed.php

Indentation +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
                       function drawChart6() {
                         var data = google.visualization.arrayToDataTable([
                             ["Hour","'._("Altitude").'","'._("Speed").'"], ';
-                            $altitude_data = '';
+							$altitude_data = '';
 				foreach($all_data as $data)
 				{
 					$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';

Spacing +26 added lines, -26 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)) {
-				$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)) {
-				$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)) {
-						$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)) {
-						$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)) {
-				$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)) {
-				$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)) {
-				$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)) {
-				$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'];
@@ -137,9 +137,9 @@ 
                         var data = google.visualization.arrayToDataTable([
                             ["Hour","'._("Altitude").'","'._("Speed").'"], ';
                             $altitude_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
-					$altitude_data .= '[ "'.date("G:i",strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
+					$altitude_data .= '[ "'.date("G:i", strtotime($data['date']." UTC")).'",'.$data['altitude'].','.$data['ground_speed'].'],';
 				}
 				$altitude_data = substr($altitude_data, 0, -1);
 				print $altitude_data.']);
@@ -179,9 +179,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">';

Braces +22 added lines, -8 removed lines

@@ -118,8 +118,12 @@ 
 	{
 		$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'];
+		if (isset($spotter_array[0]['latitude'])) {
+			$latitude = $spotter_array[0]['latitude'];
+		}
+		if (isset($spotter_array[0]['longitude'])) {
+			$longitude = $spotter_array[0]['longitude'];
+		}
 		require_once('header.php');
 		if (isset($globalArchive) && $globalArchive && $type == 'aircraft') {
 			// Requirement for altitude graph
@@ -127,7 +131,9 @@ 
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (count($all_data) > 0) {
 				print '<div id="chart6" class="chart" width="100%"></div>
                     <script> 
@@ -174,14 +180,22 @@ 
 		if (isset($spotter_array[0]['airline_icao'])) {
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>'; 
 		}
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		if ($type == 'aircraft') {
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		}
 		print '</div>';
 	
-		if ($type == 'aircraft') include('ident-sub-menu.php');
+		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">';

about.php

Indentation +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 <div class="info column">
     <h1>About <?php print $globalName; ?></h1>
 <?php
-    if ($globalName == 'FlightAirMap') {
+	if ($globalName == 'FlightAirMap') {
 ?>
     <p>This is an open source project displaying <u>most</u> (mostly <a href="http://en.wikipedia.org/wiki/Instrument_flight_rules" target="_blank">IFR</a>) flights that have flown near this site area.
     <?php if ($globalADSBHUB) { ?> Some ADS-B sources come from <a href="http://www.adsbhub.net">ADSBHUB.net</a>.<?php } ?>
@@ -27,18 +27,18 @@ 
 
     <br /><br />
 <?php
-    } else {
+	} else {
 ?>
      <p>This project use <a href="http://www.flightairmap.fr/">FlightAirMap</a> (<a href="https://github.com/Ysurac/FlightAirMap/">source</a>) by Ycarus from <a href="http://www.zugaina.com/">Zugaina</a>.</p>
 <?php
-    }
+	}
 ?>
     <a name="source"></a>
     <h3>Source &amp; Credits</h3>
 
     <?php
 	if ($globalFlightAware) { 
-    ?>
+	?>
     <p>The data from FlightAware is coming from multiple sources. Not every aircraft is tracked on FlightAware, especially not older aircrafts as well as government aircrafts, however most modern airliners will work. You can learn more about how it works on <a href="http://flightaware.com/adsb/" target="_blank">FlightAware's ADS-B</a> page. Also, not every aircraft is shown to have flown exactly at that minute as seen on this site (aka real-time). There is a 5 minute delay on some of the sources.</p>
     <?php } ?>
     <p>None of this project would have been possible without the help and contributions of these organizations and people:</p>

search-csv.php

Indentation +75 added lines, -75 removed lines

@@ -5,55 +5,55 @@ 
 $Spotter = new Spotter();
 
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 $absolute_difference = abs($limit_start - $limit_end);
 $limit_next = $limit_end + $absolute_difference;
@@ -96,41 +96,41 @@ 
   foreach($spotter_array as $spotter_item)
   {
        	
-    $output .= $spotter_item['spotter_id'].',';
-    $output .= $spotter_item['ident'].',';
-    $output .= $spotter_item['registration'].',';
-    $output .= $spotter_item['aircraft_type'].',';
-    $output .= $spotter_item['aircraft_name'].',';
-    $output .= $spotter_item['aircraft_manufacturer'].',';
-    $output .= $spotter_item['airline_name'].',';
-    $output .= $spotter_item['airline_icao'].',';
-    $output .= $spotter_item['airline_iata'].',';
-    $output .= $spotter_item['airline_country'].',';
-    $output .= $spotter_item['airline_callsign'].',';
-    $output .= $spotter_item['airline_type'].',';
-    $output .= $spotter_item['departure_airport_city'].',';
-    $output .= $spotter_item['departure_airport_country'].',';
-    $output .= $spotter_item['departure_airport_iata'].',';
-    $output .= $spotter_item['departure_airport_icao'].',';
-    $output .= $spotter_item['departure_airport_latitude'].',';
-    $output .= $spotter_item['departure_airport_longitude'].',';
-    $output .= $spotter_item['departure_airport_altitude'].',';
-    $output .= $spotter_item['arrival_airport_city'].',';
-    $output .= $spotter_item['arrival_airport_country'].',';
-    $output .= $spotter_item['arrival_airport_iata'].',';
-    $output .= $spotter_item['arrival_airport_icao'].',';
-    $output .= $spotter_item['arrival_airport_latitude'].',';
-    $output .= $spotter_item['arrival_airport_longitude'].',';
-    $output .= $spotter_item['arrival_airport_altitude'].',';
-    $output .= $spotter_item['latitude'].',';
-    $output .= $spotter_item['longitude'].',';
-    $output .= $spotter_item['altitude'].',';
-    $output .= $spotter_item['ground_speed'].',';
-    $output .= $spotter_item['heading'].',';
-    $output .= $spotter_item['heading_name'].',';
-    $output .= $spotter_item['waypoints'].',';
-    $output .= date("c", strtotime($spotter_item['date_iso_8601']));
-    $output .= "\n";
+	$output .= $spotter_item['spotter_id'].',';
+	$output .= $spotter_item['ident'].',';
+	$output .= $spotter_item['registration'].',';
+	$output .= $spotter_item['aircraft_type'].',';
+	$output .= $spotter_item['aircraft_name'].',';
+	$output .= $spotter_item['aircraft_manufacturer'].',';
+	$output .= $spotter_item['airline_name'].',';
+	$output .= $spotter_item['airline_icao'].',';
+	$output .= $spotter_item['airline_iata'].',';
+	$output .= $spotter_item['airline_country'].',';
+	$output .= $spotter_item['airline_callsign'].',';
+	$output .= $spotter_item['airline_type'].',';
+	$output .= $spotter_item['departure_airport_city'].',';
+	$output .= $spotter_item['departure_airport_country'].',';
+	$output .= $spotter_item['departure_airport_iata'].',';
+	$output .= $spotter_item['departure_airport_icao'].',';
+	$output .= $spotter_item['departure_airport_latitude'].',';
+	$output .= $spotter_item['departure_airport_longitude'].',';
+	$output .= $spotter_item['departure_airport_altitude'].',';
+	$output .= $spotter_item['arrival_airport_city'].',';
+	$output .= $spotter_item['arrival_airport_country'].',';
+	$output .= $spotter_item['arrival_airport_iata'].',';
+	$output .= $spotter_item['arrival_airport_icao'].',';
+	$output .= $spotter_item['arrival_airport_latitude'].',';
+	$output .= $spotter_item['arrival_airport_longitude'].',';
+	$output .= $spotter_item['arrival_airport_altitude'].',';
+	$output .= $spotter_item['latitude'].',';
+	$output .= $spotter_item['longitude'].',';
+	$output .= $spotter_item['altitude'].',';
+	$output .= $spotter_item['ground_speed'].',';
+	$output .= $spotter_item['heading'].',';
+	$output .= $spotter_item['heading_name'].',';
+	$output .= $spotter_item['waypoints'].',';
+	$output .= date("c", strtotime($spotter_item['date_iso_8601']));
+	$output .= "\n";
   }
  }
 

Spacing +27 added lines, -27 removed lines

@@ -6,14 +6,14 @@ 
 
 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'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
         } else $sql_date = '';
@@ -21,21 +21,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -43,14 +43,14 @@ 
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -70,30 +70,30 @@ 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
 
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',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);
-$pilot_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$owner = filter_input(INPUT_GET,'owner',FILTER_SANITIZE_STRING);
-$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);
-$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,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', 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);
+$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
+$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);
+$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, '');
  
       
 $output = "id,ident,registration,aircraft_icao,aircraft_name,aircraft_manufacturer,airline,airline_icao,airline_iata,airline_country,airline_callsign,airline_type,departure_airport_city,departure_airport_country,departure_airport_iata,departure_airport_icao,departure_airport_latitude,departure_airport_longitude,departure_airport_altitude,arrival_airport_city,arrival_airport_country,arrival_airport_iata,arrival_airport_icao,arrival_airport_latitude,arrival_airport_longitude,arrival_airport_altitude,latitude,longitude,altitude,ground_speed,heading,heading_name,waypoints,date\n";
 
 if (!empty($spotter_array))
 {
-  foreach($spotter_array as $spotter_item)
+  foreach ($spotter_array as $spotter_item)
   {
        	
     $output .= $spotter_item['spotter_id'].',';

Braces +18 added lines, -7 removed lines

@@ -16,8 +16,12 @@ 
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
-        } else $sql_date = '';
-} else $sql_date = '';
+        } else {
+        	$sql_date = '';
+        }
+        } else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
@@ -31,8 +35,12 @@ 
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
-} else $sql_altitude = '';
+        } else {
+        	$sql_altitude = '';
+        }
+        } else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -50,7 +58,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header("Content-type: text/csv");
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);

highlights-display.php

Braces +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];

Spacing +4 added lines, -4 removed lines

@@ -7,12 +7,12 @@ 
 require_once('header.php');
 
 //calculuation for the pagination
-if(!isset($_GET['limit']))
+if (!isset($_GET['limit']))
 {
 	$limit_start = 0;
 	$limit_end = 28;
 	$absolute_difference = 28;
-}  else {
+} else {
 	$limit_explode = explode(",", $_GET['limit']);
 	$limit_start = $limit_explode[0];
 	$limit_end = $limit_explode[1];
@@ -39,7 +39,7 @@ 
 print '<div class="column">';	
 print '<p>'._("The view below shows all aircrafts that have been selected to have some sort of special characteristic about them, such as unique liveries, destinations etc.").'</p>';
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 if ($sort != '') {
 	$spotter_array = $Spotter->getSpotterDataByHighlight($limit_start.",".$absolute_difference, $sort);
 } else {
@@ -48,7 +48,7 @@ 
 if (!empty($spotter_array))
 {
 	print '<div class="dispay-view">';
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		if (isset($spotter_item['image']) && $spotter_item['image'] != "")
 		{

search-kml.php

Indentation +167 added lines, -167 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -90,22 +90,22 @@ 
       
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
 	$output .= '<kml xmlns="http://www.opengis.net/kml/2.2">';
-    $output .= '<Document>';
-	    $output .= '<Style id="departureAirport">';
-	    	$output .= '<IconStyle>';
-	      	$output .= '<Icon>';
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
-	         $output .= '</Icon>';
-	        $output .= '</IconStyle>';
-	    $output .= '</Style>';
-	    $output .= '<Style id="arrivalAirport">';
-	    	$output .= '<IconStyle>';
-	      	$output .= '<Icon>';
-	        	$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
-	         $output .= '</Icon>';
-	        $output .= '</IconStyle>';
-	    $output .= '</Style>';
-	    $output .= '<Style id="route">';
+	$output .= '<Document>';
+		$output .= '<Style id="departureAirport">';
+			$output .= '<IconStyle>';
+		  	$output .= '<Icon>';
+				$output .= '<href>http://www.flightairmap.fr/images/kml_departure_airport.png</href>';
+			 $output .= '</Icon>';
+			$output .= '</IconStyle>';
+		$output .= '</Style>';
+		$output .= '<Style id="arrivalAirport">';
+			$output .= '<IconStyle>';
+		  	$output .= '<Icon>';
+				$output .= '<href>http://www.flightairmap.fr/images/kml_arrival_airport.png</href>';
+			 $output .= '</Icon>';
+			$output .= '</IconStyle>';
+		$output .= '</Style>';
+		$output .= '<Style id="route">';
 				$output .= '<LineStyle>';  
 					$output .= '<color>7f0000ff</color>';
 					$output .= '<width>2</width>';
@@ -113,10 +113,10 @@ 
 				$output .= '</LineStyle>';
 			$output .= '</Style>';
             
-    if (!empty($spotter_array))
+	if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
-	    {
+		foreach($spotter_array as $spotter_item)
+		{
 				
 				
 				$altitude = $spotter_item['altitude'].'00';
@@ -127,12 +127,12 @@ 
 					$output .= '<styleUrl>#route</styleUrl>';
 					$output .= '<LineString>';
 						$output .= '<coordinates>';
-            	$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
+				$waypoint_pieces = explode(' ', $spotter_item['waypoints']);
 							$waypoint_pieces = array_chunk($waypoint_pieces, 2);
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+									$output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 							
 							}
 						$output .= '</coordinates>';
@@ -144,38 +144,38 @@ 
 				//departure airport 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</name>';
-                    $output .= '<description><![CDATA[ ';
-                        $output .= '<div class="ge-balloon">';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Name</span>';
-                                $output .= $spotter_item['departure_airport_name'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>City</span>';
-                                $output .= $spotter_item['departure_airport_city'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Country</span>';
-                                $output .= $spotter_item['departure_airport_country'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>ICAO</span>';
-                                $output .= $spotter_item['departure_airport_icao'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>IATA</span>';
-                                $output .= $spotter_item['departure_airport_iata'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Coordinates</span>';
-                                $output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Altitude</span>';
-                                $output .= $spotter_item['departure_airport_altitude'];
-                            $output .= '</div>';
-                         $output .= '</div>';
-                    $output .= ' ]]></description>';
+					$output .= '<description><![CDATA[ ';
+						$output .= '<div class="ge-balloon">';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Name</span>';
+								$output .= $spotter_item['departure_airport_name'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>City</span>';
+								$output .= $spotter_item['departure_airport_city'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Country</span>';
+								$output .= $spotter_item['departure_airport_country'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>ICAO</span>';
+								$output .= $spotter_item['departure_airport_icao'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>IATA</span>';
+								$output .= $spotter_item['departure_airport_iata'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Coordinates</span>';
+								$output .= $spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_longitude'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Altitude</span>';
+								$output .= $spotter_item['departure_airport_altitude'];
+							$output .= '</div>';
+						 $output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
@@ -186,38 +186,38 @@ 
 				//arrival airport 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</name>';
-                    $output .= '<description><![CDATA[ ';
-                        $output .= '<div class="ge-balloon">';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Name</span>';
-                                $output .= $spotter_item['arrival_airport_name'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>City</span>';
-                                $output .= $spotter_item['arrival_airport_city'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Country</span>';
-                                $output .= $spotter_item['arrival_airport_country'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>ICAO</span>';
-                                $output .= $spotter_item['arrival_airport_icao'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>IATA</span>';
-                                $output .= $spotter_item['arrival_airport_iata'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Coordinates</span>';
-                                $output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
-                            $output .= '</div>';
-                            $output .= '<div class="ge-row">';
-                                $output .= '<span>Altitude</span>';
-                                $output .= $spotter_item['arrival_airport_altitude'];
-                            $output .= '</div>';
-                         $output .= '</div>';
-                    $output .= ' ]]></description>';
+					$output .= '<description><![CDATA[ ';
+						$output .= '<div class="ge-balloon">';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Name</span>';
+								$output .= $spotter_item['arrival_airport_name'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>City</span>';
+								$output .= $spotter_item['arrival_airport_city'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Country</span>';
+								$output .= $spotter_item['arrival_airport_country'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>ICAO</span>';
+								$output .= $spotter_item['arrival_airport_icao'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>IATA</span>';
+								$output .= $spotter_item['arrival_airport_iata'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Coordinates</span>';
+								$output .= $spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_longitude'];
+							$output .= '</div>';
+							$output .= '<div class="ge-row">';
+								$output .= '<span>Altitude</span>';
+								$output .= $spotter_item['arrival_airport_altitude'];
+							$output .= '</div>';
+						 $output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
@@ -230,41 +230,41 @@ 
 				$output .= '<Placemark>';  
 					$output .= '<name>'.$spotter_item['ident'].' - '.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'</name>';
 					$output .= '<description><![CDATA[ ';
-                            $output .= '<div class="ge-balloon">';
-                                if ($spotter_item['image_thumbnail'] != "")
-                                {
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
-                                }
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Ident</span>';
-                                    $output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Registration</span>';
-                                    $output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Aircraft</span>';
-                                    $output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Airline</span>';
-                                    $output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Departure Airport</span>';
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
-                                $output .= '</div>';
-                                $output .= '<div class="ge-row">';
-                                    $output .= '<span>Arrival Airport</span>';
-                                    $output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
-                                $output .= '</div>';
+							$output .= '<div class="ge-balloon">';
+								if ($spotter_item['image_thumbnail'] != "")
+								{
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click on image to see Flight profile" title="Click on image to see Flight profile" class="ge-image" /></a>';
+								}
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Ident</span>';
+									$output .= '<a href="'.$globalURL.'/ident/'.$spotter_item['ident'].'" target="_blank">'.$spotter_item['ident'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Registration</span>';
+									$output .= '<a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Aircraft</span>';
+									$output .= '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" target="_blank">'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Airline</span>';
+									$output .= '<a href="'.$globalURL.'/airline/'.$spotter_item['airline_icao'].'" target="_blank">'.$spotter_item['airline_name'].'</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Departure Airport</span>';
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].')</a>';
+								$output .= '</div>';
+								$output .= '<div class="ge-row">';
+									$output .= '<span>Arrival Airport</span>';
+									$output .= '<a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a>';
+								$output .= '</div>';
 $output .= '<div class="ge-row">';
-                                    $output .= '<span>Date</span>';
-                                    $output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
-                                $output .= '</div>';
-                        $output .= '</div>';
-                    $output .= ' ]]></description>';
+									$output .= '<span>Date</span>';
+									$output .= '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'" target="_blank">'.date("D M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</a>';
+								$output .= '</div>';
+						$output .= '</div>';
+					$output .= ' ]]></description>';
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
 					$output .= '<Point>';
 						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
@@ -273,14 +273,14 @@ 
 				$output .= '</Placemark>'; 
 				
 				$output .= '<Style id="aircraft_'.$spotter_item['spotter_id'].'">';
-		    	$output .= '<IconStyle>';
-		      	$output .= '<Icon>';
-		        	$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
-		         $output .= '</Icon>';
-		         $output .= '<heading>'.$spotter_item['heading'].'</heading>';
-		        $output .= '</IconStyle>';
-		    $output .= '</Style>';
-	    }
+				$output .= '<IconStyle>';
+			  	$output .= '<Icon>';
+					$output .= '<href>http://www.flightairmap.fr/images/kml_aircraft.png</href>';
+				 $output .= '</Icon>';
+				 $output .= '<heading>'.$spotter_item['heading'].'</heading>';
+				$output .= '</IconStyle>';
+			$output .= '</Style>';
+		}
 	   }
 	   
 		 $output .= '</Document>';

Spacing +31 added lines, -31 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 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'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
         } else $sql_date = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -42,14 +42,14 @@ 
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -69,23 +69,23 @@ 
 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',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_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$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);
-$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,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', 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_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$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);
+$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, '');
       
       
 $output = '<?xml version="1.0" encoding="UTF-8"?>';
@@ -115,7 +115,7 @@ 
             
     if (!empty($spotter_array))
 	  {	  
-	    foreach($spotter_array as $spotter_item)
+	    foreach ($spotter_array as $spotter_item)
 	    {
 				
 				
@@ -132,7 +132,7 @@ 
 							    
 							foreach ($waypoint_pieces as $waypoint_coordinate)
 							{
-							        $output .=  $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
+							        $output .= $waypoint_coordinate[1].','.$waypoint_coordinate[0].','.$altitude.' ';
 							
 							}
 						$output .= '</coordinates>';
@@ -178,7 +178,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#departureAirport</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['departure_airport_longitude'].', '.$spotter_item['departure_airport_latitude'].', '.$spotter_item['departure_airport_altitude'].'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 
@@ -220,7 +220,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#arrivalAirport</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['arrival_airport_longitude'].', '.$spotter_item['arrival_airport_latitude'].', '.$spotter_item['arrival_airport_altitude'].'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 
@@ -267,7 +267,7 @@ 
                     $output .= ' ]]></description>';
 					$output .= '<styleUrl>#aircraft_'.$spotter_item['spotter_id'].'</styleUrl>';
 					$output .= '<Point>';
-						$output .=  '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
+						$output .= '<coordinates>'.$spotter_item['longitude'].', '.$spotter_item['latitude'].', '.$altitude.'</coordinates>';
 						$output .= '<altitudeMode>absolute</altitudeMode>';
 					$output .= '</Point>';
 				$output .= '</Placemark>'; 

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
-        } else $sql_date = '';
-} else $sql_date = '';
+        } else {
+        	$sql_date = '';
+        }
+        } else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
@@ -30,8 +34,12 @@ 
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
-} else $sql_altitude = '';
+        } else {
+        	$sql_altitude = '';
+        }
+        } else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -67,8 +75,11 @@ 
 
 header('Content-Type: text/xml');
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);

search-rss.php

Indentation +47 added lines, -47 removed lines

@@ -4,55 +4,55 @@ 
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
 if (isset($_GET['start_date'])) {
-        //for the date manipulation into the query
-        if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $end_date = $_GET['end_date'].":00";
-                $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
-                $start_date = $_GET['start_date'].":00";
-                $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
-                $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
-                $sql_date = $end_date;
-        } else $sql_date = '';
+		//for the date manipulation into the query
+		if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$end_date = $_GET['end_date'].":00";
+				$sql_date = $start_date.",".$end_date;
+		} else if($_GET['start_date'] != ""){
+				$start_date = $_GET['start_date'].":00";
+				$sql_date = $start_date;
+		} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+				$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
+				$sql_date = $end_date;
+		} else $sql_date = '';
 } else $sql_date = '';
 
 if (isset($_GET['highest_altitude'])) {
-        //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $start_altitude = $_GET['lowest_altitude'];
-                $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
-                $end_altitude = $_GET['highest_altitude'];
-                $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
-                $start_altitude = $_GET['lowest_altitude'].",60000";
-                $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
+		//for altitude manipulation
+		if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$start_altitude = $_GET['lowest_altitude'];
+				$sql_altitude = $start_altitude.",".$end_altitude;
+		} else if($_GET['highest_altitude'] != ""){
+				$end_altitude = $_GET['highest_altitude'];
+				$sql_altitude = $end_altitude;
+		} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+				$start_altitude = $_GET['lowest_altitude'].",60000";
+				$sql_altitude = $start_altitude;
+		} else $sql_altitude = '';
 } else $sql_altitude = '';
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
 {
-        if (!isset($_GET['number_results']))
-        {
-                $limit_start = 0;
-                $limit_end = 25;
-                $absolute_difference = 25;
-        } else {
-                if ($_GET['number_results'] > 1000){
-                        $_GET['number_results'] = 1000;
-                }
-                $limit_start = 0;
-                $limit_end = $_GET['number_results'];
-                $absolute_difference = $_GET['number_results'];
-        }
+		if (!isset($_GET['number_results']))
+		{
+				$limit_start = 0;
+				$limit_end = 25;
+				$absolute_difference = 25;
+		} else {
+				if ($_GET['number_results'] > 1000){
+						$_GET['number_results'] = 1000;
+				}
+				$limit_start = 0;
+				$limit_end = $_GET['number_results'];
+				$absolute_difference = $_GET['number_results'];
+		}
 }  else {
-        $limit_explode = explode(",", $_GET['limit']);
-        $limit_start = $limit_explode[0];
-        $limit_end = $limit_explode[1];
+		$limit_explode = explode(",", $_GET['limit']);
+		$limit_start = $limit_explode[0];
+		$limit_end = $limit_explode[1];
 }
 
 $absolute_difference = abs($limit_start - $limit_end);
@@ -102,16 +102,16 @@ 
   
   if (!empty($spotter_array))
   {
-    foreach($spotter_array as $spotter_item)
-    {
+	foreach($spotter_array as $spotter_item)
+	{
 
           
 		  print '<item>';
-		    print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
-		    print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
-		    print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
-		    print '<description>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</description>';
-		    print '<pubDate>'.$date.'</pubDate>';
+			print '<title>'.$spotter_item['ident'].' '.$spotter_item['airline_name'].' | '.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | '.$spotter_item['departure_airport'].' - '.$spotter_item['arrival_airport'].'</title>';
+			print '<link>http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</link>';
+			print '<guid isPermaLink="false">http://www.flightairmap.fr/flightid/'.$spotter_item['spotter_id'].'</guid>';
+			print '<description>Ident: '.$spotter_item['ident'].' | Registration: '.$spotter_item['registration'].' | Aircraft: '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].') | Airline: '.$spotter_item['airline_name'].' | Coming From: '.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_name'].', '.$spotter_item['departure_airport_country'].' ('.$spotter_item['departure_airport'].') | Flying to: '.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_name'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].') | Flew nearby on: '.date("M j, Y, g:i a T", strtotime($spotter_item['date_iso_8601'])).'</description>';
+			print '<pubDate>'.$date.'</pubDate>';
 		  print '</item>';
 		    
 		 }

Spacing +27 added lines, -27 removed lines

@@ -5,14 +5,14 @@ 
 $Spotter = new Spotter();
 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'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $end_date = $_GET['end_date'].":00";
                 $sql_date = $start_date.",".$end_date;
-        } else if($_GET['start_date'] != ""){
+        } else if ($_GET['start_date'] != "") {
                 $start_date = $_GET['start_date'].":00";
                 $sql_date = $start_date;
-        } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
+        } else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
         } else $sql_date = '';
@@ -20,21 +20,21 @@ 
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
-        if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
+        if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $start_altitude = $_GET['lowest_altitude'];
                 $sql_altitude = $start_altitude.",".$end_altitude;
-        } else if($_GET['highest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] != "") {
                 $end_altitude = $_GET['highest_altitude'];
                 $sql_altitude = $end_altitude;
-        } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
+        } else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
                 $start_altitude = $_GET['lowest_altitude'].",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']))
         {
@@ -42,14 +42,14 @@ 
                 $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 = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -72,23 +72,23 @@ 
 
 if (isset($_GET['sort'])) $sort = $_GET['sort'];
 else $sort = '';
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
-$registration = filter_input(INPUT_GET,'registratrion',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_id = filter_input(INPUT_GET,'pilot_id',FILTER_SANITIZE_STRING);
-$pilot_name = filter_input(INPUT_GET,'pilot_name',FILTER_SANITIZE_STRING);
-$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);
-$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,'');
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
+$registration = filter_input(INPUT_GET, 'registratrion', 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_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
+$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
+$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);
+$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, '');
  
 print '<?xml version="1.0" encoding="UTF-8" ?>';
 print '<rss xmlns:flightairmap="http://'.$_SERVER['HTTP_HOST'].''.htmlentities($_SERVER['REQUEST_URI']).'" version="2.0">';
@@ -102,7 +102,7 @@ 
   
   if (!empty($spotter_array))
   {
-    foreach($spotter_array as $spotter_item)
+    foreach ($spotter_array as $spotter_item)
     {
 
           

Braces +18 added lines, -7 removed lines

@@ -15,8 +15,12 @@ 
         } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
                 $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00";
                 $sql_date = $end_date;
-        } else $sql_date = '';
-} else $sql_date = '';
+        } else {
+        	$sql_date = '';
+        }
+        } else {
+	$sql_date = '';
+}
 
 if (isset($_GET['highest_altitude'])) {
         //for altitude manipulation
@@ -30,8 +34,12 @@ 
         } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
                 $start_altitude = $_GET['lowest_altitude'].",60000";
                 $sql_altitude = $start_altitude;
-        } else $sql_altitude = '';
-} else $sql_altitude = '';
+        } else {
+        	$sql_altitude = '';
+        }
+        } else {
+	$sql_altitude = '';
+}
 
 //calculuation for the pagination
 if(!isset($_GET['limit']))
@@ -49,7 +57,7 @@ 
                 $limit_end = $_GET['number_results'];
                 $absolute_difference = $_GET['number_results'];
         }
-}  else {
+} else {
         $limit_explode = explode(",", $_GET['limit']);
         $limit_start = $limit_explode[0];
         $limit_end = $limit_explode[1];
@@ -70,8 +78,11 @@ 
 
 $date = date("D, d M Y H:i:s T", time());
 
-if (isset($_GET['sort'])) $sort = $_GET['sort'];
-else $sort = '';
+if (isset($_GET['sort'])) {
+	$sort = $_GET['sort'];
+} else {
+	$sort = '';
+}
 $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
 $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING);
 $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING);