View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( b7c521...b3c778 )
by Yannick
06:35
created
Status
Category
Toggle Patches
search.php 2 patches
Spacing   +82 added lines, -82 removed lines patch added patch discarded remove patch 
@@ -16,14 +16,14 @@  discard block
 
 block discarded – undo
16 16
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 
 		$start_date = $_GET['start_date']." 00:00:00";
21 21 
 		$end_date = $_GET['end_date']." 00:00:00";
22 22 
 		$sql_date = $start_date.",".$end_date;
23 
-	} else if($_GET['start_date'] != ""){
23 
+	} else if ($_GET['start_date'] != "") {
24 24 
 		$start_date = $_GET['start_date']." 00:00:00";
25 25 
 		$sql_date = $start_date;
26 
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
26 
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
27 27 
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
28 28 
 		$sql_date = $end_date;
29 29 
 	} else $sql_date = '';
 
@@ -31,21 +31,21 @@  discard block
 
 block discarded – undo
31 31
32 32 
 if (isset($_GET['highest_altitude'])) {
33 33 
 	//for altitude manipulation
34 
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
34 
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
35 35 
 		$end_altitude = $_GET['highest_altitude'];
36 36 
 		$start_altitude = $_GET['lowest_altitude'];
37 37 
 		$sql_altitude = $start_altitude.",".$end_altitude;
38 
-	} else if($_GET['highest_altitude'] != ""){
38 
+	} else if ($_GET['highest_altitude'] != "") {
39 39 
 		$end_altitude = $_GET['highest_altitude'];
40 40 
 		$sql_altitude = $end_altitude;
41 
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
41 
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
42 42 
 		$start_altitude = $_GET['lowest_altitude'].",60000";
43 43 
 		$sql_altitude = $start_altitude;
44 44 
 	} else $sql_altitude = '';
45 45 
 } else $sql_altitude = '';
46 46
47 47 
 //calculuation for the pagination
48 
-if(!isset($_GET['limit']))
48 
+if (!isset($_GET['limit']))
49 49 
 {
50 50 
 	if (!isset($_GET['number_results']))
51 51 
 	{
 
@@ -53,14 +53,14 @@  discard block
 
 block discarded – undo
53 53 
 		$limit_end = 25;
54 54 
 		$absolute_difference = 25;
55 55 
 	} else {
56 
-		if ($_GET['number_results'] > 1000){
56 
+		if ($_GET['number_results'] > 1000) {
57 57 
 			$_GET['number_results'] = 1000;
58 58 
 		}
59 59 
 		$limit_start = 0;
60 60 
 		$limit_end = $_GET['number_results'];
61 61 
 		$absolute_difference = $_GET['number_results'];
62 62 
 	}
63 
-}  else {
63 
+} else {
64 64 
 	$limit_explode = explode(",", $_GET['limit']);
65 65 
 	$limit_start = $limit_explode[0];
66 66 
 	$limit_end = $limit_explode[1];
 
@@ -70,28 +70,28 @@  discard block
 
 block discarded – undo
70 70 
 $limit_previous_1 = $limit_start - $absolute_difference;
71 71 
 $limit_previous_2 = $limit_end - $absolute_difference;
72 72
73 
-if (!empty($_GET)){
74 
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
75 
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
76 
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
77 
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
78 
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
79 
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
80 
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
81 
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
82 
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
83 
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
84 
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
85 
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
86 
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
87 
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
88 
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
89 
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
90 
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
91 
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
92 
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_STRING);
93 
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_STRING);
94 
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
73 
+if (!empty($_GET)) {
74 
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
75 
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
76 
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
77 
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
78 
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
79 
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
80 
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
81 
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
82 
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
83 
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
84 
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
85 
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
86 
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
87 
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
88 
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
89 
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
90 
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
91 
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
92 
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_STRING);
93 
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_STRING);
94 
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
95 95 
 	if ($dist != '') {
96 96 
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
97 97 
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
 
@@ -99,9 +99,9 @@  discard block
 
 block discarded – undo
99 99 
 	if (!isset($sql_date)) $sql_date = '';
100 100 
 	if ($archive == 1) {
101 101 
 		$SpotterArchive = new SpotterArchive();
102 
-		$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);
102 
+		$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);
103 103 
 	} else {
104 
-		$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);
104 
+		$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);
105 105 
 	}
106 106
107 107 
 	print '<span class="sub-menu-statistic column mobile">';
 
@@ -134,12 +134,12 @@  discard block
 
 block discarded – undo
134 134 
 	//remove 3D=true parameter
135 135 
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
136 136 
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
137 
-	if (!isset($_GET['3D'])){
137 
+	if (!isset($_GET['3D'])) {
138 138 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
139 139 
 	} else {
140 140 
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
141 141 
 	}
142 
-	if (isset($_GET['3D'])){
142 
+	if (isset($_GET['3D'])) {
143 143 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
144 144 
 	} else {
145 145 
 		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>';
 
@@ -160,30 +160,30 @@  discard block
 
 block discarded – undo
160 160 
 		print '<div class="column">';
161 161 
 		print '<div class="info">';
162 162 
 		print '<h1>'._("Search Results for").' ';
163 
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$_GET['q'].'</span> '; }
164 
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$_GET['aircraft'].'</span> '; }
165 
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$_GET['manufacturer'].'</span> '; }
166 
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$_GET['registration'].'</span> '; }
167 
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$_GET['highlights'].'</span> '; }
168 
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$_GET['airline'].'</span> '; }
169 
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$_GET['airline_country'].'</span> '; }
170 
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$_GET['airline_type'].'</span> '; }
171 
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$_GET['airport'].'</span> '; }
172 
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$_GET['airport_country'].'</span> '; }
173 
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$_GET['callsign'].'</span> '; }
174 
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$_GET['owner'].'</span> '; }
175 
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$_GET['pilot_id'].'</span> '; }
176 
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$_GET['pilot_name'].'</span> '; }
177 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$_GET['departure_airport_route'].'</span> '; }
178 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$_GET['arrival_airport_route'].'</span> '; }
179 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$_GET['departure_airport_route'].'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
180 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$_GET['start_date'].'</span> '; }
181 
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$_GET['end_date'].'</span> '; }
182 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$_GET['start_date'].'</span> and <span>'.$_GET['end_date'].'</span> '; }
183 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($_GET['lowest_altitude']).' feet</span> '; }
184 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($_GET['highest_altitude']).' feet</span> '; }
185 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($_GET['lowest_altitude']).' feet</span> '._("and").' <span>'.number_format($_GET['highest_altitude']).' feet</span> '; }
186 
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$_GET['number_results'].'</span> '; }
163 
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$_GET['q'].'</span> '; }
164 
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$_GET['aircraft'].'</span> '; }
165 
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$_GET['manufacturer'].'</span> '; }
166 
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$_GET['registration'].'</span> '; }
167 
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$_GET['highlights'].'</span> '; }
168 
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$_GET['airline'].'</span> '; }
169 
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$_GET['airline_country'].'</span> '; }
170 
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$_GET['airline_type'].'</span> '; }
171 
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$_GET['airport'].'</span> '; }
172 
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$_GET['airport_country'].'</span> '; }
173 
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$_GET['callsign'].'</span> '; }
174 
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$_GET['owner'].'</span> '; }
175 
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$_GET['pilot_id'].'</span> '; }
176 
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$_GET['pilot_name'].'</span> '; }
177 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$_GET['departure_airport_route'].'</span> '; }
178 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$_GET['arrival_airport_route'].'</span> '; }
179 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$_GET['departure_airport_route'].'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
180 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$_GET['start_date'].'</span> '; }
181 
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$_GET['end_date'].'</span> '; }
182 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$_GET['start_date'].'</span> and <span>'.$_GET['end_date'].'</span> '; }
183 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($_GET['lowest_altitude']).' feet</span> '; }
184 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($_GET['highest_altitude']).' feet</span> '; }
185 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($_GET['lowest_altitude']).' feet</span> '._("and").' <span>'.number_format($_GET['highest_altitude']).' feet</span> '; }
186 
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$_GET['number_results'].'</span> '; }
187 187 
 		print '</h1>';
188 188 
 		print '</div>';
189 189 
 
@@ -290,7 +290,7 @@  discard block
 
 block discarded – undo
290 290 
 					    </select>
291 291 
 					</div>
292 292 
 				</div>
293 
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $_GET['manufacturer']; ?>')</script>
293 
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $_GET['manufacturer']; ?>')</script>
294 294 
 				<div class="form-group">
295 295 
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
296 296 
 						<div class="col-sm-10">
 
@@ -299,7 +299,7 @@  discard block
 
 block discarded – undo
299 299 
 							</select>
300 300 
 						</div>
301 301 
 				</div>
302 
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $_GET['aircraft_icao']; ?>');</script>
302 
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $_GET['aircraft_icao']; ?>');</script>
303 303 
 				<div class="form-group">
304 304 
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label>
305 305 
 					<div class="col-sm-10">
 
@@ -322,7 +322,7 @@  discard block
 
 block discarded – undo
322 322 
 					</div>
323 323 
 				</div>
324 324 
 <?php
325 
-}else {
325 
+} else {
326 326 
 ?>
327 327 
 				<div class="form-group">
328 328 
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -335,8 +335,8 @@  discard block
 
 block discarded – undo
335 335 
 ?>
336 336 
 				<div class="form-group">
337 337 
 					<div class="col-sm-offset-2 col-sm-10">
338 
-					<!--<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>-->
339 
-					<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>
338 
+					<!--<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>-->
339 
+					<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>
340 340 
 					</div>
341 341 
 				</div>
342 342 
 			</fieldset>
 
@@ -350,7 +350,7 @@  discard block
 
 block discarded – undo
350 350 
 						</select>
351 351 
 					</div>
352 352 
 				</div>
353 
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $_GET['airline']; ?>');</script>
353 
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $_GET['airline']; ?>');</script>
354 354 
 				<div class="form-group">
355 355 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
356 356 
 					<div class="col-sm-10">
 
@@ -359,7 +359,7 @@  discard block
 
 block discarded – undo
359 359 
 						</select>
360 360 
 					</div>
361 361 
 				</div>
362 
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $_GET['airline_country']; ?>');</script>
362 
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $_GET['airline_country']; ?>');</script>
363 363 
 				<div class="form-group">
364 364 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
365 365 
 					<div class="col-sm-10">
 
@@ -368,10 +368,10 @@  discard block
 
 block discarded – undo
368 368 
 				</div>
369 369 
 				<div class="form-group">
370 370 
 					<div class="col-sm-offset-2 col-sm-10">
371 
-						<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>
372 
-						<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>
373 
-						<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>
374 
-						<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>
371 
+						<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>
372 
+						<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>
373 
+						<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>
374 
+						<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>
375 375 
 					</div>
376 376 
 				</div>
377 377 
 			</fieldset>
 
@@ -385,7 +385,7 @@  discard block
 
 block discarded – undo
385 385 
 						</select>
386 386 
 					</div>
387 387 
 				</div>
388 
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $_GET['airport_icao']; ?>');</script>
388 
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $_GET['airport_icao']; ?>');</script>
389 389 
 				<div class="form-group">
390 390 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
391 391 
 					<div class="col-sm-10">
 
@@ -394,7 +394,7 @@  discard block
 
 block discarded – undo
394 394 
 						</select>
395 395 
 					</div>
396 396 
 				</div>
397 
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $_GET['airport_country']; ?>');</script>
397 
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $_GET['airport_country']; ?>');</script>
398 398 
 			</fieldset>
399 399 
 			<fieldset>
400 400 
 				<legend><?php echo _("Route"); ?></legend>
 
@@ -406,7 +406,7 @@  discard block
 
 block discarded – undo
406 406 
 						</select>
407 407 
 					</div>
408 408 
 				</div>
409 
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $_GET['departure_airport_route']; ?>');</script>
409 
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $_GET['departure_airport_route']; ?>');</script>
410 410 
 				<div class="form-group">
411 411 
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label>
412 412 
 					<div class="col-sm-10">
 
@@ -415,7 +415,7 @@  discard block
 
 block discarded – undo
415 415 
 						</select>
416 416 
 					</div>
417 417 
 				</div>
418 
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $_GET['arrival_airport_route']; ?>');</script>
418 
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $_GET['arrival_airport_route']; ?>');</script>
419 419 
 			</fieldset>
420 420 
 			<fieldset>
421 421 
 				<legend><?php echo _("Date"); ?></legend>
 
@@ -469,9 +469,9 @@  discard block
 
 block discarded – undo
469 469 
 						<option></option>
470 470 
 <?php
471 471 
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
472 
-foreach($altitude_array as $altitude)
472 
+foreach ($altitude_array as $altitude)
473 473 
 {
474 
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
474 
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
475 475 
 	{
476 476 
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
477 477 
 	} else {
 
@@ -489,9 +489,9 @@  discard block
 
 block discarded – undo
489 489 
 					<option></option>
490 490 
 <?php
491 491 
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
492 
-foreach($altitude_array as $altitude)
492 
+foreach ($altitude_array as $altitude)
493 493 
 {
494 
-	if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
494 
+	if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
495 495 
 	{
496 496 
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
497 497 
 	} else {
 
@@ -530,10 +530,10 @@  discard block
 
 block discarded – undo
530 530 
 				<div class="col-sm-10">
531 531 
 					<select class="form-control" name="number_results">
532 532 
 <?php
533 
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
534 
-foreach($number_results_array as $number)
533 
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
534 
+foreach ($number_results_array as $number)
535 535 
 {
536 
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
536 
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
537 537 
 	{
538 538 
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
539 539 
 	} else {
 
@@ -551,7 +551,7 @@  discard block
 
 block discarded – undo
551 551 
 		<fieldset>
552 552 
 			<div class="form-group">
553 553 
 				<div class="col-sm-offset-2 col-sm-10">
554 
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
554 
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
555 555 
 				</div>
556 556 
 			</div>
557 557 
 		</fieldset>
Please login to merge, or discard this patch.
Braces   +116 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -26,8 +26,12 @@  discard block
 
 block discarded – undo
26 26 
 	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
27 27 
 		$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
28 28 
 		$sql_date = $end_date;
29 
-	} else $sql_date = '';
30 
-} else $sql_date = '';
29 
+	} else {
30 
+		$sql_date = '';
31 
+	}
32 
+	} else {
33 
+	$sql_date = '';
34 
+}
31 35
32 36 
 if (isset($_GET['highest_altitude'])) {
33 37 
 	//for altitude manipulation
 
@@ -41,8 +45,12 @@  discard block
 
 block discarded – undo
41 45 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
42 46 
 		$start_altitude = $_GET['lowest_altitude'].",60000";
43 47 
 		$sql_altitude = $start_altitude;
44 
-	} else $sql_altitude = '';
45 
-} else $sql_altitude = '';
48 
+	} else {
49 
+		$sql_altitude = '';
50 
+	}
51 
+	} else {
52 
+	$sql_altitude = '';
53 
+}
46 54
47 55 
 //calculuation for the pagination
48 56 
 if(!isset($_GET['limit']))
 
@@ -60,7 +68,7 @@  discard block
 
 block discarded – undo
60 68 
 		$limit_end = $_GET['number_results'];
61 69 
 		$absolute_difference = $_GET['number_results'];
62 70 
 	}
63 
-}  else {
71 
+} else {
64 72 
 	$limit_explode = explode(",", $_GET['limit']);
65 73 
 	$limit_start = $limit_explode[0];
66 74 
 	$limit_end = $limit_explode[1];
 
@@ -93,10 +101,15 @@  discard block
 
 block discarded – undo
93 101 
 	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_STRING);
94 102 
 	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
95 103 
 	if ($dist != '') {
96 
-		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
97 
-		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
104 
+		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') {
105 
+			$dist = $dist*1.60934;
106 
+		} elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') {
107 
+			$dist = $dist*1.852;
108 
+		}
109 
+	}
110 
+	if (!isset($sql_date)) {
111 
+		$sql_date = '';
98 112 
 	}
99 
-	if (!isset($sql_date)) $sql_date = '';
100 113 
 	if ($archive == 1) {
101 114 
 		$SpotterArchive = new SpotterArchive();
102 115 
 		$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);
 
@@ -164,7 +177,10 @@  discard block
 
 block discarded – undo
164 177 
 		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$_GET['aircraft'].'</span> '; }
165 178 
 		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$_GET['manufacturer'].'</span> '; }
166 179 
 		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$_GET['registration'].'</span> '; }
167 
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$_GET['highlights'].'</span> '; }
180 
+		if (isset($_GET['highlights'])) {
181 
+			if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$_GET['highlights'].'</span> ';
182 
+		}
183 
+		}
168 184 
 		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$_GET['airline'].'</span> '; }
169 185 
 		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$_GET['airline_country'].'</span> '; }
170 186 
 		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$_GET['airline_type'].'</span> '; }
 
@@ -275,7 +291,10 @@  discard block
 
 block discarded – undo
275 291 
 			<div class="form-group">
276 292 
 				<label class="control-label col-sm-2"><?php echo _("Keywords"); ?></label>
277 293 
 				<div class="col-sm-10">
278 
-					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) print $_GET['q']; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
294 
+					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) {
295 
+	print $_GET['q'];
296 
+}
297 
+?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
279 298 
 				</div>
280 299 
 			</div>
281 300 
 		</fieldset>
 
@@ -290,7 +309,10 @@  discard block
 
 block discarded – undo
290 309 
 					    </select>
291 310 
 					</div>
292 311 
 				</div>
293 
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $_GET['manufacturer']; ?>')</script>
312 
+				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) {
313 
+	print $_GET['manufacturer'];
314 
+}
315 
+?>')</script>
294 316 
 				<div class="form-group">
295 317 
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
296 318 
 						<div class="col-sm-10">
 
@@ -299,11 +321,17 @@  discard block
 
 block discarded – undo
299 321 
 							</select>
300 322 
 						</div>
301 323 
 				</div>
302 
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $_GET['aircraft_icao']; ?>');</script>
324 
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) {
325 
+	print $_GET['aircraft_icao'];
326 
+}
327 
+?>');</script>
303 328 
 				<div class="form-group">
304 329 
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label>
305 330 
 					<div class="col-sm-10">
306 
-						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) print $_GET['registration']; ?>" size="8" />
331 
+						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) {
332 
+	print $_GET['registration'];
333 
+}
334 
+?>" size="8" />
307 335 
 					</div>
308 336 
 				</div>
309 337 
 <?php
 
@@ -312,22 +340,31 @@  discard block
 
 block discarded – undo
312 340 
 				<div class="form-group">
313 341 
 					<label class="control-label col-sm-2"><?php echo _("Pilot id"); ?></label>
314 342 
 					<div class="col-sm-10">
315 
-						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $_GET['pilot_id']; ?>" size="15" />
343 
+						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) {
344 
+	print $_GET['pilot_id'];
345 
+}
346 
+?>" size="15" />
316 347 
 					</div>
317 348 
 				</div>
318 349 
 				<div class="form-group">
319 350 
 					<label class="control-label col-sm-2"><?php echo _("Pilot name"); ?></label>
320 351 
 					<div class="col-sm-10">
321 
-						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $_GET['pilot_name']; ?>" size="15" />
352 
+						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) {
353 
+	print $_GET['pilot_name'];
354 
+}
355 
+?>" size="15" />
322 356 
 					</div>
323 357 
 				</div>
324 358 
 <?php
325 
-}else {
359 
+} else {
326 360 
 ?>
327 361 
 				<div class="form-group">
328 362 
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label>
329 363 
 					<div class="col-sm-10">
330 
-						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) print $_GET['owner']; ?>" size="15" />
364 
+						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) {
365 
+	print $_GET['owner'];
366 
+}
367 
+?>" size="15" />
331 368 
 					</div>
332 369 
 				</div>
333 370 
 <?php
 
@@ -335,8 +372,14 @@  discard block
 
 block discarded – undo
335 372 
 ?>
336 373 
 				<div class="form-group">
337 374 
 					<div class="col-sm-offset-2 col-sm-10">
338 
-					<!--<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>-->
339 
-					<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>
375 
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
376 
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
377 
+}
378 
+} ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
379 
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
380 
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
381 
+}
382 
+} ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
340 383 
 					</div>
