Completed
Push — master ( 101685...50b764 )
by Yannick
31:41
created
install/index.php 1 patch
Spacing   +282 added lines, -282 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');
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 	if (!extension_loaded('curl')) {
96 96
 		$error[] = "Curl is not loaded.";
97 97
 	}
98
-	if(function_exists('apache_get_modules') ){
99
-		if(!in_array('mod_rewrite',apache_get_modules())) {
98
+	if (function_exists('apache_get_modules')) {
99
+		if (!in_array('mod_rewrite', apache_get_modules())) {
100 100
 			$error[] = "mod_rewrite is not available.";
101 101
 		}
102 102
 	/*
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	print '<div class="info column"><p><strong>If you use MySQL or MariaDB, check that <i>max_allowed_packet</i> >= 8M, else import of some table can fail.</strong></p></div>';
113 113
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
114 114
 		if (function_exists('get_headers')) {
115
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/','search',str_replace('index.php',$_SERVER["REQUEST_URI"])));
116
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
115
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace('install/', 'search', str_replace('index.php', $_SERVER["REQUEST_URI"])));
116
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
117 117
 				print '<div class="info column"><p><strong>Check your configuration, rewrite don\'t seems to work.</strong></p></div>';
118 118
 			}
119 119
 		}
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
193 193
 					if (isset($_SERVER['REQUEST_URI'])) {
194 194
 						$URL = $_SERVER['REQUEST_URI'];
195
-						$globalURL = str_replace('/install/index.php','',$URL);
195
+						$globalURL = str_replace('/install/index.php', '', $URL);
196 196
 					}
197 197
 				    }
198 198
 				?>
@@ -515,13 +515,13 @@  discard block
 block discarded – undo
515 515
 ?>
516 516
 							<tr>
517 517
 								<?php
518
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
518
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
519 519
 								?>
520 520
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
521 521
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
522 522
 								<?php
523 523
 								    } else {
524
-									$hostport = explode(':',$source['host']);
524
+									$hostport = explode(':', $source['host']);
525 525
 									if (isset($hostport[1])) {
526 526
 										$host = $hostport[0];
527 527
 										$port = $hostport[1];
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 									<select name="timezones[]" id="timezones">
571 571
 								<?php
572 572
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
573
-									foreach($timezonelist as $timezones){
573
+									foreach ($timezonelist as $timezones) {
574 574
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
575 575
 											print '<option selected>'.$timezones.'</option>';
576 576
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
 									<select name="timezones[]" id="timezones">
625 625
 								<?php
626 626
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
627
-									foreach($timezonelist as $timezones){
627
+									foreach ($timezonelist as $timezones) {
628 628
 										if ($timezones == 'UTC') {
629 629
 											print '<option selected>'.$timezones.'</option>';
630 630
 										} else print '<option>'.$timezones.'</option>';
@@ -1076,7 +1076,7 @@  discard block
 block discarded – undo
1076 1076
 			<br />
1077 1077
 			<p>
1078 1078
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
1079
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
1079
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
1080 1080
 			</p>
1081 1081
 			<br />
1082 1082
 			<p>
@@ -1138,14 +1138,14 @@  discard block
 block discarded – undo
1138 1138
 $error = '';
1139 1139
 
1140 1140
 if (isset($_POST['dbtype'])) {
1141
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
1142
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
1143
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
1144
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
1145
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
1146
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
1147
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
1148
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
1141
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
1142
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
1143
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
1144
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
1145
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
1146
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
1147
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
1148
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
1149 1149
 
1150 1150
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
1151 1151
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1165,49 +1165,49 @@  discard block
 block discarded – undo
1165 1165
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1166 1166
 	*/
1167 1167
 	
1168
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
1168
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
1169 1169
 
1170
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
1171
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
1172
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
1173
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
1174
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
1170
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
1171
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
1172
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
1173
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
1174
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
1175 1175
 
1176
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
1177
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
1178
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
1179
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
1180
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
1181
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
1182
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
1183
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
1184
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
1185
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
1176
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
1177
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
1178
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
1179
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
1180
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
1181
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
1182
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
1183
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
1184
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
1185
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
1186 1186
 	
1187
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
1188
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
1189
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
1190
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
1191
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
1192
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
1187
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
1188
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
1189
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
1190
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
1191
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
1192
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
1193 1193
 
1194
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
1195
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
1194
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
1195
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
1196 1196
 
1197
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
1198
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
1199
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
1197
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
1198
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
1199
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
1200 1200
 
1201
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
1201
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
1202 1202
 	if ($acars == 'acars') {
1203
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
1203
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
1204 1204
 	} else {
1205
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
1205
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
1206 1206
 	}
1207 1207
 
1208
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
1209
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
1210
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
1208
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
1209
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
1210
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
1211 1211
 	
1212 1212
 	$source_name = $_POST['source_name'];
1213 1213
 	$source_latitude = $_POST['source_latitude'];
@@ -1221,8 +1221,8 @@  discard block
 block discarded – undo
1221 1221
 	
1222 1222
 	$sources = array();
1223 1223
 	foreach ($source_name as $keys => $name) {
1224
-	    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]);
1225
-	    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]);
1224
+	    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]);
1225
+	    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]);
1226 1226
 	}
