View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 6e7cd9...0ea4ac )
by Yannick
31:00
created
Status
Category
Toggle Patches
search.php 1 patch
Spacing   +95 added lines, -95 removed lines patch added patch discarded remove patch 
@@ -16,24 +16,24 @@  discard block
 
 block discarded – undo
16 16 
 $sql_date = '';
17 17 
 if (isset($_GET['start_date'])) {
18 18 
 	//for the date manipulation into the query
19 
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
19 
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
20 20 
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
21 21 
 			//$start_date = $_GET['start_date']." 00:00:00";
22 
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
22 
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
23 23 
 			//$end_date = $_GET['end_date']." 00:00:00";
24 
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
24 
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
25 25 
 			$sql_date = $start_date.",".$end_date;
26 26 
 		}
27 
-	} else if($_GET['start_date'] != ""){
27 
+	} else if ($_GET['start_date'] != "") {
28 28 
 		if (strtotime($_GET['start_date']) !== false) {
29 29 
 			//$start_date = $_GET['start_date']." 00:00:00";
30 
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
30 
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
31 31 
 			$sql_date = $start_date;
32 32 
 		}
33 
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
33 
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
34 34 
 		if (strtotime($_GET['end_date']) !== false) {
35 35 
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
36 
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
36 
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
37 37 
 			$sql_date = $end_date;
38 38 
 		}
39 39 
 	} else $sql_date = '';
 
@@ -41,21 +41,21 @@  discard block
 
 block discarded – undo
41 41
42 42 
 if (isset($_GET['highest_altitude'])) {
43 43 
 	//for altitude manipulation
44 
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
45 
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
46 
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
44 
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
45 
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
46 
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
47 47 
 		$sql_altitude = $start_altitude.",".$end_altitude;
48 
-	} else if($_GET['highest_altitude'] != ""){
49 
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
48 
+	} else if ($_GET['highest_altitude'] != "") {
49 
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
50 50 
 		$sql_altitude = $end_altitude;
51 
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
52 
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
51 
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
52 
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
53 53 
 		$sql_altitude = $start_altitude;
54 54 
 	} else $sql_altitude = '';
55 55 
 } else $sql_altitude = '';
56 56
57 57 
 //calculuation for the pagination