341 384 
 				</div>
342 385 
 			</fieldset>
 
@@ -350,7 +393,10 @@  discard block
 
 block discarded – undo
350 393 
 						</select>
351 394 
 					</div>
352 395 
 				</div>
353 
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $_GET['airline']; ?>');</script>
396 
+				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) {
397 
+	print $_GET['airline'];
398 
+}
399 
+?>');</script>
354 400 
 				<div class="form-group">
355 401 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
356 402 
 					<div class="col-sm-10">
 
@@ -359,19 +405,34 @@  discard block
 
 block discarded – undo
359 405 
 						</select>
360 406 
 					</div>
361 407 
 				</div>
362 
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $_GET['airline_country']; ?>');</script>
408 
+				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) {
409 
+	print $_GET['airline_country'];
410 
+}
411 
+?>');</script>
363 412 
 				<div class="form-group">
364 413 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
365 414 
 					<div class="col-sm-10">
366 
-						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $_GET['callsign']; ?>" size="8" />
415 
+						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) {
416 
+	print $_GET['callsign'];
417 
+}
418 
+?>" size="8" />
367 419 
 					</div>
368 420 
 				</div>
369 421 
 				<div class="form-group">
370 422 
 					<div class="col-sm-offset-2 col-sm-10">
371 423 
 						<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>
372 
-						<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>
373 
-						<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>
374 
-						<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>
424 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) {
425 
+	if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"';
426 
+}
427 
+} ?>> <?php echo _("Only Passenger airlines"); ?></label>
428 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) {
429 
+	if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"';
430 
+}
431 
+} ?>> <?php echo _("Only Cargo airlines"); ?></label>
432 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) {
433 
+	if ( $_GET['airline_type'] == "military"){ print 'checked="checked"';
434 
+}
435 
+} ?>> <?php echo _("Only Military airlines"); ?></label>
375 436 
 					</div>
376 437 
 				</div>
377 438 
 			</fieldset>
 
@@ -385,7 +446,10 @@  discard block
 
 block discarded – undo
385 446 
 						</select>
386 447 
 					</div>
387 448 
 				</div>
388 
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $_GET['airport_icao']; ?>');</script>
449 
+				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) {
450 
+	print $_GET['airport_icao'];
451 
+}
452 
+?>');</script>
389 453 
 				<div class="form-group">
390 454 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
391 455 
 					<div class="col-sm-10">
 
@@ -394,7 +458,10 @@  discard block
 
 block discarded – undo
394 458 
 						</select>
395 459 
 					</div>
396 460 
 				</div>
397 
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $_GET['airport_country']; ?>');</script>
461 
+				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) {
462 
+	print $_GET['airport_country'];
463 
+}
464 
+?>');</script>
398 465 
 			</fieldset>
399 466 
 			<fieldset>
400 467 
 				<legend><?php echo _("Route"); ?></legend>
 
@@ -406,7 +473,10 @@  discard block
 
 block discarded – undo
406 473 
 						</select>
407 474 
 					</div>
408 475 
 				</div>
409 
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $_GET['departure_airport_route']; ?>');</script>
476 
+				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) {
477 
+	print $_GET['departure_airport_route'];
478 
+}
479 
+?>');</script>
410 480 
 				<div class="form-group">
411 481 
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label>
412 482 
 					<div class="col-sm-10">
 
@@ -415,7 +485,10 @@  discard block
 
 block discarded – undo
415 485 
 						</select>
416 486 
 					</div>
417 487 
 				</div>
418 
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $_GET['arrival_airport_route']; ?>');</script>
488 
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) {
489 
+	print $_GET['arrival_airport_route'];
490 
+}
491 
+?>');</script>
419 492 
 			</fieldset>
420 493 
 			<fieldset>
421 494 
 				<legend><?php echo _("Date"); ?></legend>
 
@@ -423,7 +496,10 @@  discard block
 
 block discarded – undo
423 496 
 					<label class="control-label col-sm-2"><?php echo _("Start Date"); ?></label>
424 497 
 					<div class="col-sm-10">
425 498 
 						<div class='input-group date' id='datetimepicker1'>
426 
-							<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) print $_GET['start_date']; ?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
499 
+							<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date'])) {
500 
+	print $_GET['start_date'];
501 
+}
502 
+?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
427 503 
 							<span class="input-group-addon">
428 504 
 								<span class="glyphicon glyphicon-calendar"></span>
429 505 
 							</span>
 
@@ -434,7 +510,10 @@  discard block
 
 block discarded – undo
434 510 
 					<label class="control-label col-sm-2"><?php echo _("End Date"); ?></label>
435 511 
 					<div class="col-sm-10">
436 512 
 						<div class='input-group date' id='datetimepicker2'>
437 
-						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) print $_GET['end_date']; ?>" placeholder="<?php echo _("End Date/Time"); ?>" />
513 
+						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date'])) {
514 
+	print $_GET['end_date'];
515 
+}
516 
+?>" placeholder="<?php echo _("End Date/Time"); ?>" />
438 517 
 						<span class="input-group-addon">
439 518 
 							<span class="glyphicon glyphicon-calendar"></span>
440 519 
 						</span>
 
@@ -517,7 +596,12 @@  discard block
 
 block discarded – undo
517 596 
 				</div>
518 597 
 			</div>
519 598 
 			<div class="form-group">
520 
-				<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label>
599 
+				<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) {
600 
+	print $globalDistanceUnit;
601 
+} else {
602 
+	print 'km';
603 
+}
604 
+print ')'; ?></label>
521 605 
 				<div class="col-sm-10">
522 606 
 					<input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" />
523 607 
 				</div>
Please login to merge, or discard this patch.
install/index.php 3 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch 
@@ -305,17 +305,17 @@  discard block
 
 block discarded – undo
305 305 
 				</tr>
306 306 
 				<!--
307 307 
 		<?php
308 
-		    require_once(dirname(__FILE__).'/../require/class.Connection.php');
309 
-		    $Connection = new Connection();
308 
+			require_once(dirname(__FILE__).'/../require/class.Connection.php');
309 
+			$Connection = new Connection();
310 310 
 		?>
311 311 
 				-->
312 312 
 		<?php
313 
-		    if ($Connection->db != NULL) {
313 
+			if ($Connection->db != NULL) {
314 314 
 			if ($Connection->tableExists('source_location')) {
315 
-			    require_once(dirname(__FILE__).'/../require/class.Source.php');
316 
-			    $Source = new Source();
317 
-			    $alllocations = $Source->getAllLocationInfo();
318 
-			    foreach ($alllocations as $location) {
315 
+				require_once(dirname(__FILE__).'/../require/class.Source.php');
316 
+				$Source = new Source();
317 
+				$alllocations = $Source->getAllLocationInfo();
318 
+				foreach ($alllocations as $location) {
319 319 
 		?>
320 320 
 				<tr>
321 321 
 	    				<input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" />
 
@@ -329,9 +329,9 @@  discard block
 
 block discarded – undo
329 329 
 				</tr>
330 330
331 331 
 		<?php
332 
-			    }
332 
+				}
333 
+			}
333 334 
 			}
334 
-		    }
335 335 
 		?>
336 336
337 337 
 				<tr>
 
@@ -424,12 +424,12 @@  discard block
 
 block discarded – undo
424 424 
 ?>
425 425 
 							<tr>
426 426 
 								<?php
427 
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
427 
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
428 428 
 								?>
429 429 
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
430 430 
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
431 431 
 								<?php
432 
-								    } else {
432 
+									} else {
433 433 
 									$hostport = explode(':',$source['host']);
434 434 
 									if (isset($hostport[1])) {
435 435 
 										$host = $hostport[0];
 
@@ -442,7 +442,7 @@  discard block
 
 block discarded – undo
442 442 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
443 443 
 								<td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td>
444 444 
 								<?php
445 
-								    }
445 
+									}
446 446 
 								?>
447 447 
 								<td>
448 448 
 									<select name="format[]" id="format">
 
@@ -758,7 +758,7 @@  discard block
 
 block discarded – undo
758 758 
 			<br />
759 759 
 			<p>
760 760 
 			<?php
761 
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
761 
+				if (extension_loaded('gd') && function_exists('gd_info')) {
762 762 
 			?>
763 763 
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
764 764 
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
 
@@ -768,11 +768,11 @@  discard block
 
 block discarded – undo
768 768 
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
769 769 
 			<?php
770 770 
 				}
771 
-			    } else {
771 
+				} else {
772 772 
 			?>
773 773 
 				<b>PHP GD is not installed, you can t change color of aircraft icon on map</b>
774 774 
 			<?php
775 
-			    }
775 
+				}
776 776 
 			?>
777 777 
 			</p>
778 778 
 			<br />
 
@@ -791,7 +791,7 @@  discard block
 
 block discarded – undo
791 791 
 	</p>
792 792 
 <?php
793 793 
 	require('../footer.php');
794 
-        exit;
794 
+		exit;
795 795 
 }
796 796
797 797 
 $settings = array();
 
@@ -881,8 +881,8 @@  discard block
 
 block discarded – undo
881 881
882 882 
 	$sources = array();
883 883 
 	foreach ($source_name as $keys => $name) {
884 
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
885 
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
884 
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
885 
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
886 886 
 	}
887 887 
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
888 888 
 
@@ -1176,14 +1176,14 @@  discard block
 
 block discarded – undo
1176 1176
1177 1177 
 	// Set some defaults values...
1178 1178 
 	if (!isset($globalAircraftImageSources)) {
1179 
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1180 
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1179 
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1180 
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1181 1181 
 	}
1182 1182
1183 1183 
 	if (!isset($globalSchedulesSources)) {
1184 
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1185 
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1186 
-    	}
1184 
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1185 
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1186 
+		}
1187 1187
1188 1188 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1189 1189 
 
@@ -1235,21 +1235,21 @@  discard block
 
 block discarded – undo
1235 1235 
 	$popi = false;
1236 1236 
 	$popw = false;
1237 1237 
 	foreach ($_SESSION['done'] as $done) {
1238 
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1239 
-	    if ($done == 'Create database') $pop = true;
1240 
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
1241 
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
1242 
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
1238 
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1239 
+		if ($done == 'Create database') $pop = true;
1240 
+		if ($_SESSION['install'] == 'database_create') $pop = true;
1241 
+		if ($_SESSION['install'] == 'database_import') $popi = true;
1242 
+		if ($_SESSION['install'] == 'waypoints') $popw = true;
1243 1243 
 	}
1244 1244 
 	if ($pop) {
1245 
-	    sleep(5);
1246 
-	    print '<li>Create database....<img src="../images/loading.gif" /></li>';
1245 
+		sleep(5);
1246 
+		print '<li>Create database....<img src="../images/loading.gif" /></li>';
1247 1247 
 	} else if ($popi) {
1248 
-	    sleep(5);
1249 
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
1248 
+		sleep(5);
1249 
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
1250 1250 
 	} else if ($popw) {
1251 
-	    sleep(5);
1252 
-	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
1251 
+		sleep(5);
1252 
+		print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
1253 1253 
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1254 1254 
 	print '</div></ul>';
1255 1255 
 	print '<div id="error"></div>';
 
@@ -1312,7 +1312,7 @@  discard block
 
 block discarded – undo
1312 1312 
 	unset($_COOKIE['install']);
1313 1313 
 	print '<div class="info column"><ul>';
1314 1314 
 	foreach ($_SESSION['done'] as $done) {
1315 
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1315 
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1316 1316 
 	}
1317 1317 
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
1318 1318 
 	print '</ul></div>';
Please login to merge, or discard this patch.
Spacing   +201 added lines, -201 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,7 @@  discard block
 
 block discarded – undo
9 9 
 require_once(dirname(__FILE__).'/class.create_db.php');
10 10 
 require_once(dirname(__FILE__).'/class.update_schema.php');
11 11 
 require_once(dirname(__FILE__).'/class.settings.php');
12 
-$title="Install";
12 
+$title = "Install";
13 13 
 require(dirname(__FILE__).'/../require/settings.php');
14 14 
 require(dirname(__FILE__).'/header.php');
15 15 
 
@@ -66,8 +66,8 @@  discard block
 
 block discarded – undo
66 66 
 if (!extension_loaded('curl')) {
67 67 
 	$error[] = "Curl is not loaded.";
68 68 
 }
69 
-if(function_exists('apache_get_modules') ){
70 
-	if(!in_array('mod_rewrite',apache_get_modules())) {
69 
+if (function_exists('apache_get_modules')) {
70 
+	if (!in_array('mod_rewrite', apache_get_modules())) {
71 71 
 		$error[] = "mod_rewrite is not available.";
72 72 
 	}
73 73 
 /*
 
@@ -83,8 +83,8 @@  discard block
 
 block discarded – undo
83 83 
 print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>';
84 84 
 if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
85 85 
 	if (function_exists('get_headers')) {
86 
-		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
87 
-		if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
86 
+		$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
87 
+		if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
88 88 
 			print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
89 89 
 		}
90 90 
 	}
 
@@ -424,13 +424,13 @@  discard block
 
 block discarded – undo
424 424 
 ?>
425 425 
 							<tr>
426 426 
 								<?php
427 
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
427 
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
428 428 
 								?>
429 429 
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
430 430 
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
431 431 
 								<?php
432 432 
 								    } else {
433 
-									$hostport = explode(':',$source['host']);
433 
+									$hostport = explode(':', $source['host']);
434 434 
 									if (isset($hostport[1])) {
435 435 
 										$host = $hostport[0];
436 436 
 										$port = $hostport[1];
 
@@ -764,7 +764,7 @@  discard block
 
 block discarded – undo
764 764 
 			<br />
765 765 
 			<p>
766 766 
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
767 
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
767 
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
768 768 
 			</p>
769 769 
 			<br />
770 770 
 			<p>
 
@@ -810,14 +810,14 @@  discard block
 
 block discarded – undo
810 810 
 $error = '';
811 811
812 812 
 if (isset($_POST['dbtype'])) {
813 
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
814 
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
815 
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
816 
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
817 
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
818 
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
819 
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
820 
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
813 
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
814 
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
815 
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
816 
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
817 
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
818 
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
819 
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
820 
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
821 821
822 822 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
823 823 
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
 
@@ -837,48 +837,48 @@  discard block
 
 block discarded – undo
837 837 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
838 838 
 	*/
839 839
840 
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
840 
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
841 841
842 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
843 
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
844 
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
845 
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
846 
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
842 
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
843 
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
844 
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
845 
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
846 
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
847 847
848 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
849 
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
850 
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
851 
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
852 
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
853 
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
854 
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
855 
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
856 
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey));
848 
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
849 
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
850 
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
851 
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
852 
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
853 
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
854 
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
855 
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
856 
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey));
857 857
858 
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
859 
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
860 
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
861 
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
862 
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
863 
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
858 
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
859 
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
860 
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
861 
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
862 
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
863 
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
864 864
865 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
866 
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
865 
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
866 
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
867 867
868 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
869 
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
870 
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
868 
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
869 
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
870 
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
871 871
872 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
872 
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
873 873 
 	if ($acars == 'acars') {
874 
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
874 
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
875 875 
 	} else {
876 
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
876 
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
877 877 
 	}
878 878
879 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
880 
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
881 
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
879 
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
880 
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
881 
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
882 882
883 883 
 	$source_name = $_POST['source_name'];
884 884 
 	$source_latitude = $_POST['source_latitude'];
 
@@ -892,8 +892,8 @@  discard block
 
 block discarded – undo
892 892
893 893 
 	$sources = array();
894 894 
 	foreach ($source_name as $keys => $name) {
895 
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
896 
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
895 
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
896 
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
897 897 
 	}
898 898 
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
899 899 
 
@@ -906,13 +906,13 @@  discard block
 
 block discarded – undo
906 906 
 	$sbsurl = $_POST['sbsurl'];
907 907 
 	*/
908 908
909 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
910 
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
911 
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
912 
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
913 
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
914 
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
915 
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
909 
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
910 
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
911 
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
912 
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
913 
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
914 
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
915 
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
916 916
917 917 
 /*
918 918 
 	$globalSBS1Hosts = array();
 
@@ -928,7 +928,7 @@  discard block
 
 block discarded – undo
928 928 
 	}
929 929 
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
930 930 
 */
931 
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
931 
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
932 932 
 	$host = $_POST['host'];
933 933 
 	$port = $_POST['port'];
934 934 
 	$name = $_POST['name'];
 
@@ -939,96 +939,96 @@  discard block
 
 block discarded – undo
939 939 
 	foreach ($host as $key => $h) {
940 940 
 		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
941 941 
 		else $cov = 'FALSE';
942 
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
942 
+		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov);
943 943 
 	}
944 
-	$settings = array_merge($settings,array('globalSources' => $gSources));
944 
+	$settings = array_merge($settings, array('globalSources' => $gSources));
945 945
946 946 
 /*
947 947 
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
948 948 
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
949 949 
 */
950 
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
951 
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
952 
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
950 
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
951 
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
952 
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
953 953
954 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
955 
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
954 
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
955 
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
956 956
957 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
958 
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
959 
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
960 
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
957 
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
958 
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
959 
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
960 
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
961 961
962 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
963 
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
964 
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
962 
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
963 
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
964 
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
965 965 
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
966 
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
967 
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
966 
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
967 
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
968 968
969 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
970 
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
971 
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
972 
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
973 
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
974 
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
975 
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
976 
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
969 
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
970 
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
971 
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
972 
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
973 
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
974 
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
975 
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
976 
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
977 977
978 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
979 
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
978 
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
979 
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
980 980
981 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
982 
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
981 
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
982 
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
983 983
984 
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
984 
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
985 985 
 	if ($archiveyear == "archiveyear") {
986 
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
986 
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
987 987 
 	} else {
988 
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
988 
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
989 989 
 	}
990 
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
991 
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
992 
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
993 
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
990 
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
991 
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
992 
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
993 
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
994 994
995 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
996 
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
997 
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
998 
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
995 
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
996 
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
997 
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
998 
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
999 999
1000 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1001 
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1002 
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1000 
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1001 
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1002 
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1003 1003
1004 1004 
 	// Create in settings.php keys not yet configurable if not already here
1005 1005 
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1006 
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1006 
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1007 1007
1008 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1008 
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1009 1009 
 	if ($resetyearstats == 'resetyearstats') {
1010 
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1010 
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1011 1011 
 	} else {
1012 
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1012 
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1013 1013 
 	}
1014 1014
1015 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1015 
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1016 1016 
 	if ($archive == 'archive') {
1017 
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1017 
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1018 1018 
 	} else {
1019 
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1019 
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1020 1020 
 	}
1021 
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1021 
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1022 1022 
 	if ($daemon == 'daemon') {
1023 
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1023 
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1024 1024 
 	} else {
1025 
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1025 
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1026 1026 
 	}
1027 
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1027 
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1028 1028 
 	if ($schedules == 'schedules') {
1029 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1029 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1030 1030 
 	} else {
1031 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1031 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1032 1032 
 	}
1033 1033
1034 1034 
 /*
 
@@ -1039,177 +1039,177 @@  discard block
 
 block discarded – undo
1039 1039 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1040 1040 
 	}
1041 1041 
 */
