View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 7bafef...153884 )
by Yannick
31:51
created
Status
Category
Toggle Patches
install/index.php 1 patch
Spacing   +290 added lines, -290 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,7 @@  discard block
 
 block discarded – undo
22 22 
 require_once(dirname(__FILE__).'/class.create_db.php');
23 23 
 require_once(dirname(__FILE__).'/class.update_schema.php');
24 24 
 require_once(dirname(__FILE__).'/class.settings.php');
25 
-$title="Install";
25 
+$title = "Install";
26 26 
 require(dirname(__FILE__).'/../require/settings.php');
27 27 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
28 28 
 require(dirname(__FILE__).'/header.php');
 
@@ -93,8 +93,8 @@  discard block
 
 block discarded – undo
93 93 
 	if (!extension_loaded('curl')) {
94 94 
 		$error[] = "Curl is not loaded.";
95 95 
 	}
96 
-	if(function_exists('apache_get_modules') ){
97 
-		if(!in_array('mod_rewrite',apache_get_modules())) {
96 
+	if (function_exists('apache_get_modules')) {
97 
+		if (!in_array('mod_rewrite', apache_get_modules())) {
98 98 
 			$error[] = "mod_rewrite is not available.";
99 99 
 		}
100 100 
 	/*
 
@@ -111,12 +111,12 @@  discard block
 
 block discarded – undo
111 111 
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
112 112 
 		if (function_exists('get_headers')) {
113 113 
 			//$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
114 
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'live/geojson?test',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
115 
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
114 
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'live/geojson?test', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
115 
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
116 116 
 				print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
117 117 
 			} else {
118 
-				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
119 
-				if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
118 
+				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'search', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
119 
+				if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
120 120 
 					print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
121 121 
 				}
122 122 
 			}
 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
197 197 
 					if (isset($_SERVER['REQUEST_URI'])) {
198 198 
 						$URL = $_SERVER['REQUEST_URI'];
199 
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
199 
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
200 200 
 					}
201 201 
 				    }
202 202 
 				?>
 
@@ -519,13 +519,13 @@  discard block
 
 block discarded – undo
519 519 
 ?>
520 520 
 							<tr>
521 521 
 								<?php
522 
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
522 
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
523 523 
 								?>
524 524 
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
525 525 
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
526 526 
 								<?php
527 527 
 								    } else {
528 
-									$hostport = explode(':',$source['host']);
528 
+									$hostport = explode(':', $source['host']);
529 529 
 									if (isset($hostport[1])) {
530 530 
 										$host = $hostport[0];
531 531 
 										$port = $hostport[1];
 
@@ -575,7 +575,7 @@  discard block
 
 block discarded – undo
575 575 
 									<select name="timezones[]" id="timezones">
576 576 
 								<?php
577 577 
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
578 
-									foreach($timezonelist as $timezones){
578 
+									foreach ($timezonelist as $timezones) {
579 579 
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
580 580 
 											print '<option selected>'.$timezones.'</option>';
581 581 
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
 
@@ -630,7 +630,7 @@  discard block
 
 block discarded – undo
630 630 
 									<select name="timezones[]" id="timezones">
631 631 
 								<?php
632 632 
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
633 
-									foreach($timezonelist as $timezones){
633 
+									foreach ($timezonelist as $timezones) {
634 634 
 										if ($timezones == 'UTC') {
635 635 
 											print '<option selected>'.$timezones.'</option>';
636 636 
 										} else print '<option>'.$timezones.'</option>';
 
@@ -1093,7 +1093,7 @@  discard block
 
 block discarded – undo
1093 1093 
 			<br />
1094 1094 
 			<p>
1095 1095 
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
1096 
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
1096 
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
1097 1097 
 			</p>
1098 1098 
 			<br />
1099 1099 
 			<p>
 
@@ -1155,14 +1155,14 @@  discard block
 
 block discarded – undo
1155 1155 
 $error = '';
1156 1156
1157 1157 
 if (isset($_POST['dbtype'])) {
1158 
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
1159 
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
1160 
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
1161 
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
1162 
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
1163 
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
1164 
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
1165 
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
1158 
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
1159 
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
1160 
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
1161 
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
1162 
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
1163 
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
1164 
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
1165 
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
1166 1166
1167 1167 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
1168 1168 
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
 
@@ -1182,49 +1182,49 @@  discard block
 
 block discarded – undo
1182 1182 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1183 1183 
 	*/
1184 1184
1185 
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1185 
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
1186 1186
1187 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
1188 
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
1189 
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
1190 
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
1191 
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
1187 
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
1188 
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
1189 
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
1190 
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
1191 
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
1192 1192
1193 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
1194 
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
1195 
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
1196 
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
1197 
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
1198 
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
1199 
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
1200 
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
1201 
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
1202 
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
1193 
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
1194 
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
1195 
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
1196 
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
1197 
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
1198 
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
1199 
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
1200 
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
1201 
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
1202 
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
1203 1203
1204 
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
1205 
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
1206 
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
1207 
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
1208 
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
1209 
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
1204 
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
1205 
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
1206 
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
1207 
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
1208 
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
1209 
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
1210 1210
1211 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
1212 
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
1211 
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
1212 
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
1213 1213
1214 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
1215 
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
1216 
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
1214 
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
1215 
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
1216 
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
1217 1217
1218 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
1218 
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
1219 1219 
 	if ($acars == 'acars') {
1220 
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
1220 
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
1221 1221 
 	} else {
1222 
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
1222 
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
1223 1223 
 	}
1224 1224
1225 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
1226 
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
1227 
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
1225 
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
1226 
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
1227 
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
1228 1228
1229 1229 
 	$source_name = $_POST['source_name'];
1230 1230 
 	$source_latitude = $_POST['source_latitude'];
 
@@ -1238,8 +1238,8 @@  discard block
 
 block discarded – undo
1238 1238
1239 1239 
 	$sources = array();
1240 1240 
 	foreach ($source_name as $keys => $name) {
1241 
-	    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]);
1242 
-	    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]);
1241 
+	    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]);
1242 
+	    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]);
1243 1243 
 	}