1227 1227
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
1228 1228
 
@@ -1231,16 +1231,16 @@  discard block
 block discarded – undo
1231 1231
 	$newstype = $_POST['newstype'];
1232 1232
 	
1233 1233
 	$newsfeeds = array();
1234
-	foreach($newsurl as $newskey => $url) {
1234
+	foreach ($newsurl as $newskey => $url) {
1235 1235
 	    if ($url != '') {
1236 1236
 		$type = $newstype[$newskey];
1237 1237
 		$lng = $newslng[$newskey];
1238 1238
 		if (isset($newsfeeds[$type][$lng])) {
1239
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
1239
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
1240 1240
 		} else $newsfeeds[$type][$lng] = array($url);
1241 1241
 	    }
1242 1242
 	}
1243
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
1243
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
1244 1244
 
1245 1245
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
1246 1246
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1251,27 +1251,27 @@  discard block
 block discarded – undo
1251 1251
 	$sbsurl = $_POST['sbsurl'];
1252 1252
 	*/
1253 1253
 
1254
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
1255
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
1256
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
1257
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
1258
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
1259
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
1260
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
1261
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
1254
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
1255
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
1256
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
1257
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
1258
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
1259
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
1260
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
1261
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
1262 1262
 
1263
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
1264
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
1265
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
1266
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
1267
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
1268
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
1269
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
1270
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
1271
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
1272
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
1273
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
1274
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
1263
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
1264
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
1265
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
1266
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
1267
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
1268
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
1269
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
1270
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
1271
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
1272
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
1273
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
1274
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
1275 1275
 
1276 1276
 /*	
1277 1277
 	$globalSBS1Hosts = array();
@@ -1287,7 +1287,7 @@  discard block
 block discarded – undo
1287 1287
 	}
1288 1288
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
1289 1289
 */
1290
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
1290
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
1291 1291
 	$host = $_POST['host'];
1292 1292
 	$port = $_POST['port'];
1293 1293
 	$name = $_POST['name'];
@@ -1304,115 +1304,115 @@  discard block
 block discarded – undo
1304 1304
 		else $cov = 'FALSE';
1305 1305
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
1306 1306
 		else $arch = 'FALSE';
1307
-		if (strpos($format[$key],'_callback')) {
1308
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
1307
+		if (strpos($format[$key], '_callback')) {
1308
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
1309 1309
 		} elseif ($h != '' || $name[$key] != '') {
1310
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
1310
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
1311 1311
 		}
1312 1312
 		if ($format[$key] == 'airwhere') $forcepilots = true;
1313 1313
 	}
1314
-	$settings = array_merge($settings,array('globalSources' => $gSources));
1314
+	$settings = array_merge($settings, array('globalSources' => $gSources));
1315 1315
 
1316 1316
 /*
1317 1317
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
1318 1318
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
1319 1319
 */
1320
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
1321
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
1322
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
1320
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
1321
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
1322
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
1323 1323
 
1324
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
1325
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
1324
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
1325
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
1326 1326
 
1327
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
1328
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
1327
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
1328
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
1329 1329
 
1330
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
1331
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
1330
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
1331
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
1332 1332
 
1333
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
1334
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
1335
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
1336
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
1333
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
1334
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
1335
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
1336
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
1337 1337
 
1338
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
1339
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
1340
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
1338
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
1339
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
1340
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
1341 1341
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
1342
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
1343
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
1342
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
1343
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
1344 1344
 
1345
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
1346
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
1347
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
1348
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
1349
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
1350
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
1351
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
1352
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
1353
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
1354
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
1345
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
1346
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
1347
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
1348
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
1349
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
1350
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
1351
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
1352
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
1353
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
1354
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
1355 1355
 
1356
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
1357
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
1356
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
1357
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
1358 1358
 
1359
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
1360
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
1359
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
1360
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
1361 1361
 	
1362
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
1362
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
1363 1363
 	if ($archiveyear == "archiveyear") {
1364
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
1364
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
1365 1365
 	} else {
1366
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
1366
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
1367 1367
 	}
1368
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
1369
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
1370
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
1371
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1368
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
1369
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
1370
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
1371
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
1372 1372
 
1373
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
1374
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
1375
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
1376
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
1373
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
1374
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
1375
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
1376
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
1377 1377
 
1378
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
1379
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
1380
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
1378
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
1379
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
1380
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
1381 1381
 
1382 1382
 	// Create in settings.php keys not yet configurable if not already here
1383 1383
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
1384
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
1384
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
1385 1385
 
1386
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
1386
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
1387 1387
 	if ($resetyearstats == 'resetyearstats') {
1388
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
1388
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
1389 1389
 	} else {
1390
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
1390
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
1391 1391
 	}
1392 1392
 
1393
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
1393
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
1394 1394
 	if ($archive == 'archive') {
1395
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
1395
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
1396 1396
 	} else {
1397
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
1397
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
1398 1398
 	}
1399
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
1399
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
1400 1400
 	if ($archiveresults == 'archiveresults') {
1401
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
1401
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
1402 1402
 	} else {
1403
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
1403
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
1404 1404
 	}
1405
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
1405
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
1406 1406
 	if ($daemon == 'daemon') {
1407
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
1407
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
1408 1408
 	} else {
1409
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
1409
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
1410 1410
 	}
1411
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
1411
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
1412 1412
 	if ($schedules == 'schedules') {
1413
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
1413
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
1414 1414
 	} else {
1415
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
1415
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
1416 1416
 	}
1417 1417
 
1418 1418
 /*
@@ -1423,274 +1423,274 @@  discard block
 block discarded – undo
1423 1423
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
1424 1424
 	}
1425 1425
 */
1426
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
1427
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
1428
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
1429
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
1430
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
1426
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
1427
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
1428
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
1429
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
1430
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
1431 1431
 	$va = false;
1432 1432
 	if ($globalivao == 'ivao') {
1433
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
1433
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
1434 1434
 		$va = true;
1435
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
1435
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
1436 1436
 	if ($globalvatsim == 'vatsim') {
1437
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
1437
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
1438 1438
 		$va = true;
1439
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
1439
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
1440 1440
 	if ($globalphpvms == 'phpvms') {
1441
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
1441
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
1442 1442
 		$va = true;
1443
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
1443
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
1444 1444
 	if ($globalvam == 'vam') {
1445
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
1445
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
1446 1446
 		$va = true;
1447
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
1447
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
1448 1448
 	if ($va) {
1449
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
1450
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
1449
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
1450
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
1451 1451
 	if ($globalva == 'va' || $va) {
1452
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
1453
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1452
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
1453
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1454 1454
 	} else {
1455
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
1456
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
1457
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
1455
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
1456
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
1457
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
1458 1458
 	}
1459 1459
 	
1460 1460
 	
1461
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
1461
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
1462 1462
 	if ($mapoffline == 'mapoffline') {
1463
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
1463
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
1464 1464
 	} else {
1465
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
1465
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
1466 1466
 	}
1467
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
1467
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
1468 1468
 	if ($globaloffline == 'globaloffline') {
1469
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
1469
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
1470 1470
 	} else {
1471
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
1471
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
1472 1472
 	}
1473 1473
 
1474
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
1474
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
1475 1475
 	if ($notam == 'notam') {
1476
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
1476
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
1477 1477
 	} else {
1478
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
1478
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
1479 1479
 	}
1480
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
1480
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
1481 1481
 	if ($owner == 'owner') {
1482
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
1482
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
1483 1483
 	} else {
1484
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
1484
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
1485 1485
 	}
1486
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
1486
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
1487 1487
 	if ($map3d == 'map3d') {
1488
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
1488
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
1489 1489
 	} else {
1490
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
1490
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
1491 1491
 	}
1492
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
1492
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
1493 1493
 	if ($crash == 'crash') {
1494
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
1494
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
1495 1495
 	} else {
1496
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
1496
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
1497 1497
 	}
1498
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
1498
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
1499 1499
 	if ($fires == 'fires') {
1500
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
1500
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
1501 1501
 	} else {
1502
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
1502
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
1503 1503
 	}
1504
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
1504
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
1505 1505
 	if ($firessupport == 'firessupport') {
1506
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
1506
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
1507 1507
 	} else {
1508
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
1508
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
1509 1509
 	}
1510
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
1510
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
1511 1511
 	if ($mapsatellites == 'mapsatellites') {
1512
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
1512
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
1513 1513
 	} else {
1514
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
1514
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
1515 1515
 	}
1516
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
1516
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
1517 1517
 	if ($map3ddefault == 'map3ddefault') {
1518
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
1518
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
1519 1519
 	} else {
1520
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
1520
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
1521 1521
 	}
1522
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
1522
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
1523 1523
 	if ($map3dliveries == 'map3dliveries') {
1524
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
1524
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
1525 1525
 	} else {
1526
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
1526
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
1527 1527
 	}
1528
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
1528
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
1529 1529
 	if ($translate == 'translate') {
1530
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
1530
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
1531 1531
 	} else {
1532
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
1532
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
1533 1533
 	}
1534
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
1534
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
1535 1535
 	if ($realairlines == 'realairlines') {
1536
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
1536
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
1537 1537
 	} else {
1538
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
1538
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
1539 1539
 	}
1540
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
1540
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
1541 1541
 	if ($estimation == 'estimation') {
1542
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
1542
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
1543 1543
 	} else {
1544
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
1544
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
1545 1545
 	}
1546
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
1546
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
1547 1547
 	if ($metar == 'metar') {
1548
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
1548
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
1549 1549
 	} else {
1550
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
1550
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
1551 1551
 	}
1552
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
1552
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
1553 1553
 	if ($metarcycle == 'metarcycle') {
1554
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
1554
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
1555 1555
 	} else {
1556
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
1556
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
1557 1557
 	}
1558
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
1558
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
1559 1559
 	if ($fork == 'fork') {
1560
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
1560
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
1561 1561
 	} else {
1562
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
1562
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
1563 1563
 	}
1564 1564
 
1565
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
1565
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
1566 1566
 	if ($colormap == 'colormap') {
1567
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
1567
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
1568 1568
 	} else {
1569
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
1569
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
1570 1570
 	}
1571 1571
 	
1572 1572
 	if (isset($_POST['aircrafticoncolor'])) {
1573
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
1574
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
1573
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
1574
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
1575 1575
 	}
1576 1576
 
1577
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
1578
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
1577
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
1578
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
1579 1579
 
1580
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
1581
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
1582
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
1583
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
1584
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
1585
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
1580
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
1581
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
1582
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
1583
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
1584
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
1585
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
1586 1586
 
1587
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
1587
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
1588 1588
 	if ($mappopup == 'mappopup') {
1589
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
1589
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
1590 1590
 	} else {
1591
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
1591
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
1592 1592
 	}
1593
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
1593
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
1594 1594
 	if ($airportpopup == 'airportpopup') {
1595
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
1595
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
1596 1596
 	} else {
1597
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
1597
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
1598 1598
 	}
1599
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
1599
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
1600 1600
 	if ($maphistory == 'maphistory') {
1601
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
1601
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
1602 1602
 	} else {
1603
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
1603
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
1604 1604
 	}
1605
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
1605
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
1606 1606
 	if ($maptooltip == 'maptooltip') {
1607
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
1607
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
1608 1608
 	} else {
1609
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
1609
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
1610 1610
 	}
1611
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
1611
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
1612 1612
 	if ($flightroute == 'flightroute') {
1613
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
1613
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
1614 1614
 	} else {
1615
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
1615
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
1616 1616
 	}
1617
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
1617
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
1618 1618
 	if ($flightremainingroute == 'flightremainingroute') {
1619
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
1619
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
1620 1620
 	} else {
1621
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
1621
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
1622 1622
 	}
1623
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
1623
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
1624 1624
 	if ($allflights == 'allflights') {
1625
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
1625
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
1626 1626
 	} else {
1627
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
1627
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
1628 1628
 	}
1629
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
1629
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
1630 1630
 	if ($bbox == 'bbox') {
1631
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
1631
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
1632 1632
 	} else {
1633
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
1633
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
1634 1634
 	}
1635
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
1635
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
1636 1636
 	if ($groundaltitude == 'groundaltitude') {
1637
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
1637
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
1638 1638
 	} else {
1639
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
1639
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
1640 1640
 	}
1641
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
1641
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
1642 1642
 	if ($waypoints == 'waypoints') {
1643
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
1643
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
1644 1644
 	} else {
1645
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
1645
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
1646 1646
 	}
1647
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
1647
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
1648 1648
 	if ($geoid == 'geoid') {
1649
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
1649
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
1650 1650
 	} else {
1651
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
1651
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
1652 1652
 	}
1653
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
1654
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
1653
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
1654
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
1655 1655
 
1656
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
1656
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
1657 1657
 	if ($noairlines == 'noairlines') {
1658
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
1658
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
1659 1659
 	} else {
1660
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
1660
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
1661 1661
 	}
1662 1662
 
1663
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
1663
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
1664 1664
 	if ($tsk == 'tsk') {
1665
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
1665
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
1666 1666
 	} else {
1667
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
1667
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
1668 1668
 	}
1669
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
1669
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
1670 1670
 	if ($mapmatching == 'mapmatching') {
1671
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
1671
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
1672 1672
 	} else {
1673
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
1673
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
1674 1674
 	}
1675
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
1676
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
1677
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
1678
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
1675
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
1676
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
1677
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
1678
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
1679 1679
 
1680
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
1680
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
1681 1681
 
1682 1682
 	// Set some defaults values...
1683 1683
 	if (!isset($globalAircraftImageSources)) {
1684
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1685
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1684
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
1685
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
1686 1686
 	}
1687 1687
 
1688 1688
 	if (!isset($globalSchedulesSources)) {
1689
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1690
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1689
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
1690
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
1691 1691
     	}
1692 1692
 
1693
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1693
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
1694 1694
 
1695 1695
 	if ($error == '') settings::modify_settings($settings);
1696 1696
 	if ($error == '') settings::comment_settings($settings_comment);
Please login to merge, or discard this patch.