1042 
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1043 
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1044 
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1045 
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1046 
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1042 
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1043 
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1044 
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1045 
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1046 
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1047 1047 
 	if ($globalivao == 'ivao') {
1048 1048 
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
1049 
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1050 
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1049 
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1050 
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1051 1051 
 	if ($globalvatsim == 'vatsim') {
1052 1052 
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
1053 
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1054 
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1053 
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1054 
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1055 1055 
 	if ($globalphpvms == 'phpvms') {
1056 
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1057 
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1056 
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1057 
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1058 1058 
 	if ($globalvam == 'vam') {
1059 
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1060 
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1059 
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1060 
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1061 1061 
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
1062 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1063 
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1062 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1063 
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1064 1064
1065 1065
1066 1066
1067 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1067 
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1068 1068 
 	if ($notam == 'notam') {
1069 
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1069 
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1070 1070 
 	} else {
1071 
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1071 
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1072 1072 
 	}
1073 
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1073 
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1074 1074 
 	if ($owner == 'owner') {
1075 
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1075 
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1076 1076 
 	} else {
1077 
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1077 
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1078 1078 
 	}
1079 
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1079 
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1080 1080 
 	if ($map3d == 'map3d') {
1081 
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1081 
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1082 1082 
 	} else {
1083 
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1083 
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1084 1084 
 	}
1085 
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1085 
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1086 1086 
 	if ($crash == 'crash') {
1087 
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1087 
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1088 1088 
 	} else {
1089 
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1089 
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1090 1090 
 	}
1091 
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1091 
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1092 1092 
 	if ($mapsatellites == 'mapsatellites') {
1093 
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1093 
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1094 1094 
 	} else {
1095 
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1095 
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1096 1096 
 	}
1097 
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1097 
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1098 1098 
 	if ($map3ddefault == 'map3ddefault') {
1099 
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1099 
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1100 1100 
 	} else {
1101 
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1101 
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1102 1102 
 	}
1103 
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1103 
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1104 1104 
 	if ($translate == 'translate') {
1105 
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1105 
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1106 1106 
 	} else {
1107 
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1107 
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1108 1108 
 	}
1109 
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1109 
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1110 1110 
 	if ($realairlines == 'realairlines') {
1111 
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1111 
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1112 1112 
 	} else {
1113 
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1113 
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1114 1114 
 	}
1115 
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1115 
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1116 1116 
 	if ($estimation == 'estimation') {
1117 
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1117 
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1118 1118 
 	} else {
1119 
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1119 
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1120 1120 
 	}
1121 
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1121 
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1122 1122 
 	if ($metar == 'metar') {
1123 
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1123 
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1124 1124 
 	} else {
1125 
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1125 
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1126 1126 
 	}
1127 
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1127 
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1128 1128 
 	if ($metarcycle == 'metarcycle') {
1129 
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1129 
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1130 1130 
 	} else {
1131 
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1131 
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1132 1132 
 	}
1133 
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1133 
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1134 1134 
 	if ($fork == 'fork') {
1135 
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1135 
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1136 1136 
 	} else {
1137 
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1137 
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1138 1138 
 	}
1139 1139
1140 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1140 
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1141 1141 
 	if ($colormap == 'colormap') {
1142 
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1142 
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1143 1143 
 	} else {
1144 
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1144 
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1145 1145 
 	}
1146 1146
1147 1147 
 	if (isset($_POST['aircrafticoncolor'])) {
1148 
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1149 
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1148 
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1149 
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1150 1150 
 	}
1151 1151
1152 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1153 
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1152 
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1153 
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1154 1154
1155 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1156 
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1157 
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1158 
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1159 
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1160 
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1155 
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1156 
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1157 
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1158 
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1159 
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1160 
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1161 1161
1162 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1162 
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1163 1163 
 	if ($mappopup == 'mappopup') {
1164 
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1164 
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1165 1165 
 	} else {
1166 
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1166 
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1167 1167 
 	}
1168 
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1168 
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1169 1169 
 	if ($airportpopup == 'airportpopup') {
1170 
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1170 
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1171 1171 
 	} else {
1172 
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1172 
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1173 1173 
 	}
1174 
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1174 
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1175 1175 
 	if ($maphistory == 'maphistory') {
1176 
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1176 
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1177 1177 
 	} else {
1178 
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1178 
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1179 1179 
 	}
1180 
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1180 
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1181 1181 
 	if ($flightroute == 'flightroute') {
1182 
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1182 
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1183 1183 
 	} else {
1184 
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1184 
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1185 1185 
 	}
1186 
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1186 
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1187 1187 
 	if ($allflights == 'allflights') {
1188 
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1188 
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1189 1189 
 	} else {
1190 
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1190 
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1191 1191 
 	}
1192 
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1192 
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1193 1193 
 	if ($waypoints == 'waypoints') {
1194 
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1194 
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1195 1195 
 	} else {
1196 
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1196 
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1197 1197 
 	}
1198 1198
1199 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1199 
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1200 1200
1201 1201 
 	// Set some defaults values...
1202 1202 
 	if (!isset($globalAircraftImageSources)) {
1203 
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1204 
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1203 
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1204 
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1205 1205 
 	}
1206 1206
1207 1207 
 	if (!isset($globalSchedulesSources)) {
1208 
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1209 
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1208 
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1209 
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1210 1210 
     	}
1211 1211
1212 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1212 
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1213 1213
1214 1214 
 	if ($error == '') settings::modify_settings($settings);
1215 1215 
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.
Braces   +409 added lines, -106 removed lines patch added patch discarded remove patch 
@@ -128,45 +128,72 @@  discard block
 
 block discarded – undo
128 128 
 			</div>
129 129 
 			<p>
130 130 
 				<label for="dbhost">Database hostname</label>
131 
-				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" />
131 
+				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) {
132 
+	print $globalDBhost;
133 
+}
134 
+?>" />
132 135 
 			</p>
133 136 
 			<p>
134 137 
 				<label for="dbport">Database port</label>
135 
-				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" />
138 
+				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) {
139 
+	print $globalDBport;
140 
+}
141 
+?>" />
136 142 
 				<p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p>
137 143 
 			</p>
138 144 
 			<p>
139 145 
 				<label for="dbname">Database name</label>
140 
-				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" />
146 
+				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) {
147 
+	print $globalDBname;
148 
+}
149 
+?>" />
141 150 
 			</p>
142 151 
 			<p>
143 152 
 				<label for="dbuser">Database user</label>
144 
-				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" />
153 
+				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) {
154 
+	print $globalDBuser;
155 
+}
156 
+?>" />
145 157 
 			</p>
146 158 
 			<p>
147 159 
 				<label for="dbuserpass">Database user password</label>
148 
-				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" />
160 
+				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) {
161 
+	print $globalDBpass;
162 
+}
163 
+?>" />
149 164 
 			</p>
150 165 
 		</fieldset>
151 166 
 		<fieldset id="site">
152 167 
 			<legend>Site configuration</legend>
153 168 
 			<p>
154 169 
 				<label for="sitename">Site name</label>
155 
-				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" />
170 
+				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) {
171 
+	print $globalName;
172 
+}
173 
+?>" />
156 174 
 			</p>
157 175 
 			<p>
158 176 
 				<label for="siteurl">Site directory</label>
159 
-				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
177 
+				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) {
178 
+	print $globalURL;
179 
+}
180 
+?>" />
160 181 
 				<p class="help-block">Can be null. ex : <i>flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
161 182 
 			</p>
162 183 
 			<p>
163 184 
 				<label for="timezone">Timezone</label>
164 
-				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" />
185 
+				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) {
186 
+	print $globalTimezone;
187 
+}
188 
+?>" />
165 189 
 				<p class="help-block">ex : UTC, Europe/Paris,...</p>
166 190 
 			</p>
167 191 
 			<p>
168 192 
 				<label for="language">Language</label>
169 
-				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" />
193 
+				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) {
194 
+	print $globalLanguage;
195 
+}
196 
+?>" />
170 197 
 				<p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p>
171 198 
 			</p>
172 199 
 		</fieldset>
 
@@ -187,11 +214,17 @@  discard block
 
 block discarded – undo
187 214 
 			<div id="mapbox_data">
188 215 
 				<p>
189 216 
 					<label for="mapboxid">Mapbox id</label>
190 
-					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" />
217 
+					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) {
218 
+	print $globalMapboxId;
219 
+}
220 
+?>" />
191 221 
 				</p>
192 222 
 				<p>
193 223 
 					<label for="mapboxtoken">Mapbox token</label>
194 
-					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" />
224 
+					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) {
225 
+	print $globalMapboxToken;
226 
+}
227 
+?>" />
195 228 
 				</p>
196 229 
 				<p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p>
197 230 
 			</div>
 
@@ -199,7 +232,10 @@  discard block
 
 block discarded – undo
199 232 
 			<div id="google_data">
200 233 
 				<p>
201 234 
 					<label for="googlekey">Google API key</label>
202 
-					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" />
235 
+					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) {
236 
+	print $globalGoogleAPIKey;
237 
+}
238 
+?>" />
203 239 
 					<p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p>
204 240 
 				</p>
205 241 
 			</div>
 
@@ -207,7 +243,10 @@  discard block
 
 block discarded – undo
207 243 
 			<div id="bing_data">
208 244 
 				<p>
209 245 
 					<label for="bingkey">Bing Map key</label>
210 
-					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" />
246 
+					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) {
247 
+	print $globalBingMapKey;
248 
+}
249 
+?>" />
211 250 
 					<p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p>
212 251 
 				</p>
213 252 
 			</div>
 
@@ -215,7 +254,10 @@  discard block
 
 block discarded – undo
215 254 
 			<div id="mapquest_data">
216 255 
 				<p>
217 256 
 					<label for="mapquestkey">MapQuest key</label>
218 
-					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" />
257 
+					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) {
258 
+	print $globalMapQuestKey;
259 
+}
260 
+?>" />
219 261 
 					<p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p>
220 262 
 				</p>
221 263 
 			</div>
 
@@ -223,11 +265,17 @@  discard block
 
 block discarded – undo
223 265 
 			<div id="here_data">
224 266 
 				<p>
225 267 
 					<label for="hereappid">Here App_Id</label>
226 
-					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" />
268 
+					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) {
269 
+	print $globalHereappId;
270 
+}
271 
+?>" />
227 272 
 				</p>
228 273 
 				<p>
229 274 
 					<label for="hereappcode">Here App_Code</label>
230 
-					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" />
275 
+					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) {
276 
+	print $globalHereappCode;
277 
+}
278 
+?>" />
231 279 
 				</p>
232 280 
 				<p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p>
233 281 
 			</div>
 
@@ -236,42 +284,86 @@  discard block
 
 block discarded – undo
236 284 
 			<legend>Coverage area</legend>
237 285 
 			<p>
238 286 
 				<label for="latitudemax">The maximum latitude (north)</label>
239 
-				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" />
287 
+				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) {
288 
+	print $globalLatitudeMax;
289 
+}
290 
+?>" />
240 291 
 			</p>
241 292 
 			<p>
242 293 
 				<label for="latitudemin">The minimum latitude (south)</label>
243 
-				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" />
294 
+				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) {
295 
+	print $globalLatitudeMin;
296 
+}
297 
+?>" />
244 298 
 			</p>
245 299 
 			<p>
246 300 
 				<label for="longitudemax">The maximum longitude (west)</label>
247 
-				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" />
301 
+				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) {
302 
+	print $globalLongitudeMax;
303 
+}
304 
+?>" />
248 305 
 			</p>
249 306 
 			<p>
250 307 
 				<label for="longitudemin">The minimum longitude (east)</label>
251 
-				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" />
308 
+				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) {
309 
+	print $globalLongitudeMin;
310 
+}
311 
+?>" />
252 312 
 			</p>
253 313 
 			<p>
254 314 
 				<label for="latitudecenter">The latitude center</label>
255 
-				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" />
315 
+				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) {
316 
+	print $globalCenterLatitude;
317 
+}
318 
+?>" />
256 319 
 			</p>
257 320 
 			<p>
258 321 
 				<label for="longitudecenter">The longitude center</label>
259 
-				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" />
322 
+				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) {
323 
+	print $globalCenterLongitude;
324 
+}
325 
+?>" />
260 326 
 			</p>
261 327 
 			<p>
262 328 
 				<label for="livezoom">Default Zoom on live map</label>
263 
-				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" />
329 
+				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) {
330 
+	print $globalLiveZoom;
331 
+} else {
332 
+	print '9';
333 
+}
334 
+?>" />
264 335 
 			</p>
265 336 
 			<p>
266 337 
 				<label for="squawk_country">Country for squawk usage</label>
267 338 
 				<select name="squawk_country" id="squawk_country">
268 
-					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option>
269 
-					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option>
270 
-					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option>
271 
-					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option>
272 
-					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option>
273 
-					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option>
274 
-					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option>
339 
+					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') {
340 
+	print ' selected ';
341 
+}
342 
+?>>UK</option>
343 
+					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') {
344 
+	print ' selected ';
345 
+}
346 
+?>>NZ</option>
347 
+					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') {
348 
+	print ' selected ';
349 
+}
350 
+?>>US</option>
351 
+					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') {
352 
+	print ' selected ';
353 
+}
354 
+?>>AU</option>
355 
+					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') {
356 
+	print ' selected ';
357 
+}
358 
+?>>NL</option>
359 
+					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') {
360 
+	print ' selected ';
361 
+}
362 
+?>>FR</option>
363 
+					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') {
364 
+	print ' selected ';
365 
+}
366 
+?>>TR</option>
275 367 
 				</select>
276 368 
 			</p>
277 369 
 		</fieldset>
 
@@ -280,15 +372,24 @@  discard block
 
 block discarded – undo
280 372 
 			<p><i>Only put in DB flights that are inside a circle</i></p>
281 373 
 			<p>
282 374 
 				<label for="latitude">Center latitude</label>
283 
-				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" />
375 
+				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) {
376 
+	echo $globalDistanceIgnore['latitude'];
377 
+}
378 
+?>" />
284 379 
 			</p>
285 380 
 			<p>
286 381 
 				<label for="longitude">Center longitude</label>
287 
-				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" />
382 
+				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) {
383 
+	echo $globalDistanceIgnore['longitude'];
384 
+}
385 
+?>" />
288 386 
 			</p>
289 387 
 			<p>
290 388 
 				<label for="Distance">Distance (in km)</label>
291 
-				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" />
389 
+				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) {
390 
+	echo $globalDistanceIgnore['distance'];
391 
+}
392 
+?>" />
292 393 
 			</p>
293 394 
 		</fieldset>
294 395 
 		<fieldset id="sourceloc">
 
@@ -383,11 +484,17 @@  discard block
 
 block discarded – undo
383 484 
 			<div id="flightaware_data">
384 485 
 				<p>
385 486 
 					<label for="flightawareusername">FlightAware username</label>
386 
-					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
487 
+					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
488 
+	print $globalFlightAwareUsername;
489 
+}
490 
+?>" />
387 491 
 				</p>
388 492 
 				<p>
389 493 
 					<label for="flightawarepassword">FlightAware password/API key</label>
390 
-					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
494 
+					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
495 
+	print $globalFlightAwarePassword;
496 
+}
497 
+?>" />
391 498 
 				</p>
392 499 
 			</div>
393 500 
 -->
 
@@ -446,25 +553,76 @@  discard block
 
 block discarded – undo
446 553 
 								?>
447 554 
 								<td>
448 555 
 									<select name="format[]" id="format">
449 
-										<option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option>
450 
-										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option>
451 
-										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option>
452 
-										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option>
453 
-										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option>
454 
-										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option>
455 
-										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option>
456 
-										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server</option>
457 
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
458 
-										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option>
459 
-										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option>
460 
-										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option>
461 
-										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
462 
-										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
463 
-										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS over SBS-3 TCP</option>
556 
+										<option value="auto" <?php if (!isset($source['format'])) {
557 
+	print 'selected';
558 
+}
559 
+?>>Auto</option>
560 
+										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') {
561 
+	print 'selected';
562 
+}
563 
+?>>SBS</option>
564 
+										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') {
565 
+	print 'selected';
566 
+}
567 
+?>>TSV</option>
568 
+										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') {
569 
+	print 'selected';
570 
+}
571 
+?>>Raw</option>
572 
+										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') {
573 
+	print 'selected';
574 
+}
575 
+?>>APRS</option>
576 
+										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') {
577 
+	print 'selected';
578 
+}
579 
+?>>Radarcape deltadb.txt</option>
580 
+										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') {
581 
+	print 'selected';
582 
+}
583 
+?>>Vatsim</option>
584 
+										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') {
585 
+	print 'selected';
586 
+}
587 
+?>>Virtual Radar Server</option>
588 
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
589 
+	print 'selected';
590 
+}
591 
+?>>phpVMS</option>
592 
+										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') {
593 
+	print 'selected';
594 
+}
595 
+?>>Virtual Airlines Manager</option>
596 
+										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') {
597 
+	print 'selected';
598 
+}
599 
+?>>IVAO</option>
600 
+										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') {
601 
+	print 'selected';
602 
+}
603 
+?>>FlightGear Multiplayer</option>
604 
+										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') {
605 
+	print 'selected';
606 
+}
607 
+?>>FlightGear Singleplayer</option>
608 
+										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') {
609 
+	print 'selected';
610 
+}
611 
+?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
612 
+										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') {
613 
+	print 'selected';
614 
+}
615 
+?>>ACARS over SBS-3 TCP</option>
464 616 
 									</select>
465 617 
 								</td>
466 
-								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" /></td>
467 
-								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td>
618 
+								<td><input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) {
619 
+	print $source['name'];
620 
+}
621 
+?>" /></td>
622 
+								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) {
623 
+	print 'checked';
624 
+}
625 
+?> /></td>
468 626 
 								<td><input type="button" id="delhost" value="Delete" onclick="deleteRow(this)" /> <input type="button" id="addhost" value="Add" onclick="insRow()" /></td>
469 627 
 							</tr>
470 628 
 <?php
 
@@ -510,11 +668,17 @@  discard block
 
 block discarded – undo
510 668 
 					<p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p>
511 669 
 					<p>
512 670 
 						<label for="acarshost">ACARS UDP host</label>
513 
-						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" />
671 
+						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) {
672 
+	print $globalACARSHost;
673 
+}
674 
+?>" />
514 675 
 					</p>
515 676 
 					<p>
516 677 
 						<label for="acarsport">ACARS UDP port</label>
517 
-						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" />
678 
+						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) {
679 
+	print $globalACARSPort;
680 
+}
681 
+?>" />
518 682 
 					</p>
519 683 
 				</fieldset>
520 684 
 			</div>
 
@@ -594,13 +758,19 @@  discard block
 
 block discarded – undo
594 758 
 			<div id="schedules_options">
595 759 
 				<p>
596 760 
 					<label for="britishairways">British Airways API Key</label>
597 
-					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" />
761 
+					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) {
762 
+	print $globalBritishAirwaysKey;
763 
+}
764 
+?>" />
598 765 
 					<p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p>
599 766 
 				</p>
600 767 
 				<!--
601 768 
 				<p>
602 769 
 					<label for="transavia">Transavia Test API Consumer Key</label>
603 
-					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" />
770 
+					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) {
771 
+	print $globalTransaviaKey;
772 
+}
773 
+?>" />
604 774 
 					<p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p>
605 775 
 				</p>
606 776 
 				-->
 
@@ -609,10 +779,16 @@  discard block
 
 block discarded – undo
609 779 
 						<b>Lufthansa API Key</b>
610 780 
 						<p>
611 781 
 							<label for="lufthansakey">Key</label>
612 
-							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" />
782 
+							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) {
783 
+	print $globalLufthansaKey['key'];
784 
+}
785 
+?>" />
613 786 
 						</p><p>
614 787 
 							<label for="lufthansasecret">Secret</label>
615 
-							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" />
788 
+							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) {
789 
+	print $globalLufthansaKey['secret'];
790 
+}
791 
+?>" />
616 792 
 						</p>
617 793 
 					</div>
618 794 
 					<p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p>
 
@@ -632,7 +808,10 @@  discard block
 
 block discarded – undo
632 808 
 			</p>
633 809 
 			<p>
634 810 
 				<label for="notamsource">URL of your feed from notaminfo.com</label>
635 
-				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" />
811 
+				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) {
812 
+	print $globalNOTAMSource;
813 
+}
814 
+?>" />
636 815 
 				<p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p>
637 816 
 			</p>
638 817 
 			<br />
 
@@ -648,14 +827,20 @@  discard block
 
 block discarded – undo
648 827 
 			<div id="metarsrc">
649 828 
 				<p>
650 829 
 					<label for="metarsource">URL of your METAR source</label>
651 
-					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" />
830 
+					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) {
831 
+	print $globalMETARurl;
832 
+}
833 
+?>" />
652 834 
 					<p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p>
653 835 
 				</p>
654 836 
 			</div>
655 837 
 			<br />
656 838 
 			<p>
657 839 
 				<label for="bitly">Bit.ly access token api (used in search page)</label>
658 
-				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" />
840 
+				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) {
841 
+	print $globalBitlyAccessToken;
842 
+}
843 
+?>" />
659 844 
 			</p>
660 845 
 			<br />
661 846 
 			<p>
 
