Completed
Push — master ( e2bf33...2d6f57 )
by Yannick
89:36 queued 58:21
created
install/index.php 1 patch
Spacing   +307 added lines, -307 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
 	/*
@@ -113,22 +113,22 @@  discard block
 block discarded – undo
113 113
 		$alllng = $Language->listLocaleDir();
114 114
 		if (count($alllng) != count($availablelng)) {
115 115
 			$notavailable = array();
116
-			foreach($alllng as $lng) {
116
+			foreach ($alllng as $lng) {
117 117
 				if (!isset($availablelng[$lng])) $notavailable[] = $lng;
118 118
 			}
119
-			print '<div class="alert alert-warning">The following translation can\'t be used on your system: '.implode(', ',$notavailable).'. You need to add the system locales: <a href="https://github.com/Ysurac/FlightAirMap/wiki/Translation">documentation</a>.</div>';
119
+			print '<div class="alert alert-warning">The following translation can\'t be used on your system: '.implode(', ', $notavailable).'. You need to add the system locales: <a href="https://github.com/Ysurac/FlightAirMap/wiki/Translation">documentation</a>.</div>';
120 120
 		}
121 121
 	}
122 122
 	print '<div class="alert alert-info">If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some tables can fail.</div>';
123 123
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
124 124
 		if (function_exists('get_headers')) {
125 125
 			//$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"])));
126
-			$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"])));
127
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
126
+			$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"])));
127
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
128 128
 				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>';
129 129
 			} else {
130
-				$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"])));
131
-				if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
130
+				$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"])));
131
+				if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
132 132
 					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>';
133 133
 				}
134 134
 			}
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
209 209
 					if (isset($_SERVER['REQUEST_URI'])) {
210 210
 						$URL = $_SERVER['REQUEST_URI'];
211
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
211
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
212 212
 					}
213 213
 				    }
214 214
 				?>
@@ -549,13 +549,13 @@  discard block
 block discarded – undo
549 549
 ?>
550 550
 							<tr>
551 551
 								<?php
552
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
552
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
553 553
 								?>
554 554
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
555 555
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
556 556
 								<?php
557 557
 								    } else {
558
-									$hostport = explode(':',$source['host']);
558
+									$hostport = explode(':', $source['host']);
559 559
 									if (isset($hostport[1])) {
560 560
 										$host = $hostport[0];
561 561
 										$port = $hostport[1];
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
 									<select name="timezones[]" id="timezones">
607 607
 								<?php
608 608
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
609
-									foreach($timezonelist as $timezones){
609
+									foreach ($timezonelist as $timezones) {
610 610
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
611 611
 											print '<option selected>'.$timezones.'</option>';
612 612
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -662,7 +662,7 @@  discard block
 block discarded – undo
662 662
 									<select name="timezones[]" id="timezones">
663 663
 								<?php
664 664
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
665
-									foreach($timezonelist as $timezones){
665
+									foreach ($timezonelist as $timezones) {
666 666
 										if ($timezones == 'UTC') {
667 667
 											print '<option selected>'.$timezones.'</option>';
668 668
 										} else print '<option>'.$timezones.'</option>';
@@ -1131,7 +1131,7 @@  discard block
 block discarded – undo
1131 1131
 			<br />
1132 1132
 			<p>
1133 1133
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
1134
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
1134
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
1135 1135
 			</p>
1136 1136
 			<br />
1137 1137
 			<p>
@@ -1214,14 +1214,14 @@  discard block
 block discarded – undo
1214 1214
 $error = '';
1215 1215
 
1216 1216
 if (isset($_POST['dbtype'])) {
1217
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
1218
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
1219
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
1220
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
1221
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
1222
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
1223
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
1224
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
1217
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
1218
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
1219
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
1220
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
1221
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
1222
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
1223
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
1224
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
1225 1225
 
1226 1226
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
1227 1227
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1241,59 +1241,59 @@  discard block
 block discarded – undo
1241 1241
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1242 1242
 	*/
1243 1243
 	