58 
-if(!isset($_GET['limit']))
58 
+if (!isset($_GET['limit']))
59 59 
 {
60 60 
 	if (!isset($_GET['number_results']))
61 61 
 	{
 
@@ -63,45 +63,45 @@  discard block
 
 block discarded – undo
63 63 
 		$limit_end = 25;
64 64 
 		$absolute_difference = 25;
65 65 
 	} else {
66 
-		if ($_GET['number_results'] > 1000){
66 
+		if ($_GET['number_results'] > 1000) {
67 67 
 			$_GET['number_results'] = 1000;
68 68 
 		}
69 69 
 		$limit_start = 0;
70 
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
71 
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
70 
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
71 
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
72 72 
 	}
73 
-}  else {
73 
+} else {
74 74 
 	$limit_explode = explode(",", $_GET['limit']);
75 
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
76 
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
75 
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
76 
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
77 77 
 }
78 78 
 $absolute_difference = abs($limit_start - $limit_end);
79 79 
 $limit_next = $limit_end + $absolute_difference;
80 80 
 $limit_previous_1 = $limit_start - $absolute_difference;
81 81 
 $limit_previous_2 = $limit_end - $absolute_difference;
82 82
83 
-if (!empty($_GET)){
84 
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
85 
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
86 
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
87 
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
88 
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
89 
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
90 
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
91 
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
92 
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
93 
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
94 
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
95 
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
96 
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
97 
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
98 
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
99 
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
100 
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
101 
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
102 
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
103 
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
104 
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
83 
+if (!empty($_GET)) {
84 
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
85 
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
86 
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
87 
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
88 
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
89 
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
90 
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
91 
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
92 
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
93 
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
94 
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
95 
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
96 
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
97 
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
98 
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
99 
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
100 
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
101 
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
102 
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
103 
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
104 
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
105 105 
 	if ($dist != '') {
106 106 
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
107 107 
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
 
@@ -109,9 +109,9 @@  discard block
 
 block discarded – undo
109 109 
 	if (!isset($sql_date)) $sql_date = '';
110 110 
 	if ($archive == 1) {
111 111 
 		$SpotterArchive = new SpotterArchive();
112 
-		$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
112 
+		$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
113 113 
 	} else {
114 
-		$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
114 
+		$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
115 115 
 	}
116 116
117 117 
 	print '<span class="sub-menu-statistic column mobile">';
 
@@ -144,12 +144,12 @@  discard block
 
 block discarded – undo
144 144 
 	//remove 3D=true parameter
145 145 
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
146 146 
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
147 
-	if (!isset($_GET['3D'])){
147 
+	if (!isset($_GET['3D'])) {
148 148 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
149 149 
 	} else {
150 150 
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
151 151 
 	}
152 
-	if (isset($_GET['3D'])){
152 
+	if (isset($_GET['3D'])) {
153 153 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
154 154 
 	} else {
155 155 
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
 
@@ -170,30 +170,30 @@  discard block
 
 block discarded – undo
170 170 
 		print '<div class="column">';
171 171 
 		print '<div class="info">';
172 172 
 		print '<h1>'._("Search Results for").' ';
173 
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
174 
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
175 
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
176 
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
177 
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
178 
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
179 
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
180 
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
181 
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
182 
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
183 
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
184 
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
185 
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
186 
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
187 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
188 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
189 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
190 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
191 
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
192 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
193 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
194 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
195 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
196 
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
173 
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
174 
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
175 
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
176 
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
177 
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
178 
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
179 
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
180 
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
181 
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
182 
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
183 
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
184 
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
185 
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
186 
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
187 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
188 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
189 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
190 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
191 
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
192 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
193 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
194 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
195 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
196 
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
197 197 
 		print '</h1>';
198 198 
 		print '</div>';
199 199 
 
@@ -300,7 +300,7 @@  discard block
 
 block discarded – undo
300 300 
 					    </select>
301 301 
 					</div>
302 302 
 				</div>
303 
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
303 
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
304 304 
 				<div class="form-group">
305 305 
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
306 306 
 						<div class="col-sm-10">
 
@@ -309,7 +309,7 @@  discard block
 
 block discarded – undo
309 309 
 							</select>
310 310 
 						</div>
311 311 
 				</div>
312 
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
312 
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
313 313 
 				<div class="form-group">
314 314 
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label>
315 315 
 					<div class="col-sm-10">
 
@@ -332,7 +332,7 @@  discard block
 
 block discarded – undo
332 332 
 					</div>
333 333 
 				</div>
334 334 
 <?php
335 
-}else {
335 
+} else {
336 336 
 ?>
337 337 
 				<div class="form-group">
338 338 
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -345,8 +345,8 @@  discard block
 
 block discarded – undo
345 345 
 ?>
346 346 
 				<div class="form-group">
347 347 
 					<div class="col-sm-offset-2 col-sm-10">
348 
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
349 
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
348 
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
349 
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
350 350 
 					</div>
351 351 
 				</div>
352 352 
 			</fieldset>
 
@@ -360,7 +360,7 @@  discard block
 
 block discarded – undo
360 360 
 						</select>
361 361 
 					</div>
362 362 
 				</div>
363 
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
363 
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
364 364 
 				<div class="form-group">
365 365 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
366 366 
 					<div class="col-sm-10">
 
@@ -369,7 +369,7 @@  discard block
 
 block discarded – undo
369 369 
 						</select>
370 370 
 					</div>
371 371 
 				</div>
372 
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
372 
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
373 373 
 				<div class="form-group">
374 374 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
375 375 
 					<div class="col-sm-10">
 
@@ -378,10 +378,10 @@  discard block
 
 block discarded – undo
378 378 
 				</div>
379 379 
 				<div class="form-group">
380 380 
 					<div class="col-sm-offset-2 col-sm-10">
381 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
382 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
383 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
384 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
381 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
382 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
383 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
384 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
385 385 
 					</div>
386 386 
 				</div>
387 387 
 			</fieldset>
 
@@ -395,7 +395,7 @@  discard block
 
 block discarded – undo
395 395 
 						</select>
396 396 
 					</div>
397 397 
 				</div>
398 
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
398 
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
399 399 
 				<div class="form-group">
400 400 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
401 401 
 					<div class="col-sm-10">
 
@@ -404,7 +404,7 @@  discard block
 
 block discarded – undo
404 404 
 						</select>
405 405 
 					</div>
406 406 
 				</div>
407 
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
407 
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
408 408 
 			</fieldset>
409 409 
 			<fieldset>
410 410 
 				<legend><?php echo _("Route"); ?></legend>
 
@@ -416,7 +416,7 @@  discard block
 
 block discarded – undo
416 416 
 						</select>
417 417 
 					</div>
418 418 
 				</div>
419 
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
419 
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
420 420 
 				<div class="form-group">
421 421 
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label>
422 422 
 					<div class="col-sm-10">
 
@@ -425,7 +425,7 @@  discard block
 
 block discarded – undo
425 425 
 						</select>
426 426 
 					</div>
427 427 
 				</div>
428 
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
428 
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
429 429 
 			</fieldset>
430 430 
 			<fieldset>
431 431 
 				<legend><?php echo _("Date"); ?></legend>
 
@@ -479,9 +479,9 @@  discard block
 
 block discarded – undo
479 479 
 						<option></option>
480 480 
 <?php
481 481 
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
482 
-foreach($altitude_array as $altitude)
482 
+foreach ($altitude_array as $altitude)
483 483 
 {
484 
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
484 
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
485 485 
 	{
486 486 
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
487 487 
 	} else {
 
@@ -499,9 +499,9 @@  discard block
 
 block discarded – undo
499 499 
 					<option></option>
500 500 
 <?php
501 501 
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
502 
-foreach($altitude_array as $altitude)
502 
+foreach ($altitude_array as $altitude)
503 503 
 {
504 
-	if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
504 
+	if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
505 505 
 	{
506 506 
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
507 507 
 	} else {
 
@@ -540,10 +540,10 @@  discard block
 
 block discarded – undo
540 540 
 				<div class="col-sm-10">
541 541 
 					<select class="form-control" name="number_results">
542 542 
 <?php
543 
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
544 
-foreach($number_results_array as $number)
543 
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
544 
+foreach ($number_results_array as $number)
545 545 
 {
546 
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
546 
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
547 547 
 	{
548 548 
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
549 549 
 	} else {
 
@@ -562,7 +562,7 @@  discard block
 
 block discarded – undo
562 562 
 		<fieldset>
563 563 
 			<div class="form-group">
564 564 
 				<div class="col-sm-offset-2 col-sm-10">
565 
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
565 
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
566 566 
 					<p class="help-block">Disabled in demo</p>
567 567 
 				</div>
568 568 
 			</div>
 
@@ -573,7 +573,7 @@  discard block
 
 block discarded – undo
573 573 
 		<fieldset>
574 574 
 			<div class="form-group">
575 575 
 				<div class="col-sm-offset-2 col-sm-10">
576 
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
576 
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
577 577 
 				</div>
578 578 
 			</div>
579 579 
 		</fieldset>
Please login to merge, or discard this patch.