@@ -675,7 +860,12 @@  discard block
 
 block discarded – undo
675 860 
 			</p>
676 861 
 			<p>
677 862 
 				<label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label>
678 
-				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '0'; ?>" />
863 
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
864 
+	print $globalArchiveMonths;
865 
+} else {
866 
+	echo '0';
867 
+}
868 
+?>" />
679 869 
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
680 870 
 			</p>
681 871 
 			<p>
 
@@ -685,12 +875,22 @@  discard block
 
 block discarded – undo
685 875 
 			</p>
686 876 
 			<p>
687 877 
 				<label for="archivekeepmonths">Keep flights data for xx months in archive</label>
688 
-				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '0'; ?>" />
878 
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
879 
+	print $globalArchiveKeepMonths;
880 
+} else {
881 
+	echo '0';
882 
+}
883 
+?>" />
689 884 
 				<p class="help-block">0 to disable</p>
690 885 
 			</p>
691 886 
 			<p>
692 887 
 				<label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label>
693 
-				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '0'; ?>" />
888 
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
889 
+	print $globalArchiveKeepTrackMonths;
890 
+} else {
891 
+	echo '0';
892 
+}
893 
+?>" />
694 894 
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
695 895 
 			</p>
696 896 
 			<br />
 
@@ -700,7 +900,12 @@  discard block
 
 block discarded – undo
700 900 
 				<p class="help-block">Uncheck if the script is running as cron job</p>
701 901 
 				<div id="cronends">
702 902 
 					<label for="cronend">Run script for xx seconds</label>
703 
-					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" />
903 
+					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) {
904 
+	print $globalCronEnd;
905 
+} else {
906 
+	print '0';
907 
+}
908 
+?>" />
704 909 
 					<p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p>
705 910 
 				</div>
706 911 
 			</p>
 
@@ -745,26 +950,49 @@  discard block
 
 block discarded – undo
745 950 
 			<br />
746 951 
 			<p>
747 952 
 				<label for="refresh">Show flights detected since xxx seconds</label>
748 
-				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" />
953 
+				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) {
954 
+	echo $globalLiveInterval;
955 
+} else {
956 
+	echo '200';
957 
+}
958 
+?>" />
749 959 
 			</p>
750 960 
 			<p>
751 961 
 				<label for="maprefresh">Live map refresh (in seconds)</label>
752 
-				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" />
962 
+				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) {
963 
+	echo $globalMapRefresh;
964 
+} else {
965 
+	echo '30';
966 
+}
967 
+?>" />
753 968 
 			</p>
754 969 
 			<p>
755 970 
 				<label for="mapidle">Map idle timeout (in minutes)</label>
756 
-				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" />
971 
+				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) {
972 
+	echo $globalMapIdleTimeout;
973 
+} else {
974 
+	echo '30';
975 
+}
976 
+?>" />
757 977 
 				<p class="help-block">0 to disable</p>
758 978 
 			</p>
759 979 
 			<br />
760 980 
 			<p>
761 981 
 				<label for="closestmindist">Distance to airport set as arrival (in km)</label>
762 
-				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" />
982 
+				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) {
983 
+	echo $globalClosestMinDist;
984 
+} else {
985 
+	echo '50';
986 
+}
987 
+?>" />
763 988 
 			</p>
764 989 
 			<br />
765 990 
 			<p>
766 991 
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
767 
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
992 
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) {
993 
+	echo $globalAircraftSize;
994 
+}
995 
+?>" />
768 996 
 			</p>
769 997 
 			<br />
770 998 
 			<p>
 
@@ -772,7 +1000,12 @@  discard block
 
 block discarded – undo
772 1000 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
773 1001 
 			?>
774 1002 
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
775 
-				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
1003 
+				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) {
1004 
+	echo $globalAircraftIconColor;
1005 
+} else {
1006 
+	echo '1a3151';
1007 
+}
1008 
+?>" />
776 1009 
 			<?php
777 1010 
 				if (!is_writable('../cache')) {
778 1011 
 			?>
 
@@ -790,8 +1023,18 @@  discard block
 
 block discarded – undo
790 1023 
 			<p>
791 1024 
 				<label for="airportzoom">Zoom level minimum to see airports icons</label>
792 1025 
 				<div class="range">
793 
-					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" />
794 
-					<output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output>
1026 
+					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) {
1027 
+	echo $globalAirportZoom;
1028 
+} else {
1029 
+	echo '7';
1030 
+}
1031 
+?>" />
1032 
+					<output id="range"><?php if (isset($globalAirportZoom)) {
1033 
+	echo $globalAirportZoom;
1034 
+} else {
1035 
+	echo '7';
1036 
+}
1037 
+?></output>
795 1038 
 				</div>
796 1039 
 			</p>
797 1040 
 		</fieldset>
 
@@ -819,8 +1062,12 @@  discard block
 
 block discarded – undo
819 1062 
 	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
820 1063 
 	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
821 1064
822 
-	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
823 
-	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
1065 
+	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) {
1066 
+		$error .= 'Mysql driver for PDO must be loaded';
1067 
+	}
1068 
+	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) {
1069 
+		$error .= 'PosgreSQL driver for PDO must be loaded';
1070 
+	}
824 1071
825 1072 
 	$_SESSION['database_root'] = $dbroot;
826 1073 
 	$_SESSION['database_rootpass'] = $dbrootpass;
 
@@ -887,15 +1134,23 @@  discard block
 
 block discarded – undo
887 1134 
 	$source_city = $_POST['source_city'];
888 1135 
 	$source_country = $_POST['source_country'];
889 1136 
 	$source_ref = $_POST['source_ref'];
890 
-	if (isset($source_id)) $source_id = $_POST['source_id'];
891 
-	else $source_id = array();
1137 
+	if (isset($source_id)) {
1138 
+		$source_id = $_POST['source_id'];
1139 
+	} else {
1140 
+		$source_id = array();
1141 
+	}
892 1142
893 1143 
 	$sources = array();
894 1144 
 	foreach ($source_name as $keys => $name) {
895 
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
896 
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
1145 
+	    if (isset($source_id[$keys])) {
1146 
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
1147 
+	    } else {
1148 
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
1149 
+	    }
1150 
+	}
1151 
+	if (count($sources) > 0) {
1152 
+		$_SESSION['sources'] = $sources;
897 1153 
 	}
898 
-	if (count($sources) > 0) $_SESSION['sources'] = $sources;
899 1154
900 1155 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
901 1156 
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
 
@@ -933,13 +1188,21 @@  discard block
 
 block discarded – undo
933 1188 
 	$port = $_POST['port'];
934 1189 
 	$name = $_POST['name'];
935 1190 
 	$format = $_POST['format'];
936 
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
937 
-	else $sourcestats = array();
1191 
+	if (isset($_POST['sourcestats'])) {
1192 
+		$sourcestats = $_POST['sourcestats'];
1193 
+	} else {
1194 
+		$sourcestats = array();
1195 
+	}
938 1196 
 	$gSources = array();
939 1197 
 	foreach ($host as $key => $h) {
940 
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
941 
-		else $cov = 'FALSE';
942 
-		if ($h != '') $gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
1198 
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
1199 
+			$cov = 'TRUE';
1200 
+		} else {
1201 
+			$cov = 'FALSE';
1202 
+		}
1203 
+		if ($h != '') {
1204 
+			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov);
1205 
+		}
943 1206 
 	}
944 1207 
 	$settings = array_merge($settings,array('globalSources' => $gSources));
945 1208 
 
@@ -964,7 +1227,9 @@  discard block
 
 block discarded – undo
964 1227 
 	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
965 1228 
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
966 1229 
 		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
967 
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1230 
+	} else {
1231 
+		$settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1232 
+	}
968 1233
969 1234 
 	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
970 1235 
 	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
 
@@ -1003,7 +1268,9 @@  discard block
 
 block discarded – undo
1003 1268
1004 1269 
 	// Create in settings.php keys not yet configurable if not already here
1005 1270 
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1006 
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1271 
+	if (!isset($globalDebug)) {
1272 
+		$settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1273 
+	}
1007 1274
1008 1275 
 	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1009 1276 
 	if ($resetyearstats == 'resetyearstats') {
 
@@ -1040,27 +1307,43 @@  discard block
 
 block discarded – undo
1040 1307 
 	}
1041 1308 
 */
1042 1309 
 	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1043 
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1044 
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1045 
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1046 
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1310 
+	if ($globalsbs == 'sbs') {
1311 
+		$settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1312 
+	} else {
1313 
+		$settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1314 
+	}
1315 
+	if ($globalaprs == 'aprs') {
1316 
+		$settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1317 
+	} else {
1318 
+		$settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1319 
+	}
1047 1320 
 	if ($globalivao == 'ivao') {
1048 1321 
 		//$settings = array_merge($settings,array('globalIVAO' => 'TRUE','globalVATSIM' => 'FALSE'));
1049 1322 
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1050 
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1323 
+	} else {
1324 
+		$settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1325 
+	}
1051 1326 
 	if ($globalvatsim == 'vatsim') {
1052 1327 
 		//$settings = array_merge($settings,array('globalVATSIM' => 'TRUE','globalIVAO' => 'FALSE'));
1053 1328 
 		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1054 
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1329 
+	} else {
1330 
+		$settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1331 
+	}
1055 1332 
 	if ($globalphpvms == 'phpvms') {
1056 1333 
 		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1057 
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1334 
+	} else {
1335 
+		$settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1336 
+	}
1058 1337 
 	if ($globalvam == 'vam') {
1059 1338 
 		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1060 
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1339 
+	} else {
1340 
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1341 
+	}
1061 1342 
 	if ($globalvatsim == 'vatsim' || $globalivao == 'ivao' || $globalphpvms == 'phpvms') {
1062 1343 
 		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1063 
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1344 
+	} else {
1345 
+		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1346 
+	}
1064 1347
1065 1348
1066 1349 
 
@@ -1196,7 +1479,9 @@  discard block
 
 block discarded – undo
1196 1479 
 		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1197 1480 
 	}
1198 1481
1199 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1482 
+	if (!isset($globalTransaction)) {
1483 
+		$settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1484 
+	}
1200 1485
1201 1486 
 	// Set some defaults values...
1202 1487 
 	if (!isset($globalAircraftImageSources)) {
 
@@ -1211,15 +1496,23 @@  discard block
 
 block discarded – undo
1211 1496
1212 1497 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1213 1498
1214 
-	if ($error == '') settings::modify_settings($settings);
1215 
-	if ($error == '') settings::comment_settings($settings_comment);
1499 
+	if ($error == '') {
1500 
+		settings::modify_settings($settings);
1501 
+	}
1502 
+	if ($error == '') {
1503 
+		settings::comment_settings($settings_comment);
1504 
+	}
1216 1505 
 	if ($error != '') {
1217 1506 
 		print '<div class="info column">'.$error.'</div>';
1218 1507 
 		require('../footer.php');
1219 1508 
 		exit;
1220 1509 
 	} else {
1221 
-		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1;
1222 
-		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1;
1510 
+		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') {
1511 
+			$_SESSION['waypoints'] = 1;
1512 
+		}
1513 
+		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') {
1514 
+			$_SESSION['owner'] = 1;
1515 
+		}
1223 1516 
 		if (isset($_POST['createdb'])) {
1224 1517 
 			$_SESSION['install'] = 'database_create';
1225 1518 
 		} else {
 
@@ -1260,10 +1553,18 @@  discard block
 
 block discarded – undo
1260 1553 
 	$popw = false;
1261 1554 
 	foreach ($_SESSION['done'] as $done) {
1262 1555 
 	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1263 
-	    if ($done == 'Create database') $pop = true;
1264 
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
1265 
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
1266 
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
1556 
+	    if ($done == 'Create database') {
1557 
+	    	$pop = true;
1558 
+	    }
1559 
+	    if ($_SESSION['install'] == 'database_create') {
1560 
+	    	$pop = true;
1561 
+	    }
1562 
+	    if ($_SESSION['install'] == 'database_import') {
1563 
+	    	$popi = true;
1564 
+	    }
1565 
+	    if ($_SESSION['install'] == 'waypoints') {
1566 
+	    	$popw = true;
1567 
+	    }
1267 1568 
 	}
1268 1569 
 	if ($pop) {
1269 1570 
 	    sleep(5);
 
@@ -1274,7 +1575,9 @@  discard block
 
 block discarded – undo
1274 1575 
 	} else if ($popw) {
1275 1576 
 	    sleep(5);
1276 1577 
 	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
1277 
-	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1578 
+	} else {
1579 
+		print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1580 
+	}
1278 1581 
 	print '</div></ul>';
1279 1582 
 	print '<div id="error"></div>';
1280 1583 
 /*	foreach ($_SESSION['done'] as $done) {
Please login to merge, or discard this patch.
manufacturer-statistics-aircraft.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,9 @@
 
 block discarded – undo
22 22 
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
23 23 
 	$Stats = new Stats();
24 24 
 	$all_manufacturers = $Stats->getAllManufacturers();
25 
-	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
25 
+	if (empty($all_manufacturers)) {
26 
+		$all_manufacturers = $Spotter->getAllManufacturers();
27 
+	}
26 28 
 	foreach($all_manufacturers as $all_manufacturer)
27 29 
 	{
28 30 
 		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -8,13 +8,13 @@  discard block
 
 block discarded – undo
8 8 
         die();
9 9 
 }
10 10 
 $Spotter = new Spotter();
11 
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
12 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
13 
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
11 
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
12 
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
13 
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
14 14
15 15 
 if (!empty($spotter_array))
16 16 
 {
17 
-	$title = sprintf(_("Most Common Aircraft from %s"),$manufacturer);
17 
+	$title = sprintf(_("Most Common Aircraft from %s"), $manufacturer);
18 18
19 19 
 	require_once('header.php');
20 20 
 	print '<div class="select-item">';
 
@@ -23,9 +23,9 @@  discard block
 
 block discarded – undo
23 23 
 	$Stats = new Stats();
24 24 
 	$all_manufacturers = $Stats->getAllManufacturers();
25 25 
 	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
26 
-	foreach($all_manufacturers as $all_manufacturer)
26 
+	foreach ($all_manufacturers as $all_manufacturer)
27 27 
 	{
28 
-		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
28 
+		if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
29 29 
 		{
30 30 
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
31 31 
 		} else {
 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
 	include('manufacturer-sub-menu.php');
45 45 
 	print '<div class="column">';
46 46 
 	print '<h2>'._("Most Common Aircraft").'</h2>';
47 
-	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$manufacturer).'</p>';
47 
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $manufacturer).'</p>';
48 48
49 49 
 	$aircraft_array = $Spotter->countAllAircraftTypesByManufacturer($manufacturer);
50 50 
 	if (!empty($aircraft_array))
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 		print '</thead>';
60 60 
 		print '<tbody>';
61 61 
 		$i = 1;
62 
-		foreach($aircraft_array as $aircraft_item)
62 
+		foreach ($aircraft_array as $aircraft_item)
63 63 
 		{
64 64 
 			print '<tr>';
65 65 
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['aircraft_manufacturer'])) {
7 
-        header('Location: '.$globalURL.'/manufacturer');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/manufacturer');
8 
+		die();
9 9 
 }
10 10 
 $Spotter = new Spotter();
11 11 
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
Please login to merge, or discard this patch.
manufacturer-statistics-airline-country.php 3 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,9 @@
 
 block discarded – undo
22 22 
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
23 23 
 	$Stats = new Stats();
24 24 
 	$all_manufacturers = $Stats->getAllManufacturers();
25 
-	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
25 
+	if (empty($all_manufacturers)) {
26 
+		$all_manufacturers = $Spotter->getAllManufacturers();
27 
+	}
26 28 
 	foreach($all_manufacturers as $all_manufacturer)
27 29 
 	{
28 30 
 		if($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -8,13 +8,13 @@  discard block
 
 block discarded – undo
8 8 
         die();
9 9 
 }
10 10 
 $Spotter = new Spotter();
11 
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
12 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
13 
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
11 
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
12 
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
13 
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
14 14
15 15 
 if (!empty($spotter_array))
16 16 
 {
17 
-	$title = sprintf(_("Most Common Airlines by Country from %s"),$manufacturer);
17 
+	$title = sprintf(_("Most Common Airlines by Country from %s"), $manufacturer);
18 18
19 19 
 	require_once('header.php');
20 20 
 	print '<div class="select-item">';
 
@@ -23,9 +23,9 @@  discard block
 
 block discarded – undo
23 23 
 	$Stats = new Stats();
24 24 
 	$all_manufacturers = $Stats->getAllManufacturers();
25 25 
 	if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
26 
-	foreach($all_manufacturers as $all_manufacturer)
26 
+	foreach ($all_manufacturers as $all_manufacturer)
27 27 
 	{
28 
-		if($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
28 
+		if ($GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
29 29 
 		{
30 30 
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
31 31 
 		} else {
 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44 
 	include('manufacturer-sub-menu.php');
45 45 
 	print '<div class="column">';
46 46 
 	print '<h2>'._("Most Common Airlines by Country").'</h2>';
47 
-	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."),$manufacturer).'</p>';
47 
+	print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights from <strong>%s</strong>."), $manufacturer).'</p>';
48 48 
 	$airline_array = $Spotter->countAllAirlineCountriesByManufacturer($manufacturer);
49 49 
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
50 50 
 	print '<div id="chartCountry" class="chart" width="100%"></div>
 
@@ -56,7 +56,7 @@  discard block
 
 block discarded – undo
56 56 
             	["'._("Country").'", "'._("# of times").'"], ';
57 57
58 58 
 	$country_data = '';
59 
-	foreach($airline_array as $airline_item)
59 
+	foreach ($airline_array as $airline_item)
60 60 
 	{
61 61 
 		$country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],';
62 62 
 	}
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90 
 		print '</thead>';
91 91 
 		print '<tbody>';
92 92 
 		$i = 1;
93 
-		foreach($airline_array as $airline_item)
93 
+		foreach ($airline_array as $airline_item)
94 94 
 		{
95 95 
 			print '<tr>';
96 96 
 			print '<td><strong>'.$i.'</strong></td>';
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -4,8 +4,8 @@
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 if (!isset($_GET['aircraft_manufacturer'])) {
7 
-        header('Location: '.$globalURL.'/manufacturer');
8 
-        die();
7 
+		header('Location: '.$globalURL.'/manufacturer');
8 
+		die();
9 9 
 }
10 10 
 $Spotter = new Spotter();
11 11 
 $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
Please login to merge, or discard this patch.
manufacturer-detailed.php 2 patches
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,7 @@  discard block
 
 block discarded – undo
13 13 
 		$limit_start = 0;
14 14 
 		$limit_end = 25;
15 15 
 		$absolute_difference = 25;
16 
-	}  else {
16 
+	} else {
17 17 
 		$limit_explode = explode(",", $_GET['limit']);
18 18 
 		$limit_start = $limit_explode[0];
19 19 
 		$limit_end = $limit_explode[1];
 
@@ -47,7 +47,9 @@  discard block
 
 block discarded – undo
47 47 
 		print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
48 48 
 		$Stats = new Stats();
49 49 
 		$all_manufacturers = $Stats->getAllManufacturers();
50 
-		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
50 
+		if (empty($all_manufacturers)) {
51 
+			$all_manufacturers = $Spotter->getAllManufacturers();
52 
+		}
51 53 
 		foreach($all_manufacturers as $all_manufacturer)
52 54 
 		{
53 55 
 			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -4,16 +4,16 @@  discard block
 
 block discarded – undo
4 4 
 require_once('require/class.Stats.php');
5 5 
 require_once('require/class.Language.php');
6 6 
 $Spotter = new Spotter();
7 
-if (!isset($_GET['aircraft_manufacturer'])){
7 
+if (!isset($_GET['aircraft_manufacturer'])) {
8 8 
 	header('Location: '.$globalURL.'');
9 9 
 } else {
10 10 
 	//calculuation for the pagination
11 
-	if(!isset($_GET['limit']))
11 
+	if (!isset($_GET['limit']))
12 12 
 	{
13 13 
 		$limit_start = 0;
14 14 
 		$limit_end = 25;
15 15 
 		$absolute_difference = 25;
16 
-	}  else {
16 
+	} else {
17 17 
 		$limit_explode = explode(",", $_GET['limit']);
18 18 
 		$limit_start = $limit_explode[0];
19 19 
 		$limit_end = $limit_explode[1];
 
@@ -27,19 +27,19 @@  discard block
 
 block discarded – undo
27 27 
 	$limit_previous_1 = $limit_start - $absolute_difference;
28 28 
 	$limit_previous_2 = $limit_end - $absolute_difference;
29 29
30 
-	$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
31 
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
30 
+	$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
31 
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
32 32 
 	$page_url = $globalURL.'/manufacturer/'.$_GET['aircraft_manufacturer'];
33 33
34 34 
 	if ($sort != '') {
35 
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, $sort);
35 
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, $sort);
36 36 
 	} else {
37 
-		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, '');
37 
+		$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, '');
38 38 
 	}
39 39
40 40 
 	if (!empty($spotter_array))
41 41 
 	{
42 
-		$title = sprintf(_("Detailed View for %s"),$manufacturer);
42 
+		$title = sprintf(_("Detailed View for %s"), $manufacturer);
43 43
44 44 
 		require_once('header.php');
45 45 
 		print '<div class="select-item">';
 
@@ -48,9 +48,9 @@  discard block
 
 block discarded – undo
48 48 
 		$Stats = new Stats();
49 49 
 		$all_manufacturers = $Stats->getAllManufacturers();
50 50 
 		if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers();
51 
-		foreach($all_manufacturers as $all_manufacturer)
51 
+		foreach ($all_manufacturers as $all_manufacturer)
52 52 
 		{
53 
-			if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
53 
+			if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
54 54 
 			{
55 55 
 				print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
56 56 
 			} else {
 
@@ -67,7 +67,7 @@  discard block
 
 block discarded – undo
67 67 
 		print '</div>';
68 68
69 69 
 		print '<div class="table column">';
70 
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong."),$manufacturer).'</p>';
70 
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong."), $manufacturer).'</p>';
71 71
72 72 
 		include('manufacturer-sub-menu.php');
73 73 
 		include('table-output.php');
Please login to merge, or discard this patch.
require/class.ATC.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -11,7 +11,7 @@
 
 block discarded – undo
11 11 
     /**
12 12 
     * Get SQL query part for filter used
13 13 
     * @param Array $filter the filter
14 
-    * @return Array the SQL part
14 
+    * @return string the SQL part
15 15 
     */
16 16 
     public function getFilter($filter = array(),$where = false,$and = false) {
17 17 
 	global $globalFilter, $globalStatsFilters, $globalFilterName;
Please login to merge, or discard this patch.
Braces   +14 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -20,20 +20,27 @@  discard block
 
 block discarded – undo
20 20 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21 
 	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22 
 		foreach($globalStatsFilters[$globalFilterName] as $source) {
23 
-			if (isset($source['source'])) $filter['source'][] = $source['source'];
23 
+			if (isset($source['source'])) {
24 
+				$filter['source'][] = $source['source'];
25 
+			}
24 26 
 		}
25 27 
 	    } else {
26 28 
 		$filter = $globalStatsFilters[$globalFilterName];
27 29 
 	    }
28 30 
 	}