1244
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1244
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
1245 1245
 
1246
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
1247
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
1248
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
1249
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
1250
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
1246
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
1247
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
1248
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
1249
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
1250
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
1251 1251
 
1252
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
1253
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
1254
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
1255
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
1256
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
1257
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
1258
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
1259
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
1260
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
1261
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
1252
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
1253
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
1254
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
1255
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
1256
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
1257
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
1258
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
1259
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
1260
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
1261
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
1262 1262
 	
1263
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
1264
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
1265
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
1266
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
1267
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
1268
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
1263
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
1264
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
1265
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
1266
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
1267
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
1268
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
1269 1269
 
1270
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
1271
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
1270
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
1271
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
1272 1272
 
1273
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
1274
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
1275
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
1273
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
1274
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
1275
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
1276 1276
 
1277
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
1277
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
1278 1278
 	if ($acars == 'acars') {
1279
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
1279
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
1280 1280
 	} else {
1281
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
1281
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
1282 1282
 	}
1283
-	$updatecheck = filter_input(INPUT_POST,'updatecheck',FILTER_SANITIZE_STRING);
1283
+	$updatecheck = filter_input(INPUT_POST, 'updatecheck', FILTER_SANITIZE_STRING);
1284 1284
 	if ($updatecheck == 'updatecheck') {
1285
-		$settings = array_merge($settings,array('globalDisableUpdateCheck' => 'TRUE'));
1285
+		$settings = array_merge($settings, array('globalDisableUpdateCheck' => 'TRUE'));
1286 1286
 	} else {
1287
-		$settings = array_merge($settings,array('globalDisableUpdateCheck' => 'FALSE'));
1287
+		$settings = array_merge($settings, array('globalDisableUpdateCheck' => 'FALSE'));
1288 1288
 	}
1289 1289
 
1290
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
1291
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
1292
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
1290
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
1291
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
1292
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
1293 1293
 	
1294
-	$sailawayemail = filter_input(INPUT_POST,'sailawayemail',FILTER_SANITIZE_STRING);
1295
-	$sailawaypass = filter_input(INPUT_POST,'sailawaypassword',FILTER_SANITIZE_STRING);
1296
-	$settings = array_merge($settings,array('globalSailaway' => array('email' => $sailawayemail,'password' => $sailawaypass)));
1294
+	$sailawayemail = filter_input(INPUT_POST, 'sailawayemail', FILTER_SANITIZE_STRING);
1295
+	$sailawaypass = filter_input(INPUT_POST, 'sailawaypassword', FILTER_SANITIZE_STRING);
1296
+	$settings = array_merge($settings, array('globalSailaway' => array('email' => $sailawayemail, 'password' => $sailawaypass)));
1297 1297
 	
1298 1298
 	$source_name = $_POST['source_name'];
1299 1299
 	$source_latitude = $_POST['source_latitude'];
@@ -1307,8 +1307,8 @@  discard block
 block discarded – undo
1307 1307
 	
1308 1308
 	$sources = array();
1309 1309
 	foreach ($source_name as $keys => $name) {
1310
-	    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]);
1311
-	    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]);
1310
+	    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]);
1311
+	    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]);
1312 1312
 	}
1313 1313
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1314 1314
 
@@ -1317,16 +1317,16 @@  discard block
 block discarded – undo
1317 1317
 	$newstype = $_POST['newstype'];
1318 1318
 	
1319 1319
 	$newsfeeds = array();