1244 1244 
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1245 1245 
 
@@ -1248,16 +1248,16 @@  discard block
 
 block discarded – undo
1248 1248 
 	$newstype = $_POST['newstype'];
1249 1249
1250 1250 
 	$newsfeeds = array();
1251 
-	foreach($newsurl as $newskey => $url) {
1251 
+	foreach ($newsurl as $newskey => $url) {
1252 1252 
 	    if ($url != '') {
1253 1253 
 		$type = $newstype[$newskey];
1254 1254 
 		$lng = $newslng[$newskey];
1255 1255 
 		if (isset($newsfeeds[$type][$lng])) {
1256 
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
1256 
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
1257 1257 
 		} else $newsfeeds[$type][$lng] = array($url);
1258 1258 
 	    }
1259 1259 
 	}
1260 
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
1260 
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
1261 1261
1262 1262 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
1263 1263 
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
 
@@ -1268,27 +1268,27 @@  discard block
 
 block discarded – undo
1268 1268 
 	$sbsurl = $_POST['sbsurl'];
1269 1269 
 	*/
1270 1270
1271 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
1272 
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
1273 
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
1274 
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
1275 
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
1276 
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
1277 
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
1278 
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1271 
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
1272 
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
1273 
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
1274 
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
1275 
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
1276 
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
1277 
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
1278 
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
1279 1279
1280 
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1281 
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1282 
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1283 
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1284 
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1285 
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1286 
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1287 
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1288 
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1289 
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1290 
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1291 
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1280 
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
1281 
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
1282 
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
1283 
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
1284 
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
1285 
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
1286 
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
1287 
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
1288 
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
1289 
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
1290 
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
1291 
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
1292 1292
1293 1293 
 /*
1294 1294 
 	$globalSBS1Hosts = array();
 
@@ -1304,7 +1304,7 @@  discard block
 
 block discarded – undo
1304 1304 
 	}
1305 1305 
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
1306 1306 
 */
1307 
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
1307 
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
1308 1308 
 	$host = $_POST['host'];
1309 1309 
 	$port = $_POST['port'];
1310 1310 
 	$name = $_POST['name'];
 
@@ -1321,115 +1321,115 @@  discard block
 
 block discarded – undo
1321 1321 
 		else $cov = 'FALSE';
1322 1322 
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1323 1323 
 		else $arch = 'FALSE';
1324 
-		if (strpos($format[$key],'_callback')) {
1325 
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1324 
+		if (strpos($format[$key], '_callback')) {
1325 
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
1326 1326 
 		} elseif ($h != '' || $name[$key] != '') {
1327 
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1327 
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
1328 1328 
 		}
1329 1329 
 		if ($format[$key] == 'airwhere') $forcepilots = true;
1330 1330 
 	}
1331 
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1331 
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1332 1332
1333 1333 
 /*
1334 1334 
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1335 1335 
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1336 1336 
 */
1337 
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1338 
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1339 
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1337 
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1338 
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1339 
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1340 1340
1341 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1342 
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1341 
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1342 
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1343 1343
1344 
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1345 
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1344 
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1345 
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1346 1346
1347 
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
1348 
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
1347 
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
1348 
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
1349 1349
1350 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1351 
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1352 
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1353 
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1350 
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1351 
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1352 
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1353 
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1354 1354
1355 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1356 
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1357 
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1355 
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1356 
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1357 
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1358 1358 
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1359 
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1360 
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1359 
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1360 
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1361 1361
1362 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1363 
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1364 
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1365 
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1366 
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1367 
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1368 
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
1369 
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
1370 
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1371 
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1362 
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1363 
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1364 
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1365 
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1366 
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1367 
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1368 
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
1369 
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
1370 
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1371 
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1372 1372
1373 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1374 
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1373 
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1374 
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1375 1375
1376 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1377 
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1376 
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1377 
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1378 1378
1379 
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1379 
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1380 1380 
 	if ($archiveyear == "archiveyear") {
1381 
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1381 
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1382 1382 
 	} else {
1383 
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1383 
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1384 1384 
 	}
1385 
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1386 
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1387 
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1388 
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1385 
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1386 
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1387 
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1388 
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1389 1389
1390 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1391 
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1392 
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1393 
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1390 
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1391 
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1392 
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1393 
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1394 1394
1395 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1396 
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1397 
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1395 
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1396 
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1397 
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1398 1398
1399 1399 
 	// Create in settings.php keys not yet configurable if not already here
1400 1400 
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1401 
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1401 
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1402 1402
1403 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1403 
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1404 1404 
 	if ($resetyearstats == 'resetyearstats') {
1405 
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1405 
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1406 1406 
 	} else {
1407 
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1407 
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1408 1408 
 	}
1409 1409
1410 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1410 
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1411 1411 
 	if ($archive == 'archive') {
1412 
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1412 
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1413 1413 
 	} else {
1414 
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1414 
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1415 1415 
 	}
1416 
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
1416 
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
1417 1417 
 	if ($archiveresults == 'archiveresults') {
1418 
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
1418 
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
1419 1419 
 	} else {
1420 
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
1420 
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
1421 1421 
 	}
1422 
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1422 
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1423 1423 
 	if ($daemon == 'daemon') {
1424 
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1424 
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1425 1425 
 	} else {
1426 
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1426 
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1427 1427 
 	}
1428 
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1428 
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1429 1429 
 	if ($schedules == 'schedules') {
1430 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1430 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1431 1431 
 	} else {
1432 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1432 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1433 1433 
 	}
1434 1434
1435 1435 
 /*
 
@@ -1440,286 +1440,286 @@  discard block
 
 block discarded – undo
1440 1440 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1441 1441 
 	}
1442 1442 
 */
1443 
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1444 
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1445 
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1446 
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1447 
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1443 
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1444 
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1445 
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1446 
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1447 
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1448 1448 
 	$va = false;
1449 1449 
 	if ($globalivao == 'ivao') {
1450 
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1450 
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1451 1451 
 		$va = true;
1452 
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1452 
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1453 1453 
 	if ($globalvatsim == 'vatsim') {
1454 
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1454 
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1455 1455 
 		$va = true;
1456 
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1456 
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1457 1457 
 	if ($globalphpvms == 'phpvms') {
1458 
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1458 
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1459 1459 
 		$va = true;
1460 
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1460 
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1461 1461 
 	if ($globalvam == 'vam') {
1462 
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1462 
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1463 1463 
 		$va = true;
1464 
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1464 
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1465 1465 
 	if ($va) {
1466 
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1467 
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1466 
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1467 
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1468 1468 
 	if ($globalva == 'va' || $va) {
1469 
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1470 
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1469 
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1470 
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1471 1471 
 	} else {
1472 
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1473 
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1474 
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1472 
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
1473 
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1474 
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
1475 1475 
 	}
1476 1476
1477 1477
1478 
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
1478 
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
1479 1479 
 	if ($mapoffline == 'mapoffline') {
1480 
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
1480 
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
1481 1481 
 	} else {
1482 
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
1482 
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
1483 1483 
 	}
1484 
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
1484 
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
1485 1485 
 	if ($globaloffline == 'globaloffline') {
1486 
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
1486 
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
1487 1487 
 	} else {
1488 
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
1488 
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
1489 1489 
 	}
1490 1490
1491 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1491 
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1492 1492 
 	if ($notam == 'notam') {
1493 
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1493 
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1494 1494 
 	} else {
1495 
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1495 
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1496 1496 
 	}
1497 
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1497 
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1498 1498 
 	if ($owner == 'owner') {
1499 
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1499 
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1500 1500 
 	} else {
1501 
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1501 
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1502 1502 
 	}
1503 
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1503 
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1504 1504 
 	if ($map3d == 'map3d') {
1505 
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1505 
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1506 1506 
 	} else {
1507 
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1507 
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1508 1508 
 	}
1509 
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1509 
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1510 1510 
 	if ($crash == 'crash') {
1511 
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1511 
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1512 1512 
 	} else {
1513 
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1513 
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1514 1514 
 	}
1515 
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
1515 
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
1516 1516 
 	if ($fires == 'fires') {
1517 
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
1517 
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
1518 1518 
 	} else {
1519 
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
1519 
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
1520 1520 
 	}
1521 
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
1521 
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
1522 1522 
 	if ($firessupport == 'firessupport') {
1523 
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
1523 
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
1524 1524 
 	} else {
1525 
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
1525 
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
1526 1526 
 	}
1527 
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1527 
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1528 1528 
 	if ($mapsatellites == 'mapsatellites') {
1529 
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1529 
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1530 1530 
 	} else {
1531 
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1531 
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1532 1532 
 	}
1533 
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1533 
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1534 1534 
 	if ($map3ddefault == 'map3ddefault') {
1535 
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1535 
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1536 1536 
 	} else {
1537 
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1537 
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1538 1538 
 	}
1539 
-	$one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING);
1539 
+	$one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING);
1540 1540 
 	if ($one3dmodel == 'one3dmodel') {
1541 
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE'));
1541 
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE'));
1542 1542 
 	} else {
1543 
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE'));
1543 
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE'));
1544 1544 
 	}
1545 
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
1545 
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
1546 1546 
 	if ($map3dliveries == 'map3dliveries') {
1547 
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
1547 
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
1548 1548 
 	} else {
1549 
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
1549 
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
1550 1550 
 	}
1551 
-	$map3dshadows = filter_input(INPUT_POST,'map3dshadows',FILTER_SANITIZE_STRING);
1551 
+	$map3dshadows = filter_input(INPUT_POST, 'map3dshadows', FILTER_SANITIZE_STRING);
1552 1552 
 	if ($map3dshadows == 'map3dshadows') {
1553 
-		$settings = array_merge($settings,array('globalMap3DShadows' => 'TRUE'));
1553 
+		$settings = array_merge($settings, array('globalMap3DShadows' => 'TRUE'));
1554 1554 
 	} else {
1555 
-		$settings = array_merge($settings,array('globalMap3DShadows' => 'FALSE'));
1555 
+		$settings = array_merge($settings, array('globalMap3DShadows' => 'FALSE'));
1556 1556 
 	}
1557 
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1557 
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1558 1558 
 	if ($translate == 'translate') {
1559 
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1559 
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1560 1560 
 	} else {
1561 
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1561 
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1562 1562 
 	}
1563 
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1563 
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1564 1564 
 	if ($realairlines == 'realairlines') {
1565 
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1565 
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1566 1566 
 	} else {
1567 
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1567 
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1568 1568 
 	}
1569 
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1569 
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1570 1570 
 	if ($estimation == 'estimation') {
1571 
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1571 
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1572 1572 
 	} else {
1573 
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1573 
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1574 1574 
 	}
1575 
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1575 
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1576 1576 
 	if ($metar == 'metar') {
1577 
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1577 
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1578 1578 
 	} else {
1579 
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1579 
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1580 1580 
 	}
1581 
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1581 
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1582 1582 
 	if ($metarcycle == 'metarcycle') {
1583 
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1583 
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1584 1584 
 	} else {
1585 
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1585 
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1586 1586 
 	}
1587 
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1587 
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1588 1588 
 	if ($fork == 'fork') {
1589 
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1589 
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1590 1590 
 	} else {
1591 
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1591 
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1592 1592 
 	}
1593 1593
1594 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1594 
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1595 1595 
 	if ($colormap == 'colormap') {
1596 
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1596 
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1597 1597 
 	} else {
1598 
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1598 
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1599 1599 
 	}
1600 1600
1601 1601 
 	if (isset($_POST['aircrafticoncolor'])) {
1602 
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1603 
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1602 
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1603 
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1604 1604 
 	}
1605 1605
1606 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1607 
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1606 
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1607 
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1608 1608
1609 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1610 
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1611 
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1612 
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1613 
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1614 
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1609 
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1610 
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1611 
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1612 
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1613 
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1614 
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1615 1615
1616 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1616 
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1617 1617 
 	if ($mappopup == 'mappopup') {
1618 
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1618 
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1619 1619 
 	} else {
1620 
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1620 
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1621 1621 
 	}
1622 
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1622 
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1623 1623 
 	if ($airportpopup == 'airportpopup') {
1624 
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1624 
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1625 1625 
 	} else {
1626 
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1626 
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1627 1627 
 	}
1628 
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1628 
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1629 1629 
 	if ($maphistory == 'maphistory') {
1630 
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1630 
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1631 1631 
 	} else {
1632 
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1632 
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1633 1633 
 	}
1634 
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1634 
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1635 1635 
 	if ($maptooltip == 'maptooltip') {
1636 
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1636 
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1637 1637 
 	} else {
1638 
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1638 
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1639 1639 
 	}
1640 
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1640 
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1641 1641 
 	if ($flightroute == 'flightroute') {
1642 
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1642 
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1643 1643 
 	} else {
1644 
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1644 
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1645 1645 
 	}
1646 
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1646 
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1647 1647 
 	if ($flightremainingroute == 'flightremainingroute') {
1648 
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1648 
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1649 1649 
 	} else {
1650 
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1650 
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1651 1651 
 	}
1652 
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1652 
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1653 1653 
 	if ($allflights == 'allflights') {
1654 
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1654 
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1655 1655 
 	} else {
1656 
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1656 
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1657 1657 
 	}
1658 
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1658 
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1659 1659 
 	if ($bbox == 'bbox') {
1660 
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1660 
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1661 1661 
 	} else {
1662 
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1662 
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1663 1663 
 	}
1664 
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
1664 
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
1665 1665 
 	if ($groundaltitude == 'groundaltitude') {
1666 
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
1666 
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
1667 1667 
 	} else {
1668 
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
1668 
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
1669 1669 
 	}
1670 
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1670 
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1671 1671 
 	if ($waypoints == 'waypoints') {
1672 
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1672 
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1673 1673 
 	} else {
1674 
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1674 
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1675 1675 
 	}
1676 
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
1676 
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
1677 1677 
 	if ($geoid == 'geoid') {
1678 
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
1678 
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
1679 1679 
 	} else {
1680 
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
1680 
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
1681 1681 
 	}
1682 
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
1683 
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
1682 
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
1683 
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
1684 1684
1685 
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1685 
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1686 1686 
 	if ($noairlines == 'noairlines') {
1687 
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1687 
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1688 1688 
 	} else {
1689 
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1689 
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1690 1690 
 	}
1691 1691
1692 
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
1692 
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
1693 1693 
 	if ($tsk == 'tsk') {
1694 
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
1694 
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
1695 1695 
 	} else {
1696 
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
1696 
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
1697 1697 
 	}
1698 
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
1698 
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
1699 1699 
 	if ($mapmatching == 'mapmatching') {
1700 
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
1700 
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
1701 1701 
 	} else {
1702 
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
1702 
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
1703 1703 
 	}
1704 
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
1705 
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
1706 
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
1707 
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
1704 
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
1705 
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
1706 
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
1707 
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
1708 1708
1709 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1709 
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1710 1710
1711 1711 
 	// Set some defaults values...
1712 1712 
 	if (!isset($globalAircraftImageSources)) {
1713 
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1714 
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1713 
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1714 
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1715 1715 
 	}
1716 1716
1717 1717 
 	if (!isset($globalSchedulesSources)) {
1718 
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1719 
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1718 
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1719 
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1720 1720 
     	}
1721 1721
1722 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1722 
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1723 1723
1724 1724 
 	if ($error == '') settings::modify_settings($settings);
1725 1725 
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.