29 
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
31 
+	if (is_array($globalFilter)) {
32 
+		$filter = array_merge($filter,$globalFilter);
33 
+	}
30 34 
 	$filter_query_join = '';
31 35 
 	$filter_query_where = '';
32 36 
 	if (isset($filter['source']) && !empty($filter['source'])) {
33 37 
 	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
34 38 
 	}
35 
-	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36 
-	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
39 
+	if ($filter_query_where == '' && $where) {
40 
+		$filter_query_where = ' WHERE';
41 
+	} elseif ($filter_query_where != '' && $and) {
42 
+		$filter_query_where .= ' AND';
43 
+	}
37 44 
 	$filter_query = $filter_query_join.$filter_query_where;
38 45 
 	return $filter_query;
39 46 
     }
 
@@ -57,7 +64,9 @@  discard block
 
 block discarded – undo
57 64 
     		$info = str_replace('^','<br />',$info);
58 65 
     		$info = str_replace('&amp;sect;','',$info);
59 66 
     		$info = str_replace('"','',$info);
60 
-    		if ($type == '') $type = NULL;
67 
+    		if ($type == '') {
68 
+    			$type = NULL;
69 
+    		}
61 70 
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
62 71 
                 $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
63 72 
                  try {
Please login to merge, or discard this patch.
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch 
@@ -10,100 +10,100 @@
 
 block discarded – undo
10 10 
 	}
11 11
12 12
13 
-    /**
14 
-    * Get SQL query part for filter used
15 
-    * @param Array $filter the filter
16 
-    * @return Array the SQL part
17 
-    */
18 
-    public function getFilter($filter = array(),$where = false,$and = false) {
13 
+	/**
14 
+	 * Get SQL query part for filter used
15 
+	 * @param Array $filter the filter
16 
+	 * @return Array the SQL part
17 
+	 */
18 
+	public function getFilter($filter = array(),$where = false,$and = false) {
19 19 
 	global $globalFilter, $globalStatsFilters, $globalFilterName;
20 20 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 
-	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
21 
+		if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 22 
 		foreach($globalStatsFilters[$globalFilterName] as $source) {
23 23 
 			if (isset($source['source'])) $filter['source'][] = $source['source'];
24 24 
 		}
25 
-	    } else {
25 
+		} else {
26 26 
 		$filter = $globalStatsFilters[$globalFilterName];
27 
-	    }
27 
+		}
28 28 
 	}
29 29 
 	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30 30 
 	$filter_query_join = '';
31 31 
 	$filter_query_where = '';
32 32 
 	if (isset($filter['source']) && !empty($filter['source'])) {
33 
-	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
33 
+		$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
34 34 
 	}
35 35 
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36 36 
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
37 37 
 	$filter_query = $filter_query_join.$filter_query_where;
38 38 
 	return $filter_query;
39 
-    }
39 
+	}
40 40
41 
-       public function getAll() {
42 
-    		$filter_query = $this->getFilter(array());
43 
-                $query = "SELECT * FROM atc".$filter_query;
44 
-                $query_values = array();
45 
-                 try {
46 
-                        $sth = $this->db->prepare($query);
47 
-                        $sth->execute($query_values);
48 
-                } catch(PDOException $e) {
49 
-                        return "error : ".$e->getMessage();
50 
-                }
51 
-                $all = $sth->fetchAll(PDO::FETCH_ASSOC);
52 
-                return $all;
53 
-        }
41 
+	   public function getAll() {
42 
+			$filter_query = $this->getFilter(array());
43 
+				$query = "SELECT * FROM atc".$filter_query;
44 
+				$query_values = array();
45 
+				 try {
46 
+						$sth = $this->db->prepare($query);
47 
+						$sth->execute($query_values);
48 
+				} catch(PDOException $e) {
49 
+						return "error : ".$e->getMessage();
50 
+				}
51 
+				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
52 
+				return $all;
53 
+		}
54 54
55 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
56 
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
57 
-    		$info = str_replace('^','<br />',$info);
58 
-    		$info = str_replace('&amp;sect;','',$info);
59 
-    		$info = str_replace('"','',$info);
60 
-    		if ($type == '') $type = NULL;
61 
-                $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
62 
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
63 
-                 try {
64 
-                        $sth = $this->db->prepare($query);
65 
-                        $sth->execute($query_values);
66 
-                } catch(PDOException $e) {
67 
-                        return "error : ".$e->getMessage();
68 
-                }
69 
-        }
55 
+	   public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
56 
+			$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
57 
+			$info = str_replace('^','<br />',$info);
58 
+			$info = str_replace('&amp;sect;','',$info);
59 
+			$info = str_replace('"','',$info);
60 
+			if ($type == '') $type = NULL;
61 
+				$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
62 
+				$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
63 
+				 try {
64 
+						$sth = $this->db->prepare($query);
65 
+						$sth->execute($query_values);
66 
+				} catch(PDOException $e) {
67 
+						return "error : ".$e->getMessage();
68 
+				}
69 
+		}
70 70
71 
-       public function deleteById($id) {
72 
-                $query = "DELETE FROM atc WHERE atc_id = :id";
73 
-                $query_values = array(':id' => $id);
74 
-                 try {
75 
-                        $sth = $this->db->prepare($query);
76 
-                        $sth->execute($query_values);
77 
-                } catch(PDOException $e) {
78 
-                        return "error : ".$e->getMessage();
79 
-                }
80 
-        }
71 
+	   public function deleteById($id) {
72 
+				$query = "DELETE FROM atc WHERE atc_id = :id";
73 
+				$query_values = array(':id' => $id);
74 
+				 try {
75 
+						$sth = $this->db->prepare($query);
76 
+						$sth->execute($query_values);
77 
+				} catch(PDOException $e) {
78 
+						return "error : ".$e->getMessage();
79 
+				}
80 
+		}
81 81
82 
-       public function deleteAll() {
83 
-                $query = "DELETE FROM atc";
84 
-                $query_values = array();
85 
-                 try {
86 
-                        $sth = $this->db->prepare($query);
87 
-                        $sth->execute($query_values);
88 
-                } catch(PDOException $e) {
89 
-                        return "error : ".$e->getMessage();
90 
-                }
91 
-        }
82 
+	   public function deleteAll() {
83 
+				$query = "DELETE FROM atc";
84 
+				$query_values = array();
85 
+				 try {
86 
+						$sth = $this->db->prepare($query);
87 
+						$sth->execute($query_values);
88 
+				} catch(PDOException $e) {
89 
+						return "error : ".$e->getMessage();
90 
+				}
91 
+		}
92 92
93 93 
 	public function deleteOldATC() {
94 
-                global $globalDBdriver;
95 
-                if ($globalDBdriver == 'mysql') {
96 
-                        $query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
97 
-                } else {
98 
-                        $query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
99 
-                }
100 
-                try {
101 
-                        $sth = $this->db->prepare($query);
102 
-                        $sth->execute();
103 
-                } catch(PDOException $e) {
104 
-                        return "error";
105 
-                }
106 
-                return "success";
107 
-        }
94 
+				global $globalDBdriver;
95 
+				if ($globalDBdriver == 'mysql') {
96 
+						$query  = "DELETE FROM atc WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= atc.atc_lastseen";
97 
+				} else {
98 
+						$query  = "DELETE FROM atc WHERE NOW() AT TIME ZONE 'UTC' - '1 HOUR'->INTERVAL >= atc.atc_lastseen";
99 
+				}
100 
+				try {
101 
+						$sth = $this->db->prepare($query);
102 
+						$sth->execute();
103 
+				} catch(PDOException $e) {
104 
+						return "error";
105 
+				}
106 
+				return "success";
107 
+		}
108 108 
 }
109 109 
 ?>
110 110 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -15,22 +15,22 @@  discard block
 
 block discarded – undo
15 15 
     * @param Array $filter the filter
16 16 
     * @return Array the SQL part
17 17 
     */
18 
-    public function getFilter($filter = array(),$where = false,$and = false) {
18 
+    public function getFilter($filter = array(), $where = false, $and = false) {
19 19 
 	global $globalFilter, $globalStatsFilters, $globalFilterName;
20 20 
 	if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 21 
 	    if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 
-		foreach($globalStatsFilters[$globalFilterName] as $source) {
22 
+		foreach ($globalStatsFilters[$globalFilterName] as $source) {
23 23 
 			if (isset($source['source'])) $filter['source'][] = $source['source'];
24 24 
 		}
25 25 
 	    } else {
26 26 
 		$filter = $globalStatsFilters[$globalFilterName];
27 27 
 	    }
28 28 
 	}
29 
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
29 
+	if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
30 30 
 	$filter_query_join = '';
31 31 
 	$filter_query_where = '';
32 32 
 	if (isset($filter['source']) && !empty($filter['source'])) {
33 
-	    $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
33 
+	    $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
34 34 
 	}
35 35 
 	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36 36 
 	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
 
@@ -45,25 +45,25 @@  discard block
 
 block discarded – undo
45 45 
                  try {
46 46 
                         $sth = $this->db->prepare($query);
47 47 
                         $sth->execute($query_values);
48 
-                } catch(PDOException $e) {
48 
+                } catch (PDOException $e) {
49 49 
                         return "error : ".$e->getMessage();
50 50 
                 }
51 51 
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
52 52 
                 return $all;
53 53 
         }
54 54
55 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
56 
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
57 
-    		$info = str_replace('^','<br />',$info);
58 
-    		$info = str_replace('&amp;sect;','',$info);
59 
-    		$info = str_replace('"','',$info);
55 
+       public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
56 
+    		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
57 
+    		$info = str_replace('^', '<br />', $info);
58 
+    		$info = str_replace('&amp;sect;', '', $info);
59 
+    		$info = str_replace('"', '', $info);
60 60 
     		if ($type == '') $type = NULL;
61 61 
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
62 
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
62 
+                $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
63 63 
                  try {
64 64 
                         $sth = $this->db->prepare($query);
65 65 
                         $sth->execute($query_values);
66 
-                } catch(PDOException $e) {
66 
+                } catch (PDOException $e) {
67 67 
                         return "error : ".$e->getMessage();
68 68 
                 }
69 69 
         }
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
                  try {
75 75 
                         $sth = $this->db->prepare($query);
76 76 
                         $sth->execute($query_values);
77 
-                } catch(PDOException $e) {
77 
+                } catch (PDOException $e) {
78 78 
                         return "error : ".$e->getMessage();
79 79 
                 }
80 80 
         }
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
                  try {
86 86 
                         $sth = $this->db->prepare($query);
87 87 
                         $sth->execute($query_values);
88 
-                } catch(PDOException $e) {
88 
+                } catch (PDOException $e) {
89 89 
                         return "error : ".$e->getMessage();
90 90 
                 }
91 91 
         }
 
@@ -100,7 +100,7 @@  discard block
 
 block discarded – undo
100 100 
                 try {
101 101 
                         $sth = $this->db->prepare($query);
102 102 
                         $sth->execute();
103 
-                } catch(PDOException $e) {
103 
+                } catch (PDOException $e) {
104 104 
                         return "error";
105 105 
                 }
106 106 
                 return "success";
Please login to merge, or discard this patch.
space-data.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -7,7 +7,7 @@  discard block
 
 block discarded – undo
7 7 
 <button type="button" class="close">&times;</button>
8 8 
 <?php
9 9
10 
-$sat = filter_input(INPUT_GET,'sat',FILTER_SANITIZE_STRING);
10 
+$sat = filter_input(INPUT_GET, 'sat', FILTER_SANITIZE_STRING);
11 11 
 $sat = urldecode($sat);
12 12
13 13 
 if ($sat == 'ISS (ZARYA)') {
 
@@ -42,7 +42,7 @@  discard block
 
 block discarded – undo
42 42 
 	$aircraft_name = 'INTEGRAL';
43 43 
 //	$ground_speed = 14970;
44 44 
 	$launch_date = '17 October 2002';
45 
-} elseif (strpos($sat,'IRIDIUM') !== false) {
45 
+} elseif (strpos($sat, 'IRIDIUM') !== false) {
46 46 
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/b/b6/Iridium_Satellite.jpg';
47 47 
 	$image_copyright = 'Cliff';
48 48 
 	$ident = 'Iridium satellite constellation';
 
@@ -50,22 +50,22 @@  discard block
 
 block discarded – undo
50 50 
 	$aircraft_name = $sat;
51 51 
 //	$ground_speed = 14970;
52 52 
 //	$launch_date = '29 september 2011';
53 
-} elseif (strpos($sat,'ORBCOMM') !== false) {
53 
+} elseif (strpos($sat, 'ORBCOMM') !== false) {
54 54 
 	$ident = 'Orbcomm';
55 55 
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Orbcomm_(satellite)';
56 56 
 	$aircraft_name = $sat;
57 
-} elseif (strpos($sat,'GLOBALSTAR') !== false) {
57 
+} elseif (strpos($sat, 'GLOBALSTAR') !== false) {
58 58 
 	$ident = 'Globalstar';
59 59 
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/Globalstar';
60 60 
 	$aircraft_name = $sat;
61 
-} elseif (strpos($sat,'OSCAR 7') !== false) {
61 
+} elseif (strpos($sat, 'OSCAR 7') !== false) {
62 62 
 	$image = 'https://upload.wikimedia.org/wikipedia/en/a/ad/AMSAT-OSCAR_7.jpg';
63 63 
 	$image_copyright = 'Amsat.org';
64 64 
 	$ident = 'AMSAT-OSCAR 7';
65 65 
 	$aircraft_wiki = 'https://en.wikipedia.org/wiki/AMSAT-OSCAR_7';
66 66 
 	$aircraft_name = $sat;
67 67 
 	$launch_date = '15 November 1974';
68 
-} elseif (strpos($sat,'santaclaus') !== false) {
68 
+} elseif (strpos($sat, 'santaclaus') !== false) {
69 69 
 	$image = 'https://upload.wikimedia.org/wikipedia/commons/4/49/Jonathan_G_Meath_portrays_Santa_Claus.jpg';
70 70 
 	$image_copyright = 'Jonathan G Meath';
71 71 
 	$ident = 'Santa Claus';
Please login to merge, or discard this patch.
live-santa-czml.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -28,7 +28,9 @@  discard block
 
 block discarded – undo
28 28
29 29 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
30 30 
 $output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
31 
-if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
31 
+if (!isset($_GET['now'])) {
32 
+	$output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
33 
+}
32 34 
 $output .= '}';
33 35 
 //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}';
34 36 
 //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
 
@@ -37,7 +39,9 @@  discard block
 
 block discarded – undo
37 39 
 $output .= '},';
38 40 
 $output .= '{';
39 41 
 $output .= '"id": "santaclaus",';
40 
-if (!isset($_GET['now'])) $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
42 
+if (!isset($_GET['now'])) {
43 
+	$output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",';
44 
+}
41 45 
 $output .= '"properties": {';
42 46 
 // Not yet supported in CZML with Cesium
43 47 
 $output .= '},';
Please login to merge, or discard this patch.
Spacing   +290 added lines, -290 removed lines patch added patch discarded remove patch 
@@ -27,7 +27,7 @@  discard block
 
 block discarded – undo
27 27 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "LOOP_STOP","step": "SYSTEM_CLOCK_MULTIPLIER"}';
28 28
29 29 
 //	$output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}';