1320
-	foreach($newsurl as $newskey => $url) {
1320
+	foreach ($newsurl as $newskey => $url) {
1321 1321
 	    if ($url != '') {
1322 1322
 		$type = $newstype[$newskey];
1323 1323
 		$lng = $newslng[$newskey];
1324 1324
 		if (isset($newsfeeds[$type][$lng])) {
1325
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
1325
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
1326 1326
 		} else $newsfeeds[$type][$lng] = array($url);
1327 1327
 	    }
1328 1328
 	}
1329
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
1329
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
1330 1330
 
1331 1331
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
1332 1332
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1337,28 +1337,28 @@  discard block
 block discarded – undo
1337 1337
 	$sbsurl = $_POST['sbsurl'];
1338 1338
 	*/
1339 1339
 
1340
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
1341
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
1342
-	$globalvm = filter_input(INPUT_POST,'globalvm',FILTER_SANITIZE_STRING);
1343
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
1344
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
1345
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
1346
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
1347
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
1348
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1340
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
1341
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
1342
+	$globalvm = filter_input(INPUT_POST, 'globalvm', FILTER_SANITIZE_STRING);
1343
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
1344
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
1345
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
1346
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
1347
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
1348
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
1349 1349
 
1350
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1351
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1352
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1353
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1354
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1355
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1356
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1357
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1358
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1359
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1360
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1361
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1350
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
1351
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
1352
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
1353
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
1354
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
1355
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
1356
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
1357
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
1358
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
1359
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
1360
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
1361
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
1362 1362
 
1363 1363
 /*	
1364 1364
 	$globalSBS1Hosts = array();
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 	}
1375 1375
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
1376 1376
 */
1377
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
1377
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
1378 1378
 	$host = $_POST['host'];
1379 1379
 	$port = $_POST['port'];
1380 1380
 	$name = $_POST['name'];
@@ -1391,115 +1391,115 @@  discard block
 block discarded – undo
1391 1391
 		else $cov = 'FALSE';
1392 1392
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1393 1393
 		else $arch = 'FALSE';
1394
-		if (strpos($format[$key],'_callback')) {
1395
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1394
+		if (strpos($format[$key], '_callback')) {
1395
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
1396 1396
 		} elseif ($format[$key] != 'auto' || ($h != '' || $name[$key] != '')) {
1397
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1397
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
1398 1398
 		}
1399 1399
 		if ($format[$key] == 'airwhere') $forcepilots = true;
1400 1400
 	}
1401
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1401
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1402 1402
 
1403 1403
 /*
1404 1404
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1405 1405
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1406 1406
 */
1407
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1408
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1409
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1407
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1408
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1409
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1410 1410
 
1411
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1412
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1411
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1412
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1413 1413
 
1414
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1415
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1414
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1415
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1416 1416
 
1417
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
1418
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
1417
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
1418
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
1419 1419
 
1420
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1421
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1422
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1423
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1420
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1421
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1422
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1423
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1424 1424
 
1425
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1426
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1427
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1425
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1426
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1427
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1428 1428
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1429
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1430
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1429
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1430
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1431 1431
 
1432
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1433
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1434
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1435
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1436
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1437
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1438
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
1439
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
1440
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1441
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1432
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1433
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1434
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1435
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1436
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1437
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1438
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
1439
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
1440
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1441
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1442 1442
 
1443
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1444
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1443
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1444
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1445 1445
 
1446
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1447
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1446
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1447
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1448 1448
 	
1449
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1449
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1450 1450
 	if ($archiveyear == "archiveyear") {
1451
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1451
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1452 1452
 	} else {
1453
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1453
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1454 1454
 	}
1455
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1456
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1457
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1458
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1455
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1456
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1457
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1458
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1459 1459
 
1460
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1461
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1462
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1463
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1460
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1461
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1462
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1463
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1464 1464
 
1465
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1466
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1467
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1465
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1466
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1467
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1468 1468
 
1469 1469
 	// Create in settings.php keys not yet configurable if not already here
1470 1470
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1471
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1471
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1472 1472
 
1473
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1473
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1474 1474
 	if ($resetyearstats == 'resetyearstats') {
1475
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1475
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1476 1476
 	} else {
1477
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1477
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1478 1478
 	}
1479 1479
 
1480
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1480
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1481 1481
 	if ($archive == 'archive') {
1482
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1482
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1483 1483
 	} else {
1484
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1484
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1485 1485
 	}
1486
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
1486
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
1487 1487
 	if ($archiveresults == 'archiveresults') {
1488
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
1488
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
1489 1489
 	} else {
1490
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
1490
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
1491 1491
 	}
1492
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1492
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1493 1493
 	if ($daemon == 'daemon') {
1494
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1494
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1495 1495
 	} else {
1496
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1496
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1497 1497
 	}
1498
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1498
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1499 1499
 	if ($schedules == 'schedules') {
1500
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1500
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1501 1501
 	} else {
1502
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1502
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1503 1503
 	}
1504 1504
 
1505 1505
 /*
@@ -1510,302 +1510,302 @@  discard block
 block discarded – undo
1510 1510
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1511 1511
 	}
1512 1512
 */
1513
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1514
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1515
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1516
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1517
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1513
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1514
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1515
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1516
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1517
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1518 1518
 	$va = false;
1519 1519
 	if ($globalivao == 'ivao') {
1520
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1520
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1521 1521
 		$va = true;
1522
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1522
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1523 1523
 	if ($globalvatsim == 'vatsim') {
1524
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1524
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1525 1525
 		$va = true;
1526
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1526
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1527 1527
 	if ($globalphpvms == 'phpvms') {
1528
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1528
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1529 1529
 		$va = true;
1530
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1530
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1531 1531
 	if ($globalvam == 'vam') {
1532
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1532
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1533 1533
 		$va = true;
1534
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1534
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1535 1535
 	if ($va) {
1536
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1537
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1536
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1537
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1538 1538
 	if ($globalva == 'va' || $va) {
1539
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1540
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1539
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1540
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1541 1541
 	} else {
1542
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1543
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1544
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1542
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
1543
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1544
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
1545 1545
 	}
1546 1546
 	if ($globalvm == 'vm') {
1547
-		$settings = array_merge($settings,array('globalVM' => 'TRUE'));
1547
+		$settings = array_merge($settings, array('globalVM' => 'TRUE'));
1548 1548
 	} else {
1549
-		$settings = array_merge($settings,array('globalVM' => 'FALSE'));
1549
+		$settings = array_merge($settings, array('globalVM' => 'FALSE'));
1550 1550
 	}
1551 1551
 	
1552
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
1552
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
1553 1553
 	if ($mapoffline == 'mapoffline') {
1554
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
1554
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
1555 1555
 	} else {
1556
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
1556
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
1557 1557
 	}
1558
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
1558
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
1559 1559
 	if ($globaloffline == 'globaloffline') {
1560
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
1560
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
1561 1561
 	} else {
1562
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
1562
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
1563 1563
 	}
1564 1564
 
1565
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1565
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1566 1566
 	if ($notam == 'notam') {
1567
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1567
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1568 1568
 	} else {
1569
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1569
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1570 1570
 	}
1571
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1571
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1572 1572
 	if ($owner == 'owner') {
1573
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1573
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1574 1574
 	} else {
1575
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1575
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1576 1576
 	}
1577
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1577
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1578 1578
 	if ($map3d == 'map3d') {
1579
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1579
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1580 1580
 	} else {
1581
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1581
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1582 1582
 	}
1583
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1583
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1584 1584
 	if ($crash == 'crash') {
1585
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1585
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1586 1586
 	} else {
1587
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1587
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1588 1588
 	}
1589
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
1589
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
1590 1590
 	if ($fires == 'fires') {
1591
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
1591
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
1592 1592
 	} else {
1593
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
1593
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
1594 1594
 	}
1595
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
1595
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
1596 1596
 	if ($firessupport == 'firessupport') {
1597
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
1597
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
1598 1598
 	} else {
1599
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
1599
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
1600 1600
 	}
1601
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1601
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1602 1602
 	if ($mapsatellites == 'mapsatellites') {
1603
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1603
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1604 1604
 	} else {
1605
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1605
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1606 1606
 	}
1607
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1607
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1608 1608
 	if ($map3ddefault == 'map3ddefault') {
1609
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1609
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1610 1610
 	} else {
1611
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1611
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1612 1612
 	}
1613
-	$one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING);
1613
+	$one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING);
1614 1614
 	if ($one3dmodel == 'one3dmodel') {
1615
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE'));
1615
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE'));
1616 1616
 	} else {
1617
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE'));
1617
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE'));
1618 1618
 	}
1619
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
1619
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
1620 1620
 	if ($map3dliveries == 'map3dliveries') {
1621
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
1621
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
1622 1622
 	} else {
1623
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
1623
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
1624 1624
 	}
1625
-	$map3dshadows = filter_input(INPUT_POST,'map3dshadows',FILTER_SANITIZE_STRING);
1625
+	$map3dshadows = filter_input(INPUT_POST, 'map3dshadows', FILTER_SANITIZE_STRING);
1626 1626
 	if ($map3dshadows == 'map3dshadows') {
1627
-		$settings = array_merge($settings,array('globalMap3DShadows' => 'TRUE'));
1627
+		$settings = array_merge($settings, array('globalMap3DShadows' => 'TRUE'));
1628 1628
 	} else {
1629
-		$settings = array_merge($settings,array('globalMap3DShadows' => 'FALSE'));
1629
+		$settings = array_merge($settings, array('globalMap3DShadows' => 'FALSE'));
1630 1630
 	}
1631
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1631
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1632 1632
 	if ($translate == 'translate') {
1633
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1633
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1634 1634
 	} else {
1635
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1635
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1636 1636
 	}
1637
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1637
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1638 1638
 	if ($realairlines == 'realairlines') {
1639
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1639
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1640 1640
 	} else {
1641
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1641
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1642 1642
 	}
1643
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1643
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1644 1644
 	if ($estimation == 'estimation') {
1645
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1645
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1646 1646
 	} else {
1647
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1647
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1648 1648
 	}
1649
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1649
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1650 1650
 	if ($metar == 'metar') {
1651
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1651
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1652 1652
 	} else {
1653
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1653
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1654 1654
 	}
1655
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1655
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1656 1656
 	if ($metarcycle == 'metarcycle') {
1657
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1657
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1658 1658
 	} else {
1659
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1659
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1660 1660
 	}
1661
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1661
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1662 1662
 	if ($fork == 'fork') {
1663
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1663
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1664 1664
 	} else {
1665
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1665
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1666 1666
 	}
1667 1667
 
1668
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1668
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1669 1669
 	if ($colormap == 'colormap') {
1670
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1670
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1671 1671
 	} else {
1672
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1672
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1673 1673
 	}
1674 1674
 	
1675 1675
 	if (isset($_POST['aircrafticoncolor'])) {
1676
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1677
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1676
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1677
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1678 1678
 	}
1679 1679
 	if (isset($_POST['marineiconcolor'])) {
1680
-		$marineiconcolor = filter_input(INPUT_POST,'marineiconcolor',FILTER_SANITIZE_STRING);
1681
-		$settings = array_merge($settings,array('globalMarineIconColor' => substr($marineiconcolor,1)));
1680
+		$marineiconcolor = filter_input(INPUT_POST, 'marineiconcolor', FILTER_SANITIZE_STRING);
1681
+		$settings = array_merge($settings, array('globalMarineIconColor' => substr($marineiconcolor, 1)));
1682 1682
 	}
1683 1683
 	if (isset($_POST['trackericoncolor'])) {
1684
-		$trackericoncolor = filter_input(INPUT_POST,'trackericoncolor',FILTER_SANITIZE_STRING);
1685
-		$settings = array_merge($settings,array('globalTrackerIconColor' => substr($trackericoncolor,1)));
1684
+		$trackericoncolor = filter_input(INPUT_POST, 'trackericoncolor', FILTER_SANITIZE_STRING);
1685
+		$settings = array_merge($settings, array('globalTrackerIconColor' => substr($trackericoncolor, 1)));
1686 1686
 	}
1687 1687
 	if (isset($_POST['satelliteiconcolor'])) {
1688
-		$satelliteiconcolor = filter_input(INPUT_POST,'satelliteiconcolor',FILTER_SANITIZE_STRING);
1689
-		$settings = array_merge($settings,array('globalSatelliteIconColor' => substr($satelliteiconcolor,1)));
1688
+		$satelliteiconcolor = filter_input(INPUT_POST, 'satelliteiconcolor', FILTER_SANITIZE_STRING);
1689
+		$settings = array_merge($settings, array('globalSatelliteIconColor' => substr($satelliteiconcolor, 1)));
1690 1690
 	}
1691 1691
 
1692
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1693
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1692
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1693
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1694 1694
 
1695
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1696
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1697
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1698
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1699
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1700
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1695
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1696
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1697
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1698
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1699
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1700
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1701 1701
 
1702
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1702
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1703 1703
 	if ($mappopup == 'mappopup') {
1704
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1704
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1705 1705
 	} else {
1706
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1706
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1707 1707
 	}
1708
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1708
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1709 1709
 	if ($airportpopup == 'airportpopup') {
1710
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1710
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1711 1711
 	} else {
1712
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1712
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1713 1713
 	}
1714
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1714
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1715 1715
 	if ($maphistory == 'maphistory') {
1716
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1716
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1717 1717
 	} else {
1718
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1718
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1719 1719
 	}
1720
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1720
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1721 1721
 	if ($maptooltip == 'maptooltip') {
1722
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1722
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1723 1723
 	} else {
1724
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1724
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1725 1725
 	}
1726
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1726
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1727 1727
 	if ($flightroute == 'flightroute') {
1728
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1728
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1729 1729
 	} else {
1730
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1730
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1731 1731
 	}
1732
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1732
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1733 1733
 	if ($flightremainingroute == 'flightremainingroute') {
1734
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1734
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1735 1735
 	} else {
1736
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1736
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1737 1737
 	}
1738
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1738
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1739 1739
 	if ($allflights == 'allflights') {
1740
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1740
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1741 1741
 	} else {
1742
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1742
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1743 1743
 	}
1744
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1744
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1745 1745
 	if ($bbox == 'bbox') {
1746
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1746
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1747 1747
 	} else {
1748
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1748
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1749 1749
 	}
1750
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
1750
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
1751 1751
 	if ($groundaltitude == 'groundaltitude') {
1752
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
1752
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
1753 1753
 	} else {
1754
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
1754
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
1755 1755
 	}
1756
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1756
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1757 1757
 	if ($waypoints == 'waypoints') {
1758
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1758
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1759 1759
 	} else {
1760
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1760
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1761 1761
 	}
1762
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
1762
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
1763 1763
 	if ($geoid == 'geoid') {
1764
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
1764
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
1765 1765
 	} else {
1766
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
1766
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
1767 1767
 	}
1768
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
1769
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
1768
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
1769
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
1770 1770
 
1771
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1771
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1772 1772
 	if ($noairlines == 'noairlines') {
1773
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1773
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1774 1774
 	} else {
1775
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1775
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1776 1776
 	}
1777 1777
 
1778
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
1778
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
1779 1779
 	if ($tsk == 'tsk') {
1780
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
1780
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
1781 1781
 	} else {
1782
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
1782
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
1783 1783
 	}
1784
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
1784
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
1785 1785
 	if ($mapmatching == 'mapmatching') {
1786
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
1786
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
1787 1787
 	} else {
1788
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
1788
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
1789 1789
 	}
1790
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
1791
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
1792
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
1793
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
1790
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
1791
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
1792
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
1793
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
1794 1794
 
1795
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1795
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1796 1796
 
1797 1797
 	// Set some defaults values...
1798 1798
 	if (!isset($globalAircraftImageSources)) {
1799
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1800
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1799
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1800
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1801 1801
 	}
1802 1802
 
1803 1803
 	if (!isset($globalSchedulesSources)) {
1804
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1805
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1804
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1805
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1806 1806
     	}
1807 1807
 
1808
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1808
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1809 1809
 
1810 1810
 	if ($error == '') settings::modify_settings($settings);
1811 1811
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.