30 
-$output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
30 
+$output .= ',"clock": {"currentTime" : "'.date("c", time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"';
31 31 
 if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"';
32 32 
 $output .= '}';
33 33 
 //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}';
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 if (!isset($_GET['now'])) {
60 60 
 	$output .= '"epoch" : "'.date("Y").'-12-24T02:00:00Z",';
61 61 
 } else {
62 
-	$output .= '"epoch" : "'.date("c",time() - $globalLiveInterval).'",';
62 
+	$output .= '"epoch" : "'.date("c", time() - $globalLiveInterval).'",';
63 63 
 }
64 64 
 //$output .= '"type": "Point",';
65 65 
 //$output .= '"interpolationAlgorithm" : "LAGRANGE",';
 
@@ -69,581 +69,581 @@  discard block
 
 block discarded – undo
69 69 
 $output .= '"cartographicDegrees": [';
70 70 
 $i = 0;
71 71 
 $output .= $i.',-114.4,82.7,150000,';
72 
-$i = $i+300;
72 
+$i = $i + 300;
73 73 
 $output .= $i.',-173.300003,64.379997,150000,';
74 
-$i = $i+300;
74 
+$i = $i + 300;
75 75 
 $output .= $i.',177.479995,64.75,150000,';
76 
-$i = $i+300;
76 
+$i = $i + 300;
77 77 
 $output .= $i.',158.65,53.016667,150000,';
78 
-$i = $i+300;
78 
+$i = $i + 300;
79 79 
 $output .= $i.',165.545318,11.626074,150000,';
80 
-$i = $i+300;
80 
+$i = $i + 300;
81 81 
 $output .= $i.',171.1300517813333,7.07999665990053,150000,';
82 
-$i = $i+300;
82 
+$i = $i + 300;
83 83 
 $output .= $i.',179.380004,-16.469999,150000,';
84 
-$i = $i+300;
84 
+$i = $i + 300;
85 85 
 $output .= $i.',178.429992,-18.129999,150000,';
86 
-$i = $i+300;
86 
+$i = $i + 300;
87 87 
 $output .= $i.',174.759994,-36.849998,150000,';
88 
-$i = $i+300;
88 
+$i = $i + 300;
89 89 
 $output .= $i.',176.839996,-39.639999,150000,';
90 
-$i = $i+300;
90 
+$i = $i + 300;
91 91 
 $output .= $i.',174.779998,-41.279998,150000,';
92 
-$i = $i+300;
92 
+$i = $i + 300;
93 93 
 $output .= $i.',172.639999,-43.529998,150000,';
94 
-$i = $i+300;
94 
+$i = $i + 300;
95 95 
 $output .= $i.',167.838199,-46.986747,150000,';
96 
-$i = $i+300;
96 
+$i = $i + 300;
97 97 
 $output .= $i.',168.320999,-17.740391,150000,';
98 
-$i = $i+300;
98 
+$i = $i + 300;
99 99 
 $output .= $i.',167.149993,-15.51,150000,';
100 
-$i = $i+300;
100 
+$i = $i + 300;
101 101 
 $output .= $i.',159.910003,-9.43,150000,';
102 
-$i = $i+300;
102 
+$i = $i + 300;
103 103 
 $output .= $i.',156.850006,-8.1,150000,';
104 
-$i = $i+300;
104 
+$i = $i + 300;
105 105 
 $output .= $i.',158.160003,6.92,150000,';
106 
-$i = $i+300;
106 
+$i = $i + 300;
107 107 
 $output .= $i.',150.017702,45.873311,150000,';
108 
-$i = $i+300;
108 
+$i = $i + 300;
109 109 
 $output .= $i.',154.796487,49.429802,150000,';
110 
-$i = $i+300;
110 
+$i = $i + 300;
111 111 
 $output .= $i.',142.7262,46.948978,150000,';
112 
-$i = $i+300;
112 
+$i = $i + 300;
113 113 
 $output .= $i.',150.800003,59.569999,150000,';
114 
-$i = $i+300;
114 
+$i = $i + 300;
115 115 
 $output .= $i.',135.119995,48.419998,150000,';
116 
-$i = $i+300;
116 
+$i = $i + 300;
117 117 
 $output .= $i.',131.899993,43.130001,150000,';
118 
-$i = $i+300;
118 
+$i = $i + 300;
119 119 
 $output .= $i.',142.212096,27.070652,150000,';
120 
-$i = $i+300;
120 
+$i = $i + 300;
121 121 
 $output .= $i.',141.312779,24.78389,150000,';
122 
-$i = $i+300;
122 
+$i = $i + 300;
123 123 
 $output .= $i.',144.79373,13.444305,150000,';
124 
-$i = $i+300;
124 
+$i = $i + 300;
125 125 
 $output .= $i.',151.783334,8.45,150000,';
126 
-$i = $i+300;
126 
+$i = $i + 300;
127 127 
 $output .= $i.',151.749999,7.416667,150000,';
128 
-$i = $i+300;
128 
+$i = $i + 300;
129 129 
 $output .= $i.',152.160003,-4.199999,150000,';
130 
-$i = $i+300;
130 
+$i = $i + 300;
131 131 
 $output .= $i.',146.990005,-6.719999,150000,';
132 
-$i = $i+300;
132 
+$i = $i + 300;
133 133 
 $output .= $i.',143.211639,-9.085352,150000,';
134 
-$i = $i+300;
134 
+$i = $i + 300;
135 135 
 $output .= $i.',146.779998,-19.26,150000,';
136 
-$i = $i+300;
136 
+$i = $i + 300;
137 137 
 $output .= $i.',149.179992,-21.139999,150000,';
138 
-$i = $i+300;
138 
+$i = $i + 300;
139 139 
 $output .= $i.',153.020004,-27.459999,150000,';
140 
-$i = $i+300;
140 
+$i = $i + 300;
141 141 
 $output .= $i.',151.210006,-33.869998,150000,';
142 
-$i = $i+300;
142 
+$i = $i + 300;
143 143 
 $output .= $i.',147.291199,-42.85088,150000,';
144 
-$i = $i+300;
144 
+$i = $i + 300;
145 145 
 $output .= $i.',138.600006,-34.93,150000,';
146 
-$i = $i+300;
146 
+$i = $i + 300;
147 147 
 $output .= $i.',133.869995,-23.7,150000,';
148 
-$i = $i+300;
148 
+$i = $i + 300;
149 149 
 $output .= $i.',130.850006,-12.43,150000,';
150 
-$i = $i+300;
150 
+$i = $i + 300;
151 151 
 $output .= $i.',143.62,-3.56,150000,';
152 
-$i = $i+300;
152 
+$i = $i + 300;
153 153 
 $output .= $i.',134.5552,7.3608,150000,';
154 
-$i = $i+300;
154 
+$i = $i + 300;
155 155 
 $output .= $i.',135.169998,34.68,150000,';
156 
-$i = $i+300;
156 
+$i = $i + 300;
157 157 
 $output .= $i.',138.690002,35.169998,150000,';
158 
-$i = $i+300;
158 
+$i = $i + 300;
159 159 
 $output .= $i.',139.770004,35.669998,150000,';
160 
-$i = $i+300;
160 
+$i = $i + 300;
161 161 
 $output .= $i.',140.740005,40.830001,150000,';
162 
-$i = $i+300;
162 
+$i = $i + 300;
163 163 
 $output .= $i.',128.600006,35.869998,150000,';
164 
-$i = $i+300;
164 
+$i = $i + 300;
165 165 
 $output .= $i.',125.925925,38.950981,150000,';
166 
-$i = $i+300;
166 
+$i = $i + 300;
167 167 
 $output .= $i.',129.771118,62.093056,150000,';
168 
-$i = $i+300;
168 
+$i = $i + 300;
169 169 
 $output .= $i.',104.239997,52.330001,150000,';
170 
-$i = $i+300;
170 
+$i = $i + 300;
171 171 
 $output .= $i.',114.5056,48.060478,150000,';
172 
-$i = $i+300;
172 
+$i = $i + 300;
173 173 
 $output .= $i.',106.580001,29.569999,150000,';
174 
-$i = $i+300;
174 
+$i = $i + 300;
175 175 
 $output .= $i.',121.470001,31.229999,150000,';
176 
-$i = $i+300;
176 
+$i = $i + 300;
177 177 
 $output .= $i.',113.25,23.12,150000,';
178 
-$i = $i+300;
178 
+$i = $i + 300;
179 179 
 $output .= $i.',114.177465,22.307184,150000,';
180 
-$i = $i+300;
180 
+$i = $i + 300;
181 181 
 $output .= $i.',121.639999,18.36,150000,';
182 
-$i = $i+300;
182 
+$i = $i + 300;
183 183 
 $output .= $i.',122.080001,6.92,150000,';
184 
-$i = $i+300;
184 
+$i = $i + 300;
185 185 
 $output .= $i.',114.639999,4.809999,150000,';
186 
-$i = $i+300;
186 
+$i = $i + 300;
187 187 
 $output .= $i.',119.412399,-5.152193,150000,';
188 
-$i = $i+300;
188 
+$i = $i + 300;
189 189 
 $output .= $i.',122.230003,-17.959999,150000,';
190 
-$i = $i+300;
190 
+$i = $i + 300;
191 191 
 $output .= $i.',115.839996,-31.959999,150000,';
192 
-$i = $i+300;
192 
+$i = $i + 300;
193 193 
 $output .= $i.',105.680687,-10.428593,150000,';
194 
-$i = $i+300;
194 
+$i = $i + 300;
195 195 
 $output .= $i.',104.75,-2.99,150000,';
196 
-$i = $i+300;
196 
+$i = $i + 300;
197 197 
 $output .= $i.',113.029998,3.17,150000,';
198 
-$i = $i+300;
198 
+$i = $i + 300;
199 199 
 $output .= $i.',100.720001,4.86,150000,';
200 
-$i = $i+300;
200 
+$i = $i + 300;
201 201 
 $output .= $i.',104.18,10.609999,150000,';
202 
-$i = $i+300;
202 
+$i = $i + 300;
203 203 
 $output .= $i.',103.864403,13.36866,150000,';
204 
-$i = $i+300;
204 
+$i = $i + 300;
205 205 
 $output .= $i.',99.330001,9.14,150000,';
206 
-$i = $i+300;
206 
+$i = $i + 300;
207 207 
 $output .= $i.',105.073303,18.30217,150000,';
208 
-$i = $i+300;
208 
+$i = $i + 300;
209 209 
 $output .= $i.',91.132088,29.6507,150000,';
210 
-$i = $i+300;
210 
+$i = $i + 300;
211 211 
 $output .= $i.',116.477651,40.332809,150000,';
212 
-$i = $i+300;
212 
+$i = $i + 300;
213 213 
 $output .= $i.',93.059997,56.02,150000,';
214 
-$i = $i+300;
214 
+$i = $i + 300;
215 215 
 $output .= $i.',86.18,69.410003,150000,';
216 
-$i = $i+300;
216 
+$i = $i + 300;
217 217 
 $output .= $i.',88.202881,69.315422,150000,';
218 
-$i = $i+300;
218 
+$i = $i + 300;
219 219 
 $output .= $i.',73.400001,55,150000,';
220 
-$i = $i+300;
220 
+$i = $i + 300;
221 221 
 $output .= $i.',76.949996,52.299999,150000,';
222 
-$i = $i+300;
222 
+$i = $i + 300;
223 223 
 $output .= $i.',78.379997,42.490001,150000,';
224 
-$i = $i+300;
224 
+$i = $i + 300;
225 225 
 $output .= $i.',69.779998,37.919998,150000,';
226 
-$i = $i+300;
226 
+$i = $i + 300;
227 227 
 $output .= $i.',86.933333,27.983333,150000,';
228 
-$i = $i+300;
228 
+$i = $i + 300;
229 229 
 $output .= $i.',84.870002,27.02,150000,';
230 
-$i = $i+300;
230 
+$i = $i + 300;
231 231 
 $output .= $i.',88.36,22.569999,150000,';
232 
-$i = $i+300;
232 
+$i = $i + 300;
233 233 
 $output .= $i.',90.389999,23.7,150000,';
234 
-$i = $i+300;
234 
+$i = $i + 300;
235 235 
 $output .= $i.',97.04,20.78,150000,';
236 
-$i = $i+300;
236 
+$i = $i + 300;
237 237 
 $output .= $i.',92.762917,11.66857,150000,';
238 
-$i = $i+300;
238 
+$i = $i + 300;
239 239 
 $output .= $i.',50.23720550537109,-46.10261535644531,150000,';
240 
-$i = $i+300;
240 
+$i = $i + 300;
241 241 
 $output .= $i.',72.422489,-7.336367,150000,';
242 
-$i = $i+300;
242 
+$i = $i + 300;
243 243 
 $output .= $i.',73.510915,4.174199,150000,';
244 
-$i = $i+300;
244 
+$i = $i + 300;
245 245 
 $output .= $i.',81.050003,6.989999,150000,';
246 
-$i = $i+300;
246 
+$i = $i + 300;
247 247 
 $output .= $i.',72.819999,18.959999,150000,';
248 
-$i = $i+300;
248 
+$i = $i + 300;
249 249 
 $output .= $i.',78.042222,27.174167,150000,';
250 
-$i = $i+300;
250 
+$i = $i + 300;
251 251 
 $output .= $i.',71.449996,30.2,150000,';
252 
-$i = $i+300;
252 
+$i = $i + 300;
253 253 
 $output .= $i.',67.109993,36.703819,150000,';
254 
-$i = $i+300;
254 
+$i = $i + 300;
255 255 
 $output .= $i.',54.36,39.509998,150000,';
256 
-$i = $i+300;
256 
+$i = $i + 300;
257 257 
 $output .= $i.',63.726529,40.214486,150000,';
258 
-$i = $i+300;
258 
+$i = $i + 300;
259 259 
 $output .= $i.',58.853439,48.251126,150000,';
260 
-$i = $i+300;
260 
+$i = $i + 300;
261 261 
 $output .= $i.',56.23246,58.00024,150000,';
262 
-$i = $i+300;
262 
+$i = $i + 300;
263 263 
 $output .= $i.',49.659999,58.599998,150000,';
264 
-$i = $i+300;
264 
+$i = $i + 300;
265 265 
 $output .= $i.',50.150001,53.2,150000,';
266 
-$i = $i+300;
266 
+$i = $i + 300;
267 267 
 $output .= $i.',44.11,41.979999,150000,';
268 
-$i = $i+300;
268 
+$i = $i + 300;
269 269 
 $output .= $i.',49.893226,40.38344,150000,';
270 
-$i = $i+300;
270 
+$i = $i + 300;
271 271 
 $output .= $i.',44.75,40.5,150000,';
272 
-$i = $i+300;
272 
+$i = $i + 300;
273 273 
 $output .= $i.',50.95,34.650001,150000,';
274 
-$i = $i+300;
274 
+$i = $i + 300;
275 275 
 $output .= $i.',56.27433,27.18717,150000,';
276 
-$i = $i+300;
276 
+$i = $i + 300;
277 277 
 $output .= $i.',54.989491,25.005817,150000,';
278 
-$i = $i+300;
278 
+$i = $i + 300;
279 279 
 $output .= $i.',59.549999,22.569999,150000,';
280 
-$i = $i+300;
280 
+$i = $i + 300;
281 281 
 $output .= $i.',47.58318996007591,-9.722414273737707,150000,';
282 
-$i = $i+300;
282 
+$i = $i + 300;
283 283 
 $output .= $i.',57.471008,-20.26026,150000,';
284 
-$i = $i+300;
284 
+$i = $i + 300;
285 285 
 $output .= $i.',37.946460723877,-46.6428451538086,150000,';
286 
-$i = $i+300;
286 
+$i = $i + 300;
287 287 
 $output .= $i.',53,-67.5,150000,';
288 
-$i = $i+300;
288 
+$i = $i + 300;
289 289 
 $output .= $i.',46.99004,-25.03233,150000,';
290 
-$i = $i+300;
290 
+$i = $i + 300;
291 291 
 $output .= $i.',46.310001,-15.72,150000,';
292 
-$i = $i+300;
292 
+$i = $i + 300;
293 293 
 $output .= $i.',44.41203117370608,-12.22338294982911,150000,';
294 
-$i = $i+300;
294 
+$i = $i + 300;
295 295 
 $output .= $i.',39.3822,-6.097406,150000,';
296 
-$i = $i+300;
296 
+$i = $i + 300;
297 297 
 $output .= $i.',39.659999,-4.039999,150000,';
298 
-$i = $i+300;
298 
+$i = $i + 300;
299 299 
 $output .= $i.',40.033333,7.916667,150000,';
300 
-$i = $i+300;
300 
+$i = $i + 300;
301 301 
 $output .= $i.',42.549999,16.899999,150000,';
302 
-$i = $i+300;
302 
+$i = $i + 300;
303 303 
 $output .= $i.',43.970001,26.37,150000,';
304 
-$i = $i+300;
304 
+$i = $i + 300;
305 305 
 $output .= $i.',41.12,30.455,150000,';
306 
-$i = $i+300;
306 
+$i = $i + 300;
307 307 
 $output .= $i.',38.278671,34.547951,150000,';
308 
-$i = $i+300;
308 
+$i = $i + 300;
309 309 
 $output .= $i.',37.619998,55.75,150000,';
310 
-$i = $i+300;
310 
+$i = $i + 300;
311 311 
 $output .= $i.',30.453329,59.951889,150000,';
312 
-$i = $i+300;
312 
+$i = $i + 300;
313 313 
 $output .= $i.',23.12,63.84,150000,';
314 
-$i = $i+300;
314 
+$i = $i + 300;
315 315 
 $output .= $i.',26.709999,58.380001,150000,';
316 
-$i = $i+300;
316 
+$i = $i + 300;
317 317 
 $output .= $i.',25.42,57.549999,150000,';
318 
-$i = $i+300;
318 
+$i = $i + 300;
319 319 
 $output .= $i.',23.319999,55.93,150000,';
320 
-$i = $i+300;
320 
+$i = $i + 300;
321 321 
 $output .= $i.',26.1,52.119998,150000,';
322 
-$i = $i+300;
322 
+$i = $i + 300;
323 323 
 $output .= $i.',32.259998,48.5,150000,';
324 
-$i = $i+300;
324 
+$i = $i + 300;
325 325 
 $output .= $i.',28.829999,47.029998,150000,';
326 
-$i = $i+300;
326 
+$i = $i + 300;
327 327 
 $output .= $i.',25.61,45.659999,150000,';
328 
-$i = $i+300;
328 
+$i = $i + 300;
329 329 
 $output .= $i.',27.469999,42.509998,150000,';
330 
-$i = $i+300;
330 
+$i = $i + 300;
331 331 
 $output .= $i.',23.729999,37.979999,150000,';
332 
-$i = $i+300;
332 
+$i = $i + 300;
333 333 
 $output .= $i.',27.149999,38.43,150000,';
334 
-$i = $i+300;
334 
+$i = $i + 300;
335 335 
 $output .= $i.',31.132659,29.977088,150000,';
336 
-$i = $i+300;
336 
+$i = $i + 300;
337 337 
 $output .= $i.',32.659999,13.17,150000,';
338 
-$i = $i+300;
338 
+$i = $i + 300;
339 339 
 $output .= $i.',33.599998,1.71,150000,';
340 
-$i = $i+300;
340 
+$i = $i + 300;
341 341 
 $output .= $i.',25.92,-2.95,150000,';
342 
-$i = $i+300;
342 
+$i = $i + 300;
343 343 
 $output .= $i.',28.45,-14.439999,150000,';
344 
-$i = $i+300;
344 
+$i = $i + 300;
345 345 
 $output .= $i.',30.819999,-20.059999,150000,';
346 
-$i = $i+300;
346 
+$i = $i + 300;
347 347 
 $output .= $i.',21.639999,-21.7,150000,';
348 
-$i = $i+300;
348 
+$i = $i + 300;
349 349 
 $output .= $i.',25.59,-33.959999,150000,';
350 
-$i = $i+300;
350 
+$i = $i + 300;
351 351 
 $output .= $i.',18.129999,-26.579999,150000,';
352 
-$i = $i+300;
352 
+$i = $i + 300;
353 353 
 $output .= $i.',13.767777,-10.722417,150000,';
354 
-$i = $i+300;
354 
+$i = $i + 300;
355 355 
 $output .= $i.',10.13,-0.15,150000,';
356 
-$i = $i+300;
356 
+$i = $i + 300;
357 357 
 $output .= $i.',20.67,5.76,150000,';
358 
-$i = $i+300;
358 
+$i = $i + 300;
359 359 
 $output .= $i.',9.71,4.059999,150000,';
360 
-$i = $i+300;
360 
+$i = $i + 300;
361 361 
 $output .= $i.',7.44,10.52,150000,';
362 
-$i = $i+300;
362 
+$i = $i + 300;
363 363 
 $output .= $i.',18.69,12.189999,150000,';
364 
-$i = $i+300;
364 
+$i = $i + 300;
365 365 
 $output .= $i.',7.98,17,150000,';
366 
-$i = $i+300;
366 
+$i = $i + 300;
367 367 
 $output .= $i.',14.42,27.069999,150000,';
368 
-$i = $i+300;
368 
+$i = $i + 300;
369 369 
 $output .= $i.',3.678539,32.489059,150000,';
370 
-$i = $i+300;
370 
+$i = $i + 300;
371 371 
 $output .= $i.',-7.619999,33.599998,150000,';
372 
-$i = $i+300;
372 
+$i = $i + 300;
373 373 
 $output .= $i.',13.611066,38.129963,150000,';
374 
-$i = $i+300;
374 
+$i = $i + 300;
375 375 
 $output .= $i.',12.482323,41.895466,150000,';
376 
-$i = $i+300;
376 
+$i = $i + 300;
377 377 
 $output .= $i.',17.189752,44.763891,150000,';
378 
-$i = $i+300;
378 
+$i = $i + 300;
379 379 
 $output .= $i.',16.45,43.509998,150000,';
380 
-$i = $i+300;
380 
+$i = $i + 300;
381 381 
 $output .= $i.',14.51,46.060001,150000,';
382 
-$i = $i+300;
382 
+$i = $i + 300;
383 383 
 $output .= $i.',21.629999,47.54,150000,';
384 
-$i = $i+300;
384 
+$i = $i + 300;
385 385 
 $output .= $i.',16.37,48.220001,150000,';
386 
-$i = $i+300;
386 
+$i = $i + 300;
387 387 
 $output .= $i.',10.736111,47.554444,150000,';
388 
-$i = $i+300;
388 
+$i = $i + 300;
389 389 
 $output .= $i.',14.43,50.080001,150000,';
390 
-$i = $i+300;
390 
+$i = $i + 300;
391 391 
 $output .= $i.',17.129999,48.159999,150000,';
392 
-$i = $i+300;
392 
+$i = $i + 300;
393 393 
 $output .= $i.',22.569999,51.240001,150000,';
394 
-$i = $i+300;
394 
+$i = $i + 300;
395 395 
 $output .= $i.',13.411895,52.523781,150000,';
396 
-$i = $i+300;
396 
+$i = $i + 300;
397 397 
 $output .= $i.',10.039999,56.470001,150000,';
398 
-$i = $i+300;
398 
+$i = $i + 300;
399 399 
 $output .= $i.',13.02,55.61,150000,';
400 
-$i = $i+300;
400 
+$i = $i + 300;
401 401 
 $output .= $i.',17.329999,62.400001,150000,';
402 
-$i = $i+300;
402 
+$i = $i + 300;
403 403 
 $output .= $i.',14.229999,78.059997,150000,';
404 
-$i = $i+300;
404 
+$i = $i + 300;
405 405 
 $output .= $i.',10.399999,63.439998,150000,';
406 
-$i = $i+300;
406 
+$i = $i + 300;
407 407 
 $output .= $i.',2.350966,48.856558,150000,';
408 
-$i = $i+300;
408 
+$i = $i + 300;
409 409 
 $output .= $i.',7.42,43.75,150000,';
410 
-$i = $i+300;
410 
+$i = $i + 300;
411 411 
 $output .= $i.',1.57,42.54,150000,';
412 
-$i = $i+300;
412 
+$i = $i + 300;
413 413 
 $output .= $i.',-0.991293,37.605651,150000,';
414 
-$i = $i+300;
414 
+$i = $i + 300;
415 415 
 $output .= $i.',-7.429999,39.29,150000,';
416 
-$i = $i+300;
416 
+$i = $i + 300;
417 417 
 $output .= $i.',-11.4053,16.5889,150000,';
418 
-$i = $i+300;
418 
+$i = $i + 300;
419 419 
 $output .= $i.',-3.009999,16.78,150000,';
420 
-$i = $i+300;
420 
+$i = $i + 300;
421 421 
 $output .= $i.',-5.36008,5.83885,150000,';
422 
-$i = $i+300;
422 
+$i = $i + 300;
423 423 
 $output .= $i.',-12.3,11.319999,150000,';
424 
-$i = $i+300;
424 
+$i = $i + 300;
425 425 
 $output .= $i.',-16.239999,12.829999,150000,';
426 
-$i = $i+300;
426 
+$i = $i + 300;
427 427 
 $output .= $i.',-16.2507,28.457661,150000,';
428 
-$i = $i+300;
428 
+$i = $i + 300;
429 429 
 $output .= $i.',-0.126197,51.500197,150000,';
430 
-$i = $i+300;
430 
+$i = $i + 300;
431 431 
 $output .= $i.',-2.968111,56.461428,150000,';
432 
-$i = $i+300;
432 
+$i = $i + 300;
433 433 
 $output .= $i.',-7.308429,54.998539,150000,';
434 
-$i = $i+300;
434 
+$i = $i + 300;
435 435 
 $output .= $i.',-8.92,52.7,150000,';
436 
-$i = $i+300;
436 
+$i = $i + 300;
437 437 
 $output .= $i.',-19.000959,63.427502,150000,';
438 
-$i = $i+300;
438 
+$i = $i + 300;
439 439 
 $output .= $i.',-28.364049911499,38.47212219238281,150000,';
440 
-$i = $i+300;
440 
+$i = $i + 300;
441 441 
 $output .= $i.',-23.76,15.279999,150000,';
442 
-$i = $i+300;
442 
+$i = $i + 300;
443 443 
 $output .= $i.',-36.511219,-54.274151,150000,';
444 
-$i = $i+300;
444 
+$i = $i + 300;
445 445 
 $output .= $i.',-58.979999,-51.830001,150000,';
446 
-$i = $i+300;
446 
+$i = $i + 300;
447 447 
 $output .= $i.',-64.190002,-31.399999,150000,';
448 
-$i = $i+300;
448 
+$i = $i + 300;
449 449 
 $output .= $i.',-54.18,-32.36,150000,';
450 
-$i = $i+300;
450 
+$i = $i + 300;
451 451 
 $output .= $i.',-43.2,-22.909999,150000,';
452 
-$i = $i+300;
452 
+$i = $i + 300;
453 453 
 $output .= $i.',-37.333333,65.666667,150000,';
454 
-$i = $i+300;
454 
+$i = $i + 300;
455 455 
 $output .= $i.',-69.345131,77.48262,150000,';
456 
-$i = $i+300;
456 
+$i = $i + 300;
457 457 
 $output .= $i.',-55.65049,48.929001,150000,';
458 
-$i = $i+300;
458 
+$i = $i + 300;
459 459 
 $output .= $i.',-63.530471,44.681263,150000,';
460 
-$i = $i+300;
460 
+$i = $i + 300;
461 461 
 $output .= $i.',-66.647818,45.957319,150000,';
462 
-$i = $i+300;
462 
+$i = $i + 300;
463 463 
 $output .= $i.',-59.630001,13.18,150000,';
464 
-$i = $i+300;
464 
+$i = $i + 300;
465 465 
 $output .= $i.',-61.744888,12.06526,150000,';
466 
-$i = $i+300;
466 
+$i = $i + 300;
467 467 
 $output .= $i.',-61.171322,10.30501,150000,';
468 
-$i = $i+300;
468 
+$i = $i + 300;
469 469 
 $output .= $i.',-67.470001,7.9,150000,';
470 
-$i = $i+300;
470 
+$i = $i + 300;
471 471 
 $output .= $i.',-58.159999,6.789999,150000,';
472 
-$i = $i+300;
472 
+$i = $i + 300;
473 473 
 $output .= $i.',-60.02,-3.119999,150000,';
474 
-$i = $i+300;
474 
+$i = $i + 300;
475 475 
 $output .= $i.',-56.45,-14.409999,150000,';
476 
-$i = $i+300;
476 
+$i = $i + 300;
477 477 
 $output .= $i.',-65.260002,-19.059999,150000,';
478 
-$i = $i+300;
478 
+$i = $i + 300;
479 479 
 $output .= $i.',-56.636503,-24.158676,150000,';
480 
-$i = $i+300;
480 
+$i = $i + 300;
481 481 
 $output .= $i.',-56.509998,-33.409999,150000,';
482 
-$i = $i+300;
482 
+$i = $i + 300;
483 483 
 $output .= $i.',-68.523514,-50.021889,150000,';
484 
-$i = $i+300;
484 
+$i = $i + 300;
485 485 
 $output .= $i.',-72.505127,-51.732529,150000,';
486 
-$i = $i+300;
486 
+$i = $i + 300;
487 487 
 $output .= $i.',-71.639999,-33.04,150000,';
488 
-$i = $i+300;
488 
+$i = $i + 300;
489 489 
 $output .= $i.',-72.515821,-13.162849,150000,';
490 
-$i = $i+300;
490 
+$i = $i + 300;
491 491 
 $output .= $i.',-76.970001,-6.03,150000,';
492 
-$i = $i+300;
492 
+$i = $i + 300;
493 493 
 $output .= $i.',-78.620002,-1.24,150000,';
494 
-$i = $i+300;
494 
+$i = $i + 300;
495 495 
 $output .= $i.',-76.739997,8.1,150000,';
496 
-$i = $i+300;
496 
+$i = $i + 300;
497 497 
 $output .= $i.',-79.879913,9.368985,150000,';
498 
-$i = $i+300;
498 
+$i = $i + 300;
499 499 
 $output .= $i.',-76.949996,18,150000,';
500 
-$i = $i+300;
500 
+$i = $i + 300;
501 501 
 $output .= $i.',-72.699996,19.11,150000,';
502 
-$i = $i+300;
502 
+$i = $i + 300;
503 503 
 $output .= $i.',-75.220001,20.149999,150000,';
504 
-$i = $i+300;
504 
+$i = $i + 300;
505 505 
 $output .= $i.',-73.682953,20.95027,150000,';
506 
-$i = $i+300;
506 
+$i = $i + 300;
507 507 
 $output .= $i.',-80.605,28.405556,150000,';
508 
-$i = $i+300;
508 
+$i = $i + 300;
509 509 
 $output .= $i.',-84.388056,33.748889,150000,';
510 
-$i = $i+300;
510 
+$i = $i + 300;
511 511 
 $output .= $i.',-79.931111,32.776389,150000,';
512 
-$i = $i+300;
512 
+$i = $i + 300;
513 513 
 $output .= $i.',-83.920833,35.960556,150000,';
514 
-$i = $i+300;
514 
+$i = $i + 300;
515 515 
 $output .= $i.',-84.500278,38.049167,150000,';
516 
-$i = $i+300;
516 
+$i = $i + 300;
517 517 
 $output .= $i.',-77.460833,38.303056,150000,';
518 
-$i = $i+300;
518 
+$i = $i + 300;
519 519 
 $output .= $i.',-82.515556,40.758333,150000,';
520 
-$i = $i+300;
520 
+$i = $i + 300;
521 521 
 $output .= $i.',-83.045833,42.331389,150000,';
522 
-$i = $i+300;
522 
+$i = $i + 300;
523 523 
 $output .= $i.',-74.006389,40.714167,150000,';
524 
-$i = $i+300;
524 
+$i = $i + 300;
525 525 
 $output .= $i.',-71.802778,42.2625,150000,';
526 
-$i = $i+300;
526 
+$i = $i + 300;
527 527 
 $output .= $i.',-72.973056,43.610556,150000,';
528 
-$i = $i+300;
528 
+$i = $i + 300;
529 529 
 $output .= $i.',-68.0125,46.860556,150000,';
530 
-$i = $i+300;
530 
+$i = $i + 300;
531 531 
 $output .= $i.',-72.581779,46.357398,150000,';
532 
-$i = $i+300;
532 
+$i = $i + 300;
533 533 
 $output .= $i.',-78.53632621543271,52.72737572958358,150000,';
534 
-$i = $i+300;
534 
+$i = $i + 300;
535 535 
 $output .= $i.',-66.921779,52.940118,150000,';
536 
-$i = $i+300;
536 
+$i = $i + 300;
537 537 
 $output .= $i.',-75.652573,62.201069,150000,';
538 
-$i = $i+300;
538 
+$i = $i + 300;
539 539 
 $output .= $i.',-64.865257,67.935417,150000,';
540 
-$i = $i+300;
540 
+$i = $i + 300;
541 541 
 $output .= $i.',-94.969443,74.716943,150000,';
542 
-$i = $i+300;
542 
+$i = $i + 300;
543 543 
 $output .= $i.',-82.793909,76.395731,150000,';
544 
-$i = $i+300;
544 
+$i = $i + 300;
545 545 
 $output .= $i.',-97.49276733398439,69.18675994873048,150000,';
546 
-$i = $i+300;
546 
+$i = $i + 300;
547 547 
 $output .= $i.',-90.5537452697754,63.36753463745121,150000,';
548 
-$i = $i+300;
548 
+$i = $i + 300;
549 549 
 $output .= $i.',-89.270113,48.412197,150000,';
550 
-$i = $i+300;
550 
+$i = $i + 300;
551 551 
 $output .= $i.',-79.604159,43.68731,150000,';
552 
-$i = $i+300;
552 
+$i = $i + 300;
553 553 
 $output .= $i.',-89.401111,43.073056,150000,';
554 
-$i = $i+300;
554 
+$i = $i + 300;
555 555 
 $output .= $i.',-94.633611,42.395278,150000,';
556 
-$i = $i+300;
556 
+$i = $i + 300;
557 557 
 $output .= $i.',-89.588889,40.693611,150000,';
558 
-$i = $i+300;
558 
+$i = $i + 300;
559 559 
 $output .= $i.',-90.197778,38.627222,150000,';
560 
-$i = $i+300;
560 
+$i = $i + 300;
561 561 
 $output .= $i.',-90.704167,35.842222,150000,';
562 
-$i = $i+300;
562 
+$i = $i + 300;
563 563 
 $output .= $i.',-91.061667,33.41,150000,';
564 
-$i = $i+300;
564 
+$i = $i + 300;
565 565 
 $output .= $i.',-92.445,31.311111,150000,';
566 
-$i = $i+300;
566 
+$i = $i + 300;
567 567 
 $output .= $i.',-98.493333,29.423889,150000,';
568 
-$i = $i+300;
568 
+$i = $i + 300;
569 569 
 $output .= $i.',-103.349998,20.67,150000,';
570 
-$i = $i+300;
570 
+$i = $i + 300;
571 571 
 $output .= $i.',-86.830001,21.17,150000,';
572 
-$i = $i+300;
572 
+$i = $i + 300;
573 573 
 $output .= $i.',-89.529998,14.979999,150000,';
574 
-$i = $i+300;
574 
+$i = $i + 300;
575 575 
 $output .= $i.',-87.449996,13.42,150000,';
576 
-$i = $i+300;
576 
+$i = $i + 300;
577 577 
 $output .= $i.',-83.709999,9.369999,150000,';
578 
-$i = $i+300;
578 
+$i = $i + 300;
579 579 
 $output .= $i.',-91.5149765,-0.3781085,150000,';
580 
-$i = $i+300;
580 
+$i = $i + 300;
581 581 
 $output .= $i.',-109.425598,-27.1546,150000,';
582 
-$i = $i+300;
582 
+$i = $i + 300;
583 583 
 $output .= $i.',-109.9142,22.88093,150000,';
584 
-$i = $i+300;
584 
+$i = $i + 300;
585 585 
 $output .= $i.',-110.910003,27.92,150000,';
586 
-$i = $i+300;
586 
+$i = $i + 300;
587 587 
 $output .= $i.',-110.925833,32.221667,150000,';
588 
-$i = $i+300;
588 
+$i = $i + 300;
589 589 
 $output .= $i.',-104.526667,33.395,150000,';
590 
-$i = $i+300;
590 
+$i = $i + 300;
591 591 
 $output .= $i.',-113.061111,37.6775,150000,';
592 
-$i = $i+300;
592 
+$i = $i + 300;
593 593 
 $output .= $i.',-104.820833,38.833889,150000,';
594 
-$i = $i+300;
594 
+$i = $i + 300;
595 595 
 $output .= $i.',-108.73,42.833056,150000,';
596 
-$i = $i+300;
596 
+$i = $i + 300;
597 597 
 $output .= $i.',-113.895,45.175833,150000,';
598 
-$i = $i+300;
598 
+$i = $i + 300;
599 599 
 $output .= $i.',-113.993056,46.872222,150000,';
600 
-$i = $i+300;
600 
+$i = $i + 300;
601 601 
 $output .= $i.',-114.080796,51.039877,150000,';
602 
-$i = $i+300;
602 
+$i = $i + 300;
603 603 
 $output .= $i.',-102.3889594419702,57.15883691318781,150000,';
604 
-$i = $i+300;
604 
+$i = $i + 300;
605 605 
 $output .= $i.',-118.0333,66.0833,150000,';
606 
-$i = $i+300;
606 
+$i = $i + 300;
607 607 
 $output .= $i.',-140.55,64.45,150000,';
608 
-$i = $i+300;
608 
+$i = $i + 300;
609 609 
 $output .= $i.',-122.690386,58.80667,150000,';
610 
-$i = $i+300;
610 
+$i = $i + 300;
611 611 
 $output .= $i.',-121.92985,50.686341,150000,';
612 
-$i = $i+300;
612 
+$i = $i + 300;
613 613 
 $output .= $i.',-122.330833,47.606389,150000,';
614 
-$i = $i+300;
614 
+$i = $i + 300;
615 615 
 $output .= $i.',-122.274167,47.564167,150000,';
616 
-$i = $i+300;
616 
+$i = $i + 300;
617 617 
 $output .= $i.',-122.968503,45.309901,150000,';
618 
-$i = $i+300;
618 
+$i = $i + 300;
619 619 
 $output .= $i.',-122.874444,42.326667,150000,';
620 
-$i = $i+300;
620 
+$i = $i + 300;
621 621 
 $output .= $i.',-122.390556,40.586667,150000,';
622 
-$i = $i+300;
622 
+$i = $i + 300;
623 623 
 $output .= $i.',-117.068611,39.493333,150000,';
624 
-$i = $i+300;
624 
+$i = $i + 300;
625 625 
 $output .= $i.',-122.418333,37.775,150000,';
626 
-$i = $i+300;
626 
+$i = $i + 300;
627 627 
 $output .= $i.',-117.108333,34.207778,150000,';
628 
-$i = $i+300;
628 
+$i = $i + 300;
629 629 
 $output .= $i.',-116.544444,33.830278,150000,';
630 
-$i = $i+300;
630 
+$i = $i + 300;
631 631 
 $output .= $i.',-117.156389,32.715278,150000,';
632 
-$i = $i+300;
632 
+$i = $i + 300;
633 633 
 $output .= $i.',-149.891667,61.218333,150000,';
634 
-$i = $i+300;
634 
+$i = $i + 300;
635 635 
 $output .= $i.',-155.566389,62.948889,150000,';
636 
-$i = $i+300;
636 
+$i = $i + 300;
637 637 
 $output .= $i.',-165.406389,64.501111,150000,';
638 
-$i = $i+300;
638 
+$i = $i + 300;
639 639 
 $output .= $i.',-155.09,19.729722,150000,';
640 
-$i = $i+300;
640 
+$i = $i + 300;
641 641 
 $output .= $i.',-156.337974,20.804858,150000,';
642 
-$i = $i+300;
642 
+$i = $i + 300;
643 643 
 $output .= $i.',-157.043209,21.141189,150000,';
644 
-$i = $i+300;
644 
+$i = $i + 300;
645 645 
 $output .= $i.',-158.009167,21.386667,150000,';
646 
-$i = $i+300;
646 
+$i = $i + 300;
647 647 
 $output .= $i.',-159.371111,21.981111,150000';
648 648
649 649 
 $output .= ']}}';
Please login to merge, or discard this patch.
live-geojson.php 3 patches
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch 
@@ -11,10 +11,10 @@  discard block
 
 block discarded – undo
11 11 
 $Common = new Common();
12 12
13 13 
 if (isset($_GET['download'])) {
14 
-    if ($_GET['download'] == "true")
15 
-    {
14 
+	if ($_GET['download'] == "true")
15 
+	{
16 16 
 	header('Content-disposition: attachment; filename="flightairmap.json"');
17 
-    }
17 
+	}
18 18 
 }
19 19 
 header('Content-Type: text/javascript');
20 20 
 
@@ -333,26 +333,26 @@  discard block
 
 block discarded – undo
333 333
334 334 
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
335 335 
 				|| (!isset($_COOKIE['flightpath'])
336 
-				    && (!isset($globalMapHistory) || $globalMapHistory || $allhistory)
337 
-				    || (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id'])))
336 
+					&& (!isset($globalMapHistory) || $globalMapHistory || $allhistory)
337 
+					|| (isset($history) && $history != '' && $history != 'NA' && ($history == $spotter_item['ident'] || $history == $spotter_item['flightaware_id'])))
338 338 
 				|| (isset($history) && $history == '' && isset($_GET['flightaware_id']) && $_GET['flightaware_id'] == $spotter_item['flightaware_id'])) {
339 
-                                    if ($from_archive) {
340 
-					    $spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
341 
-                                    } else {
342 
-					    $spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
343 
-                                    }
344 
-                            	$d = false;
339 
+									if ($from_archive) {
340 
+						$spotter_history_array = $SpotterArchive->getAllArchiveSpotterDataById($spotter_item['flightaware_id']);
341 
+									} else {
342 
+						$spotter_history_array = $SpotterLive->getAllLiveSpotterDataById($spotter_item['flightaware_id']);
343 
+									}
344 
+								$d = false;
345 345 
 				foreach ($spotter_history_array as $key => $spotter_history)
346 346 
 				{
347 347 
 					$alt = round($spotter_history['altitude']/10)*10;
348 348 
 					if (!isset($prev_alt) || $prev_alt != $alt) {
349 
-					    if (isset($prev_alt)) {
349 
+						if (isset($prev_alt)) {
350 350 
 						$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].', '.$spotter_history['altitude'].']';
351 351 
 						$output_history .= ']}},';
352 352 
 						$output .= $output_history;
353 
-					    }
354 
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
355 
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
353 
+						}
354 
+						if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
355 
+						else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
356 356 
 					}
357 357 
 					$output_history .= '[';
358 358 
 					$output_history .=  $spotter_history['longitude'].', ';
 
@@ -360,38 +360,38 @@  discard block
 
 block discarded – undo
360 360 
 					$output_history .=  $spotter_history['altitude']*30.48;
361 361 
 					$output_history .= '],';
362 362 
 					$prev_alt = $alt;
363 
-				    //}
363 
+					//}
364 364 
 				}
365 365 
 				if (isset($output_history)) {
366 
-				    $output_history  = substr($output_history, 0, -1);
367 
-				    $output_history .= ']}},';
368 
-				    $output .= $output_history;
369 
-				    unset($prev_alt);
370 
-				    unset($output_history);
366 
+					$output_history  = substr($output_history, 0, -1);
367 
+					$output_history .= ']}},';
368 
+					$output .= $output_history;
369 
+					unset($prev_alt);
370 
+					unset($output_history);
371 371 
 				}
372 372 
 				}
373 373
374 374 
 				if (isset($history) && $history == $spotter_item['ident'] && isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA' && isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA' && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true") || (!isset($_COOKIE['MapRoute']) && (!isset($globalMapRoute) || (isset($globalMapRoute) && $globalMapRoute))))) {
375 
-				    $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
376 
-				    if (isset($spotter_item['departure_airport_latitude'])) {
375 
+					$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
376 
+					if (isset($spotter_item['departure_airport_latitude'])) {
377 377 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
378 
-				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
378 
+					} elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
379 379 
 					$dairport = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
380 380 
 					if (isset($dairport[0]['latitude'])) {
381 
-					    $output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
381 
+						$output_air .= '['.$dairport[0]['longitude'].','.$dairport[0]['latitude'].'],';
382 382 
 					}
383 
-				    }
384 
-				    if (isset($spotter_item['arrival_airport_latitude'])) {
383 
+					}
384 
+					if (isset($spotter_item['arrival_airport_latitude'])) {
385 385 
 					$output_air .= '['.$spotter_item['arrival_airport_longitude'].','.$spotter_item['arrival_airport_latitude'].']';
386 
-				    } elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
386 
+					} elseif (isset($spotter_item['arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
387 387 
 					$aairport = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
388 388 
 					if (isset($aairport[0]['latitude'])) {
389 
-					    $output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
389 
+						$output_air .= '['.$aairport[0]['longitude'].','.$aairport[0]['latitude'].']';
390 390 
 					}
391 
-				    }
392 
-				    $output_air .= ']}},';
393 
-				    $output .= $output_air;
394 
-				    unset($output_air);
391 
+					}
392 
+					$output_air .= ']}},';
393 
+					$output .= $output_air;
394 
+					unset($output_air);
395 395 
 				}
396 396 
 			}
397 397 
 			$output  = substr($output, 0, -1);
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch 
@@ -25,23 +25,23 @@  discard block
 
 block discarded – undo
25 25 
 $min = true;
26 26 
 $allhistory = false;
27 27 
 $filter['source'] = array();
28 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
29 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
30 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
31 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
32 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
33 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
34 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
35 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
36 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
37 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
28 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
29 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
30 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
31 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs'));
32 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
33 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
34 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
35 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
36 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
37 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
38 38
39 39 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
40 40 
 	$min = true;
41 41 
 } else $min = false;
42 42
43 43 
 if (isset($_GET['ident'])) {
44 
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
44 
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
45 45 
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
46 46 
 	if (empty($spotter_array)) {
47 47 
 		$from_archive = true;
 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
 	}
50 50 
 	$allhistory = true;
51 51 
 } elseif (isset($_GET['flightaware_id'])) {
52 
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
52 
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
53 53 
 	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
54 54 
 	if (empty($spotter_array)) {
55 55 
 		$from_archive = true;
 
@@ -58,25 +58,25 @@  discard block
 
 block discarded – undo
58 58 
 	$allhistory = true;
59 59 
 } elseif (isset($_GET['coord']) && (!isset($globalMapPopup) || $globalMapPopup || (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true'))) {
60 60 
 //if (isset($_GET['coord'])) {
61 
-	$coord = explode(',',$_GET['coord']);
62 
-	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord,$filter);
61 
+	$coord = explode(',', $_GET['coord']);
62 
+	$spotter_array = $SpotterLive->getLiveSpotterDatabyCoord($coord, $filter);
63 63
64 64 
 #} elseif (isset($globalMapPopup) && !$globalMapPopup) {
65 65 
 } elseif (isset($_GET['archive']) && isset($_GET['begindate']) && isset($_GET['enddate']) && isset($_GET['speed'])) {
66 66 
 	$from_archive = true;
67 67 
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
68 68 
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
69 
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
70 
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
71 
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
72 
-	$begindate = date('Y-m-d H:i:s',$begindate);
73 
-	$enddate = date('Y-m-d H:i:s',$enddate);
74 
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
69 
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
70 
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
71 
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
72 
+	$begindate = date('Y-m-d H:i:s', $begindate);
73 
+	$enddate = date('Y-m-d H:i:s', $enddate);
74 
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
75 75 
 } elseif ($min) {
76 76 
 	$spotter_array = $SpotterLive->getMinLiveSpotterData($filter);
77 77 
 #	$min = true;
78 78 
 } else {
79 
-	$spotter_array = $SpotterLive->getLiveSpotterData('','',$filter);
79 
+	$spotter_array = $SpotterLive->getLiveSpotterData('', '', $filter);
80 80 
 }
81 81
82 82 
 if (!empty($spotter_array)) {
 
@@ -91,7 +91,7 @@  discard block
 
 block discarded – undo
91 91 
 	if ($flightcnt == '') $flightcnt = 0;
92 92 
 } else $flightcnt = 0;
93 93
94 
-$sqltime = round(microtime(true)-$begintime,2);
94 
+$sqltime = round(microtime(true) - $begintime, 2);
95 95
96 96 
 if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
97 97 
 else $usenextlatlon = true;
 
@@ -108,7 +108,7 @@  discard block
 
 block discarded – undo
108 108 
 		if (!empty($spotter_array) && is_array($spotter_array))
109 109 
 		{
110 110 
 			$output .= '"features": [';
111 
-			foreach($spotter_array as $spotter_item)
111 
+			foreach ($spotter_array as $spotter_item)
112 112 
 			{
113 113 
 				$j++;
114 114 
 				date_default_timezone_set('UTC');
 
@@ -159,7 +159,7 @@  discard block
 
 block discarded – undo
159 159 
 						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
160 160 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
161 161 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
162 
-							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
162 
+							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ', '_', $spotter_item['aircraft_name'])).'",';
163 163 
 						} elseif (isset($spotter_item['aircraft_type'])) {
164 164 
 							$output .= '"aircraft_name": "NA ('.$spotter_item['aircraft_type'].')",';
165 165 
 						} elseif (!$min) {
 
@@ -233,16 +233,16 @@  discard block
 
 block discarded – undo
233 233 
 						else $output .= '"heading": "'.$spotter_item['heading'].'",';
234 234
235 235 
 						if (isset($archivespeed)) {
236 
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
236 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading'], $archivespeed);
237 237 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
238 238 
 						} elseif ($usenextlatlon) {
239 
-							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
239 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'], $spotter_item['longitude'], $spotter_item['ground_speed'], $spotter_item['heading']);
240 240 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
241 241 
 						}
242 242
243 243 
 						if (!$min) $output .= '"image": "'.$image.'",';
244 244 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
245 
-							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
245 
+							$output .= '"image_copyright": "'.str_replace('"', "'", trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $spotter_item['image_copyright']))).'",';
246 246 
 						}
247 247 
 						if (isset($spotter_item['image_source_website'])) {
248 248 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 
@@ -264,7 +264,7 @@  discard block
 
 block discarded – undo
264 264 
 							$output .= '"waypoints": "'.$spotter_item['waypoints'].'",';
265 265 
 						}
266 266 
 						if (isset($spotter_item['acars'])) {
267 
-							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
267 
+							$output .= '"acars": "'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br />', $spotter_item['acars']['message'])).'",';
268 268 
 						}
269 269 
 						// type when not aircraft ?
270 270 
 						if ($compress) $output .= '"t": "aircraft"';
 
@@ -334,7 +334,7 @@  discard block
 
 block discarded – undo
334 334
335 335 
 			}
336 336 
 */
337 
-				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
337 
+				$history = filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING);
338 338 
 				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
339 339
340 340 
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -361,9 +361,9 @@  discard block
 
 block discarded – undo
361 361 
 					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
362 362 
 					}
363 363 
 					$output_history .= '[';
364 
-					$output_history .=  $spotter_history['longitude'].', ';
365 
-					$output_history .=  $spotter_history['latitude'].', ';
366 
-					$output_history .=  $spotter_history['altitude']*30.48;
364 
+					$output_history .= $spotter_history['longitude'].', ';
365 
+					$output_history .= $spotter_history['latitude'].', ';
366 
+					$output_history .= $spotter_history['altitude']*30.48;
367 367 
 					$output_history .= '],';
368 368 
 					$prev_alt = $alt;
369 369 
 				    //}
 
@@ -403,7 +403,7 @@  discard block
 
 block discarded – undo
403 403 
 			$output  = substr($output, 0, -1);
404 404 
 			$output .= ']';
405 405 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
406 
-			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
406 
+			$output .= '"totaltime": "'.round(microtime(true) - $begintime, 2).'",';
407 407 
 			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
408 408 
 			$output .= '"fc": "'.$j.'"';
409 409 
 		} else {
Please login to merge, or discard this patch.
Braces   +142 added lines, -55 removed lines patch added patch discarded remove patch 
@@ -18,27 +18,52 @@  discard block
 
 block discarded – undo
18 18 
 }
19 19 
 header('Content-Type: text/javascript');
20 20
21 
-if (!isset($globalJsonCompress)) $compress = true;
22 
-else $compress = $globalJsonCompress;
21 
+if (!isset($globalJsonCompress)) {
22 
+	$compress = true;
23 
+} else {
24 
+	$compress = $globalJsonCompress;
25 
+}
23 26
24 27 
 $from_archive = false;
25 28 
 $min = true;
26 29 
 $allhistory = false;
27 30 
 $filter['source'] = array();
28 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
29 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
30 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
31 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
32 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
33 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
34 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
35 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
36 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
37 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
31 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
32 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
33 
+}
34 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
35 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
36 
+}
37 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
38 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
39 
+}
40 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
41 
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
42 
+}
43 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
44 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
45 
+}
46 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
47 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
48 
+}
49 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
50 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
51 
+}
52 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
53 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
54 
+}
55 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
56 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
57 
+}
58 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
59 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
60 
+}
38 61
39 62 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
40 63 
 	$min = true;
41 
-} else $min = false;
64 
+} else {
65 
+	$min = false;
66 
+}
42 67
43 68 
 if (isset($_GET['ident'])) {
44 69 
 	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
 
@@ -88,20 +113,30 @@  discard block
 
 block discarded – undo
88 113 
 	}
89 114 
 */
90 115 
 	$flightcnt = count($spotter_array);
91 
-	if ($flightcnt == '') $flightcnt = 0;
92 
-} else $flightcnt = 0;
116 
+	if ($flightcnt == '') {
117 
+		$flightcnt = 0;
118 
+	}
119 
+	} else {
120 
+	$flightcnt = 0;
121 
+}
93 122
94 123 
 $sqltime = round(microtime(true)-$begintime,2);
95 124
96 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
97 
-else $usenextlatlon = true;
125 
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
126 
+	$usenextlatlon = false;
127 
+} else {
128 
+	$usenextlatlon = true;
129 
+}
98 130 
 $j = 0;
99 131 
 $prev_flightaware_id = '';
100 132 
 $aircrafts_shadow = array();
101 133 
 $output = '{';
102 134 
 	$output .= '"type": "FeatureCollection",';
103 
-		if ($min) $output .= '"minimal": "true",';
104 
-		else $output .= '"minimal": "false",';
135 
+		if ($min) {
136 
+			$output .= '"minimal": "true",';
137 
+		} else {
138 
+			$output .= '"minimal": "false",';
139 
+		}
105 140 
 		$output .= '"fc": "'.$flightcnt.'",';
106 141 
 		$output .= '"sqt": "'.$sqltime.'",';
107 142 
 
@@ -138,11 +173,16 @@  discard block
 
 block discarded – undo
138 173 
 						//$output .= '"sqt": "'.$sqltime.'",';
139 174 
 						$output .= '"id": "'.$spotter_item['flightaware_id'].'",';
140 175 
 						$output .= '"properties": {';
141 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
142 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
176 
+							if ($compress) {
177 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
178 
+							} else {
179 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
180 
+							}
143 181 
 							$output .= '"fc": "'.$flightcnt.'",';
144 182 
 							$output .= '"sqt": "'.$sqltime.'",';
145 
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
183 
+							if (isset($begindate)) {
184 
+								$output .= '"archive_date": "'.$begindate.'",';
185 
+							}
146 186
147 187 
 /*
148 188 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -150,13 +190,21 @@  discard block
 
 block discarded – undo
150 190 
 */
151 191 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
152 192 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
153 
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
154 
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
193 
+							if ($compress) {
194 
+								$output .= '"c": "'.$spotter_item['ident'].'",';
195 
+							} else {
196 
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
197 
+							}
155 198 
 						} else {
156 
-							if ($compress) $output .= '"c": "NA",';
157 
-							else $output .= '"callsign": "NA",';
199 
+							if ($compress) {
200 
+								$output .= '"c": "NA",';
201 
+							} else {
202 
+								$output .= '"callsign": "NA",';
203 
+							}
204 
+						}
205 
+						if (isset($spotter_item['registration'])) {
206 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
158 207 
 						}
159 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
160 208 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
161 209 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
162 210 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -169,25 +217,37 @@  discard block
 
 block discarded – undo
169 217 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
170 218 
 						}
171 219 
 						if (!isset($spotter_item['aircraft_shadow'])) {
172 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
173 
-							else {
220 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
221 
+								$spotter_item['aircraft_shadow'] = '';
222 
+							} else {
174 223 
 								$aircraft_icao = $spotter_item['aircraft_icao'];
175 
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
176 
-								else {
224 
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
225 
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
226 
+								} else {
177 227 
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
178 
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
179 
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
180 
-									else $spotter_item['aircraft_shadow'] = '';
228 
+									if (count($aircraft_info) > 0) {
229 
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
230 
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
231 
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
232 
+									} else {
233 
+										$spotter_item['aircraft_shadow'] = '';
234 
+									}
181 235 
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
182 236 
 								}
183 237 
 							}
184 238 
 						}
185 239 
 						if ($spotter_item['aircraft_shadow'] == '') {
186 
-							if ($compress) $output .= '"as": "default.png",';
187 
-							else $output .= '"aircraft_shadow": "default.png",';
240 
+							if ($compress) {
241 
+								$output .= '"as": "default.png",';
242 
+							} else {
243 
+								$output .= '"aircraft_shadow": "default.png",';
244 
+							}
188 245 
 						} else {
189 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
190 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
246 
+							if ($compress) {
247 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
248 
+							} else {
249 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
250 
+							}
191 251 
 						}
192 252 
 						if (isset($spotter_item['airline_name'])) {
193 253 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -195,8 +255,11 @@  discard block
 
 block discarded – undo
195 255 
 							$output .= '"airline_name": "NA",';
196 256 
 						}
197 257 
 						if (isset($spotter_item['departure_airport'])) {
198 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
199 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
258 
+							if ($compress) {
259 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
260 
+							} else {
261 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
262 
+							}
200 263 
 						}
201 264 
 						if (isset($spotter_item['departure_airport_city'])) {
202 265 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -208,8 +271,11 @@  discard block
 
 block discarded – undo
208 271 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
209 272 
 						}
210 273 
 						if (isset($spotter_item['arrival_airport'])) {
211 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
212 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
274 
+							if ($compress) {
275 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
276 
+							} else {
277 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
278 
+							}
213 279 
 						}
214 280 
 						if (isset($spotter_item['arrival_airport_city'])) {
215 281 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -227,10 +293,16 @@  discard block
 
 block discarded – undo
227 293 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
228 294 
 						}
229 295
230 
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
231 
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
232 
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
233 
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
296 
+						if ($compress) {
297 
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
298 
+						} else {
299 
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
300 
+						}
301 
+						if ($compress) {
302 
+							$output .= '"h": "'.$spotter_item['heading'].'",';
303 
+						} else {
304 
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
305 
+						}
234 306
235 307 
 						if (isset($archivespeed)) {
236 308 
 							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
 
@@ -240,7 +312,9 @@  discard block
 
 block discarded – undo
240 312 
 							$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
241 313 
 						}
242 314
243 
-						if (!$min) $output .= '"image": "'.$image.'",';
315 
+						if (!$min) {
316 
+							$output .= '"image": "'.$image.'",';
317 
+						}
244 318 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
245 319 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
246 320 
 						}
 
@@ -248,8 +322,11 @@  discard block
 
 block discarded – undo
248 322 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
249 323 
 						}
250 324 
 						if (isset($spotter_item['squawk'])) {
251 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
252 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
325 
+							if ($compress) {
326 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
327 
+							} else {
328 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
329 
+							}
253 330 
 						}
254 331 
 						if (isset($spotter_item['squawk_usage'])) {
255 332 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -267,8 +344,11 @@  discard block
 
 block discarded – undo
267 344 
 							$output .= '"acars": "'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"), '<br />',$spotter_item['acars']['message'])).'",';
268 345 
 						}
269 346 
 						// type when not aircraft ?
270 
-						if ($compress) $output .= '"t": "aircraft"';
271 
-						else $output .= '"type": "aircraft"';
347 
+						if ($compress) {
348 
+							$output .= '"t": "aircraft"';
349 
+						} else {
350 
+							$output .= '"type": "aircraft"';
351 
+						}
272 352 
 						$output .= '},';
273 353 
 						$output .= '"geometry": {';
274 354 
 							$output .= '"type": "Point",';
 
@@ -335,7 +415,9 @@  discard block
 
 block discarded – undo
335 415 
 			}
336 416 
 */
337 417 
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
338 
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
418 
+				if ($history == '' && isset($_COOKIE['history'])) {
419 
+					$history = $_COOKIE['history'];
420 
+				}
339 421
340 422 
 				if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')
341 423 
 				|| (!isset($_COOKIE['flightpath']) 
@@ -357,8 +439,11 @@  discard block
 
 block discarded – undo
357 439 
 						$output_history .= ']}},';
358 440 
 						$output .= $output_history;
359 441 
 					    }
360 
-					    if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
361 
-					    else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
442 
+					    if ($compress) {
443 
+					    	$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
444 
+					    } else {
445 
+					    	$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
446 
+					    }
362 447 
 					}
363 448 
 					$output_history .= '[';
364 449 
 					$output_history .=  $spotter_history['longitude'].', ';
 
@@ -404,7 +489,9 @@  discard block
 
 block discarded – undo
404 489 
 			$output .= ']';
405 490 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
406 491 
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
407 
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
492 
+			if (isset($begindate)) {
493 
+				$output .= '"archive_date": "'.$begindate.'",';
494 
+			}
408 495 
 			$output .= '"fc": "'.$j.'"';
409 496 
 		} else {
410 497 
 			$output .= '"features": ';
Please login to merge, or discard this patch.